diff options
| author | gdt <gdt@pkgsrc.org> | 2020-03-14 00:14:35 +0000 |
|---|---|---|
| committer | gdt <gdt@pkgsrc.org> | 2020-03-14 00:14:35 +0000 |
| commit | df5586d00b2d25f3fa1087bfb50d3a6d5e48ae40 (patch) | |
| tree | 373baa0ad49fbad8f263d8eb317d6f58e4163e6b /mk/extract | |
| parent | d1c3358a63ea7535d34eca45db62a0a0d888b94e (diff) | |
| download | pkgsrc-df5586d00b2d25f3fa1087bfb50d3a6d5e48ae40.tar.gz | |
mk/extract: move EXTRACT_USING earlier
In an attempt to resolve problems on SunOS, move EXTRACT_USING to the
early variables file, in the hopes that it will be defined before code
that checks it is executed.
Diffstat (limited to 'mk/extract')
| -rw-r--r-- | mk/extract/bsd.extract-vars.mk | 11 | ||||
| -rw-r--r-- | mk/extract/extract.mk | 10 |
2 files changed, 11 insertions, 10 deletions
diff --git a/mk/extract/bsd.extract-vars.mk b/mk/extract/bsd.extract-vars.mk index 522e1c236b4..647dcb9d9f0 100644 --- a/mk/extract/bsd.extract-vars.mk +++ b/mk/extract/bsd.extract-vars.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.extract-vars.mk,v 1.18 2019/08/02 11:48:17 nia Exp $ +# $NetBSD: bsd.extract-vars.mk,v 1.19 2020/03/14 00:14:35 gdt Exp $ # # This Makefile fragment is included separately by bsd.pkg.mk and # defines some variables which must be defined earlier than where @@ -13,6 +13,13 @@ # EXTRACT_SUFX is the suffix for the default distfile to be # extracted. The default suffix is ".tar.gz". # +# EXTRACT_USING specifies the tool used to extract tar/ustar-format +# archives when using EXTRACT_CMD_DEFAULT. The possible values are +# "bsdtar", "gtar", "nbtar", and "pax". +# By default, we use the "nbtar", which means the value of +# ${TOOL_PLATFORM.tar}, which is typically an arbitrary +# implementation already found on the platform. +# \todo: Decide if this is package-settable or user-settable or both. _VARGROUPS+= extract _PKG_VARS.extract= EXTRACT_DIR EXTRACT_ONLY EXTRACT_SUFX EXTRACT_CMD \ @@ -23,6 +30,8 @@ _LISTED_VARS.extract= EXTRACT_CMD EXTRACT_CMD_DEFAULT EXTRACT_ONLY?= ${DISTFILES} EXTRACT_SUFX?= .tar.gz +EXTRACT_USING?= nbtar + ### ### Discover which tools we need based on the file extensions of the ### distfiles. diff --git a/mk/extract/extract.mk b/mk/extract/extract.mk index fd8bb79de0d..8133729ad9b 100644 --- a/mk/extract/extract.mk +++ b/mk/extract/extract.mk @@ -1,4 +1,4 @@ -# $NetBSD: extract.mk,v 1.39 2020/03/12 16:55:31 gdt Exp $ +# $NetBSD: extract.mk,v 1.40 2020/03/14 00:14:35 gdt Exp $ # # The following variables may be set by the package Makefile and # specify how extraction happens: @@ -28,13 +28,6 @@ # the "extract" script for a definitive list of the available # options. The default list is empty. # -# EXTRACT_USING specifies the tool used to extract tar/ustar-format -# archives when using EXTRACT_CMD_DEFAULT. The possible values are -# "bsdtar", "gtar", "nbtar", and "pax". -# By default, we use the "nbtar", which means the value of -# ${TOOL_PLATFORM.tar}, which is typically an arbitrary -# implementation already found on the platform. -# # EXTRACT_ELEMENTS is a list of files within the distfile to extract # when using EXTRACT_CMD_DEFAULT. By default, this is empty, which # causes all files within the archive to be extracted. @@ -161,7 +154,6 @@ extract-cookie: ### .PHONY: pre-extract do-extract post-extract -EXTRACT_USING?= nbtar EXTRACT_ELEMENTS?= # empty ### |