kpriv/pkgsrc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
pkgsrc/mk/extract/extract.mk

237 lines
7.8 KiB
Makefile
Raw Normal View History

mk: allow "bmake clean depends" as shortcut When "bmake clean depends" was called for a package where the various cookie files already existed, these would enable different rules than a clean package directory. Since "bmake clean" deletes all the cookie files before "bmake depends" starts, in these combined command lines the cookie files must be treated as absent.
2019-05-07 21:36:43 +02:00
# $NetBSD: extract.mk,v 1.38 2019/05/07 19:36:44 rillig Exp $
Separate out the variables and targets for the "extract" phase into a separate file pkgsrc/mk/bsd.pkg.extract.mk. Also, include this file ahead of the inclusion of bsd.tools.mk so that tools required to extract are created by the tools framework.
2005-05-11 06:01:49 +02:00
#
# The following variables may be set by the package Makefile and
# specify how extraction happens:
#
Fix whitespace
2008-03-12 16:48:21 +01:00
# EXTRACT_DIR
Added the EXTRACT_DIR variable, which can be used if the distfiles should not be extracted into ${WRKDIR}.
2006-10-09 04:31:57 +02:00
# The directory into which the files are extracted.
#
Fixed the documentation.
2007-01-09 06:13:27 +01:00
# Default value: ${WRKDIR}
Added the EXTRACT_DIR variable, which can be used if the distfiles should not be extracted into ${WRKDIR}.
2006-10-09 04:31:57 +02:00
#
Allow EXTRACT_DIR to be specified independently for each file. OK wiz@
2010-10-15 22:22:27 +02:00
# EXTRACT_DIR.${file}
# The directory into which the file ${file} is extracted.
#
# Default: ${EXTRACT_DIR}
#
Document EXTRACT_ENV
2014-03-02 10:45:42 +01:00
# EXTRACT_ENV is the shell environment that is exported to the extract
# process.
#
Invent new variable EXTRACTOR that has the environment and path to the extract script. This can be used in a more natural way by custom do-extract targets than EXTRACT_CMD.
2008-03-12 16:51:39 +01:00
# EXTRACTOR is the the the environment and path used to execute the
# all-purpose extract script.
#
Separate out the variables and targets for the "extract" phase into a separate file pkgsrc/mk/bsd.pkg.extract.mk. Also, include this file ahead of the inclusion of bsd.tools.mk so that tools required to extract are created by the tools framework.
2005-05-11 06:01:49 +02:00
# EXTRACT_CMD is a shell command list that extracts the contents of
Use /usr/pkgsrc/mk/scripts/extract to do extraction instead of using all that Makefile code to determine the right extraction command to use. This change removes EXTRACT_CMD.<suffix>.
2006-01-21 19:55:10 +01:00
# an archive named by the variable ${DOWNLOADED_DISTFILE} to the
Set EXTRACT_CMD_DEFAULT to the default extraction command that invokes the "extract" script. This allows custom EXTRACT_CMD settings to still invoke ${EXTRACT_CMD_DEFAULT}.
2006-01-21 20:39:22 +01:00
# current working directory. The default is ${EXTRACT_CMD_DEFAULT}.
#
Use /usr/pkgsrc/mk/scripts/extract to do extraction instead of using all that Makefile code to determine the right extraction command to use. This change removes EXTRACT_CMD.<suffix>.
2006-01-21 19:55:10 +01:00
# EXTRACT_OPTS is a list of options to pass to the "extract" script
Set EXTRACT_CMD_DEFAULT to the default extraction command that invokes the "extract" script. This allows custom EXTRACT_CMD settings to still invoke ${EXTRACT_CMD_DEFAULT}.
2006-01-21 20:39:22 +01:00
# when using EXTRACT_CMD_DEFAULT. See the comments at the head of
# the "extract" script for a definitive list of the available
Use /usr/pkgsrc/mk/scripts/extract to do extraction instead of using all that Makefile code to determine the right extraction command to use. This change removes EXTRACT_CMD.<suffix>.
2006-01-21 19:55:10 +01:00
# options. The default list is empty.
Separate out the variables and targets for the "extract" phase into a separate file pkgsrc/mk/bsd.pkg.extract.mk. Also, include this file ahead of the inclusion of bsd.tools.mk so that tools required to extract are created by the tools framework.
2005-05-11 06:01:49 +02:00
#
Document EXTRACT_USING in bsd.pkg.extract.mk where it is used.
2005-05-16 06:22:40 +02:00
# EXTRACT_USING specifies the tool used to extract tar/ustar-format
Set EXTRACT_CMD_DEFAULT to the default extraction command that invokes the "extract" script. This allows custom EXTRACT_CMD settings to still invoke ${EXTRACT_CMD_DEFAULT}.
2006-01-21 20:39:22 +01:00
# archives when using EXTRACT_CMD_DEFAULT. The possible values are
Document bsdtar value. From OKANO Takayoshi.
2008-05-26 15:39:08 +02:00
# "bsdtar", "gtar", "nbtar", and "pax".
# By default, we use the "nbtar" tool (pkgsrc's pax-as-tar).
Document EXTRACT_USING in bsd.pkg.extract.mk where it is used.
2005-05-16 06:22:40 +02:00
#
Set EXTRACT_CMD_DEFAULT to the default extraction command that invokes the "extract" script. This allows custom EXTRACT_CMD settings to still invoke ${EXTRACT_CMD_DEFAULT}.
2006-01-21 20:39:22 +01:00
# 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.
Separate out the variables and targets for the "extract" phase into a separate file pkgsrc/mk/bsd.pkg.extract.mk. Also, include this file ahead of the inclusion of bsd.tools.mk so that tools required to extract are created by the tools framework.
2005-05-11 06:01:49 +02:00
#
Use /usr/pkgsrc/mk/scripts/extract to do extraction instead of using all that Makefile code to determine the right extraction command to use. This change removes EXTRACT_CMD.<suffix>.
2006-01-21 19:55:10 +01:00
# The following are read-only variables that may be used within a package
# Makefile:
#
# DOWNLOADED_DISTFILE represents the path to the distfile that is
# currently being extracted, and may be used in custom EXTRACT_CMD
# overrides, e.g.
#
# EXTRACT_CMD= ${TAIL} +25 ${DOWNLOADED_DISTFILE} > foo.pl
#
EXTRACT_CMD_DEFAULT should not be set by the package; it may only be used.
2006-06-06 18:33:48 +02:00
# EXTRACT_CMD_DEFAULT uses the "extract" script to unpack archives. The
# precise manner in which extraction occurs may be tweaked by setting
# EXTRACT_OPTS, EXTRACT_USING and EXTRACT_ELEMENTS.
#
Separate out the variables and targets for the "extract" phase into a separate file pkgsrc/mk/bsd.pkg.extract.mk. Also, include this file ahead of the inclusion of bsd.tools.mk so that tools required to extract are created by the tools framework.
2005-05-11 06:01:49 +02:00
Forgot to provide the default value for EXTRACT_DIR. EXTRACT_DIR may be given relative to WRKDIR.
2006-10-09 04:37:32 +02:00
EXTRACT_DIR?= ${WRKDIR}
Allow EXTRACT_DIR to be specified independently for each file. OK wiz@
2010-10-15 22:22:27 +02:00
.for f in ${EXTRACT_ONLY}
EXTRACT_DIR.${f}?= ${EXTRACT_DIR}
.endfor
Forgot to provide the default value for EXTRACT_DIR. EXTRACT_DIR may be given relative to WRKDIR.
2006-10-09 04:37:32 +02:00
Rename <phase>_COOKIE variables to _COOKIE.<phase>. These are private variables so there are no user-visible changes. This change just makes it a little easier to write for loops.
2006-07-07 23:24:27 +02:00
_COOKIE.extract= ${WRKDIR}/.extract_done
Separate out the variables and targets for the "extract" phase into a separate file pkgsrc/mk/bsd.pkg.extract.mk. Also, include this file ahead of the inclusion of bsd.tools.mk so that tools required to extract are created by the tools framework.
2005-05-11 06:01:49 +02:00
Refactor "fetch" and "extract" code into correspondingly named subdirectories of pkgsrc/mk. Move the following files around for locality: pkgsrc/mk/scripts/extract -> pkgsrc/mk/extract/extract pkgsrc/mk/bsd.sites.mk -> pkgsrc/mk/fetch/sites.mk Also get rid of the recursive make for the "fetch" and "extract" targets. This basically merges the "fetch" and "extract" phases into the "patch" phase. There is still much more work to do to simplify the fetch code, but this is a good start.
2006-06-06 05:05:48 +02:00
######################################################################
### extract (PUBLIC)
######################################################################
### extract is a public target to perform extraction.
Use /usr/pkgsrc/mk/scripts/extract to do extraction instead of using all that Makefile code to determine the right extraction command to use. This change removes EXTRACT_CMD.<suffix>.
2006-01-21 19:55:10 +01:00
###
Make the check-vulnerable target more self-sufficient, by moving some of the logic from fetch/fetch.mk into flavor/pkg/check.mk, so that check-vulnerable can be used as a source target. Make check-vulnerable a source target for every phase of the build workflow, which ensures that it is always run if the user starts a new phase from the command line. Fix the cookie-generation targets so that they don't append, only overwrite to the cookie file. This works around potential problems due to recursive makes. Move the cookie checks so that they surround the corresponding phase target. The presence of the cookie should now inform the make process to avoid doing any processing of phases that occur before the phase corresponding to the cookie.
2006-07-05 11:08:35 +02:00
_EXTRACT_TARGETS+= check-vulnerable
After auditing all the packages the ensure that they never invoke the compiler toolchain until the configure stage, move the "wrapper" stage back to between "patch" and "configure". This makes "make extract NO_DEPENDS=" work again for all packages.
2006-07-27 15:47:29 +02:00
_EXTRACT_TARGETS+= tools
Refactor "fetch" and "extract" code into correspondingly named subdirectories of pkgsrc/mk. Move the following files around for locality: pkgsrc/mk/scripts/extract -> pkgsrc/mk/extract/extract pkgsrc/mk/bsd.sites.mk -> pkgsrc/mk/fetch/sites.mk Also get rid of the recursive make for the "fetch" and "extract" targets. This basically merges the "fetch" and "extract" phases into the "patch" phase. There is still much more work to do to simplify the fetch code, but this is a good start.
2006-06-06 05:05:48 +02:00
_EXTRACT_TARGETS+= acquire-extract-lock
Rename <phase>_COOKIE variables to _COOKIE.<phase>. These are private variables so there are no user-visible changes. This change just makes it a little easier to write for loops.
2006-07-07 23:24:27 +02:00
_EXTRACT_TARGETS+= ${_COOKIE.extract}
Refactor "fetch" and "extract" code into correspondingly named subdirectories of pkgsrc/mk. Move the following files around for locality: pkgsrc/mk/scripts/extract -> pkgsrc/mk/extract/extract pkgsrc/mk/bsd.sites.mk -> pkgsrc/mk/fetch/sites.mk Also get rid of the recursive make for the "fetch" and "extract" targets. This basically merges the "fetch" and "extract" phases into the "patch" phase. There is still much more work to do to simplify the fetch code, but this is a good start.
2006-06-06 05:05:48 +02:00
_EXTRACT_TARGETS+= release-extract-lock
.PHONY: extract
.if !target(extract)
mk: allow "bmake clean depends" as shortcut When "bmake clean depends" was called for a package where the various cookie files already existed, these would enable different rules than a clean package directory. Since "bmake clean" deletes all the cookie files before "bmake depends" starts, in these combined command lines the cookie files must be treated as absent.
2019-05-07 21:36:43 +02:00
. if exists(${_COOKIE.extract}) && !${_CLEANING}
Make the check-vulnerable target more self-sufficient, by moving some of the logic from fetch/fetch.mk into flavor/pkg/check.mk, so that check-vulnerable can be used as a source target. Make check-vulnerable a source target for every phase of the build workflow, which ensures that it is always run if the user starts a new phase from the command line. Fix the cookie-generation targets so that they don't append, only overwrite to the cookie file. This works around potential problems due to recursive makes. Move the cookie checks so that they surround the corresponding phase target. The presence of the cookie should now inform the make process to avoid doing any processing of phases that occur before the phase corresponding to the cookie.
2006-07-05 11:08:35 +02:00
extract:
@${DO_NADA}
Modify the barrier so that we always invoke the recursive make process when passing through the barrier. This ensures the PATH (passed via PKGSRC_MAKE_ENV) is correctly set for all phases after the barrier. This fixes a bug in "interactive" pkgsrc use, where if you have no work directory and type "make build && make install", then the "install" step does not have a PATH set to include all the wrapper and tools directories.
2006-07-22 18:31:35 +02:00
. elif defined(_PKGSRC_BARRIER)
Flatten out recursive makes into a single re-invocation of make by introducing the concept of a "barrier". We separate the user-invokable targets into ones that must happen before the barrier, and ones that must happen after the barrier. The ones that happen after the barrier are run in a sub-make process. In this case, the targets that must be run after the barrier are from the "wrapper" step and beyond. We rewrite the various "flow" targets, e.g. wrapper, configure, build, etc., so that they of the right form to use the barrier target. This now completely removes the concept of PKG_PHASE from pkgsrc. It is replaced with the concept of "before" and "after" the barrier, and this state can be checked by testing for the existence of the barrier cookie file. Because we've removed most of the recursive makes, there is now nowhere to hook the PKG_ERROR_HANDLER.* commands, so remove them for now. As part of this commit, put back the logic that conditionalized the sources for the various cookie files. Because the sources are all "phony" targets, they were always run, regardless of whether or not the cookie file already existed. Now, if a cookie file exists, then that entire phase associated with that cookie file is skipped. Lastly, fix a thinko in configure/bsd.configure.mk where setting NO_CONFIGURE in a package Makefile would manage to skip the "wrapper" step altogether. Fix this by correctly noting "wrapper" and not "patch" as the preceding step to "configure".
2006-07-06 00:21:02 +02:00
extract: ${_EXTRACT_TARGETS}
Rearrange sequence so that "wrapper" occurs between "tools" and "extract". This allows all user-definable targets (pre-*, do-*, post-*) to have access to the wrapper scripts.
2006-07-21 16:21:28 +02:00
. else
extract: barrier
Make the check-vulnerable target more self-sufficient, by moving some of the logic from fetch/fetch.mk into flavor/pkg/check.mk, so that check-vulnerable can be used as a source target. Make check-vulnerable a source target for every phase of the build workflow, which ensures that it is always run if the user starts a new phase from the command line. Fix the cookie-generation targets so that they don't append, only overwrite to the cookie file. This works around potential problems due to recursive makes. Move the cookie checks so that they surround the corresponding phase target. The presence of the cookie should now inform the make process to avoid doing any processing of phases that occur before the phase corresponding to the cookie.
2006-07-05 11:08:35 +02:00
. endif
Separate out the variables and targets for the "extract" phase into a separate file pkgsrc/mk/bsd.pkg.extract.mk. Also, include this file ahead of the inclusion of bsd.tools.mk so that tools required to extract are created by the tools framework.
2005-05-11 06:01:49 +02:00
.endif
Refactor "fetch" and "extract" code into correspondingly named subdirectories of pkgsrc/mk. Move the following files around for locality: pkgsrc/mk/scripts/extract -> pkgsrc/mk/extract/extract pkgsrc/mk/bsd.sites.mk -> pkgsrc/mk/fetch/sites.mk Also get rid of the recursive make for the "fetch" and "extract" targets. This basically merges the "fetch" and "extract" phases into the "patch" phase. There is still much more work to do to simplify the fetch code, but this is a good start.
2006-06-06 05:05:48 +02:00
.PHONY: acquire-extract-lock release-extract-lock
acquire-extract-lock: acquire-lock
release-extract-lock: release-lock
mk: allow "bmake clean depends" as shortcut When "bmake clean depends" was called for a package where the various cookie files already existed, these would enable different rules than a clean package directory. Since "bmake clean" deletes all the cookie files before "bmake depends" starts, in these combined command lines the cookie files must be treated as absent.
2019-05-07 21:36:43 +02:00
.if exists(${_COOKIE.extract}) && !${_CLEANING}
Rename <phase>_COOKIE variables to _COOKIE.<phase>. These are private variables so there are no user-visible changes. This change just makes it a little easier to write for loops.
2006-07-07 23:24:27 +02:00
${_COOKIE.extract}:
Flatten out recursive makes into a single re-invocation of make by introducing the concept of a "barrier". We separate the user-invokable targets into ones that must happen before the barrier, and ones that must happen after the barrier. The ones that happen after the barrier are run in a sub-make process. In this case, the targets that must be run after the barrier are from the "wrapper" step and beyond. We rewrite the various "flow" targets, e.g. wrapper, configure, build, etc., so that they of the right form to use the barrier target. This now completely removes the concept of PKG_PHASE from pkgsrc. It is replaced with the concept of "before" and "after" the barrier, and this state can be checked by testing for the existence of the barrier cookie file. Because we've removed most of the recursive makes, there is now nowhere to hook the PKG_ERROR_HANDLER.* commands, so remove them for now. As part of this commit, put back the logic that conditionalized the sources for the various cookie files. Because the sources are all "phony" targets, they were always run, regardless of whether or not the cookie file already existed. Now, if a cookie file exists, then that entire phase associated with that cookie file is skipped. Lastly, fix a thinko in configure/bsd.configure.mk where setting NO_CONFIGURE in a package Makefile would manage to skip the "wrapper" step altogether. Fix this by correctly noting "wrapper" and not "patch" as the preceding step to "configure".
2006-07-06 00:21:02 +02:00
@${DO_NADA}
.else
Rename <phase>_COOKIE variables to _COOKIE.<phase>. These are private variables so there are no user-visible changes. This change just makes it a little easier to write for loops.
2006-07-07 23:24:27 +02:00
${_COOKIE.extract}: real-extract
Flatten out recursive makes into a single re-invocation of make by introducing the concept of a "barrier". We separate the user-invokable targets into ones that must happen before the barrier, and ones that must happen after the barrier. The ones that happen after the barrier are run in a sub-make process. In this case, the targets that must be run after the barrier are from the "wrapper" step and beyond. We rewrite the various "flow" targets, e.g. wrapper, configure, build, etc., so that they of the right form to use the barrier target. This now completely removes the concept of PKG_PHASE from pkgsrc. It is replaced with the concept of "before" and "after" the barrier, and this state can be checked by testing for the existence of the barrier cookie file. Because we've removed most of the recursive makes, there is now nowhere to hook the PKG_ERROR_HANDLER.* commands, so remove them for now. As part of this commit, put back the logic that conditionalized the sources for the various cookie files. Because the sources are all "phony" targets, they were always run, regardless of whether or not the cookie file already existed. Now, if a cookie file exists, then that entire phase associated with that cookie file is skipped. Lastly, fix a thinko in configure/bsd.configure.mk where setting NO_CONFIGURE in a package Makefile would manage to skip the "wrapper" step altogether. Fix this by correctly noting "wrapper" and not "patch" as the preceding step to "configure".
2006-07-06 00:21:02 +02:00
.endif
Refactor "fetch" and "extract" code into correspondingly named subdirectories of pkgsrc/mk. Move the following files around for locality: pkgsrc/mk/scripts/extract -> pkgsrc/mk/extract/extract pkgsrc/mk/bsd.sites.mk -> pkgsrc/mk/fetch/sites.mk Also get rid of the recursive make for the "fetch" and "extract" targets. This basically merges the "fetch" and "extract" phases into the "patch" phase. There is still much more work to do to simplify the fetch code, but this is a good start.
2006-06-06 05:05:48 +02:00
######################################################################
### real-extract (PRIVATE)
######################################################################
### real-extract is a helper target onto which one can hook all of the
### targets that do the actual extraction work.
###
_REAL_EXTRACT_TARGETS+= extract-check-interactive
_REAL_EXTRACT_TARGETS+= extract-message
_REAL_EXTRACT_TARGETS+= extract-vars
Added the EXTRACT_DIR variable, which can be used if the distfiles should not be extracted into ${WRKDIR}.
2006-10-09 04:31:57 +02:00
_REAL_EXTRACT_TARGETS+= extract-dir
Refactor "fetch" and "extract" code into correspondingly named subdirectories of pkgsrc/mk. Move the following files around for locality: pkgsrc/mk/scripts/extract -> pkgsrc/mk/extract/extract pkgsrc/mk/bsd.sites.mk -> pkgsrc/mk/fetch/sites.mk Also get rid of the recursive make for the "fetch" and "extract" targets. This basically merges the "fetch" and "extract" phases into the "patch" phase. There is still much more work to do to simplify the fetch code, but this is a good start.
2006-06-06 05:05:48 +02:00
_REAL_EXTRACT_TARGETS+= pre-extract
_REAL_EXTRACT_TARGETS+= do-extract
_REAL_EXTRACT_TARGETS+= post-extract
_REAL_EXTRACT_TARGETS+= extract-cookie
Introduce the capability to gather all the warnings and errors that are generated for a target and output them all at once at the conclusion of the target's invocation. The implementation is in bsd.pkg.error.mk, which defines a macro target "error-check" that will print out any non-empty warning and error files in ${WARNING_DIR} and ${ERROR_DIR} and exit appropriately if there were errors. Convert some targets that were just long sequences of ${ERROR_MSG} or ${WARNING_MSG} within a single shell statement to use the new delayed error output via error-check. Modify the compiler "fail" wrappers for C++ and Fortran to be less verbose during invocation. Instead collect the warnings and only print them at the end of the completed phase, e.g. after "configure" and/or "build" completes.
2006-06-09 15:59:06 +02:00
_REAL_EXTRACT_TARGETS+= error-check
Refactor "fetch" and "extract" code into correspondingly named subdirectories of pkgsrc/mk. Move the following files around for locality: pkgsrc/mk/scripts/extract -> pkgsrc/mk/extract/extract pkgsrc/mk/bsd.sites.mk -> pkgsrc/mk/fetch/sites.mk Also get rid of the recursive make for the "fetch" and "extract" targets. This basically merges the "fetch" and "extract" phases into the "patch" phase. There is still much more work to do to simplify the fetch code, but this is a good start.
2006-06-06 05:05:48 +02:00
.PHONY: real-extract
real-extract: ${_REAL_EXTRACT_TARGETS}
.PHONY: extract-message
extract-message:
@${PHASE_MSG} "Extracting for ${PKGNAME}"
Added the EXTRACT_DIR variable, which can be used if the distfiles should not be extracted into ${WRKDIR}.
2006-10-09 04:31:57 +02:00
.PHONY: extract-dir
extract-dir:
Got rid of _PKG_SILENT. Why use __file__ when a simple f does the same?
2008-01-23 15:59:35 +01:00
${RUN}${MKDIR} ${EXTRACT_DIR}
Allow EXTRACT_DIR to be specified independently for each file. OK wiz@
2010-10-15 22:22:27 +02:00
.for f in ${EXTRACT_ONLY}
${RUN}${MKDIR} ${EXTRACT_DIR.${f}}
.endfor
Added the EXTRACT_DIR variable, which can be used if the distfiles should not be extracted into ${WRKDIR}.
2006-10-09 04:31:57 +02:00
Refactor "fetch" and "extract" code into correspondingly named subdirectories of pkgsrc/mk. Move the following files around for locality: pkgsrc/mk/scripts/extract -> pkgsrc/mk/extract/extract pkgsrc/mk/bsd.sites.mk -> pkgsrc/mk/fetch/sites.mk Also get rid of the recursive make for the "fetch" and "extract" targets. This basically merges the "fetch" and "extract" phases into the "patch" phase. There is still much more work to do to simplify the fetch code, but this is a good start.
2006-06-06 05:05:48 +02:00
######################################################################
### extract-check-interactive (PRIVATE)
######################################################################
Fix the comment.
2006-06-08 17:45:52 +02:00
### extract-check-interactive checks whether we must do an interactive
Refactor "fetch" and "extract" code into correspondingly named subdirectories of pkgsrc/mk. Move the following files around for locality: pkgsrc/mk/scripts/extract -> pkgsrc/mk/extract/extract pkgsrc/mk/bsd.sites.mk -> pkgsrc/mk/fetch/sites.mk Also get rid of the recursive make for the "fetch" and "extract" targets. This basically merges the "fetch" and "extract" phases into the "patch" phase. There is still much more work to do to simplify the fetch code, but this is a good start.
2006-06-06 05:05:48 +02:00
### extraction or not.
###
add a missing PHONY
2006-07-26 20:29:46 +02:00
.PHONY: extract-check-interactive
Refactor "fetch" and "extract" code into correspondingly named subdirectories of pkgsrc/mk. Move the following files around for locality: pkgsrc/mk/scripts/extract -> pkgsrc/mk/extract/extract pkgsrc/mk/bsd.sites.mk -> pkgsrc/mk/fetch/sites.mk Also get rid of the recursive make for the "fetch" and "extract" targets. This basically merges the "fetch" and "extract" phases into the "patch" phase. There is still much more work to do to simplify the fetch code, but this is a good start.
2006-06-06 05:05:48 +02:00
extract-check-interactive:
.if !empty(INTERACTIVE_STAGE:Mextract) && defined(BATCH)
@${ERROR_MSG} "The extract stage of this package requires user interaction"
@${ERROR_MSG} "Please extract manually with:"
No need to synthesis the package directory from components when ${.CURDIR} already has the right value.
2006-06-09 10:20:30 +02:00
@${ERROR_MSG} " \"cd ${.CURDIR} && ${MAKE} extract\""
Removed _INTERACTIVE_COOKIE, after asking on tech-pkg if anyone needs it. It had only been used to change the "nerrors" variable in bulk builds, but this variable is not used further anyway.
2007-12-01 12:11:53 +01:00
${RUN} ${FALSE}
Refactor "fetch" and "extract" code into correspondingly named subdirectories of pkgsrc/mk. Move the following files around for locality: pkgsrc/mk/scripts/extract -> pkgsrc/mk/extract/extract pkgsrc/mk/bsd.sites.mk -> pkgsrc/mk/fetch/sites.mk Also get rid of the recursive make for the "fetch" and "extract" targets. This basically merges the "fetch" and "extract" phases into the "patch" phase. There is still much more work to do to simplify the fetch code, but this is a good start.
2006-06-06 05:05:48 +02:00
.else
@${DO_NADA}
Separate out the variables and targets for the "extract" phase into a separate file pkgsrc/mk/bsd.pkg.extract.mk. Also, include this file ahead of the inclusion of bsd.tools.mk so that tools required to extract are created by the tools framework.
2005-05-11 06:01:49 +02:00
.endif
Refactor "fetch" and "extract" code into correspondingly named subdirectories of pkgsrc/mk. Move the following files around for locality: pkgsrc/mk/scripts/extract -> pkgsrc/mk/extract/extract pkgsrc/mk/bsd.sites.mk -> pkgsrc/mk/fetch/sites.mk Also get rid of the recursive make for the "fetch" and "extract" targets. This basically merges the "fetch" and "extract" phases into the "patch" phase. There is still much more work to do to simplify the fetch code, but this is a good start.
2006-06-06 05:05:48 +02:00
######################################################################
### extract-cookie (PRIVATE)
######################################################################
### extract-cookie creates the "extract" cookie file. The contents
### are the name of the package.
###
.PHONY: extract-cookie
extract-cookie:
Got rid of _PKG_SILENT. Why use __file__ when a simple f does the same?
2008-01-23 15:59:35 +01:00
${RUN}${TEST} ! -f ${_COOKIE.extract} || ${FALSE}
${RUN}${MKDIR} ${_COOKIE.extract:H}
${RUN}${ECHO} ${PKGNAME} > ${_COOKIE.extract}
Refactor "fetch" and "extract" code into correspondingly named subdirectories of pkgsrc/mk. Move the following files around for locality: pkgsrc/mk/scripts/extract -> pkgsrc/mk/extract/extract pkgsrc/mk/bsd.sites.mk -> pkgsrc/mk/fetch/sites.mk Also get rid of the recursive make for the "fetch" and "extract" targets. This basically merges the "fetch" and "extract" phases into the "patch" phase. There is still much more work to do to simplify the fetch code, but this is a good start.
2006-06-06 05:05:48 +02:00
######################################################################
### pre-extract, do-extract, post-extract (PUBLIC, override)
######################################################################
### {pre,do,post}-extract are the heart of the package-customizable
### extract targets, and may be overridden within a package Makefile.
###
.PHONY: pre-extract do-extract post-extract
EXTRACT_USING?= nbtar
EXTRACT_ELEMENTS?= # empty
Use /usr/pkgsrc/mk/scripts/extract to do extraction instead of using all that Makefile code to determine the right extraction command to use. This change removes EXTRACT_CMD.<suffix>.
2006-01-21 19:55:10 +01:00
###
### Build the default extraction command
###
_EXTRACT_ENV+= ${EXTRACT_OPTS_BIN:D EXTRACT_OPTS_BIN=${EXTRACT_OPTS_BIN:Q}}
_EXTRACT_ENV+= ${EXTRACT_OPTS_LHA:D EXTRACT_OPTS_LHA=${EXTRACT_OPTS_LHA:Q}}
_EXTRACT_ENV+= ${EXTRACT_OPTS_PAX:D EXTRACT_OPTS_PAX=${EXTRACT_OPTS_PAX:Q}}
_EXTRACT_ENV+= ${EXTRACT_OPTS_RAR:D EXTRACT_OPTS_RAR=${EXTRACT_OPTS_RAR:Q}}
Teach the extract module to extract RPMs with rpm2pkg.
2007-07-31 19:42:40 +02:00
_EXTRACT_ENV+= ${EXTRACT_OPTS_RPM:D EXTRACT_OPTS_LHA=${EXTRACT_OPTS_RPM:Q}}
Use /usr/pkgsrc/mk/scripts/extract to do extraction instead of using all that Makefile code to determine the right extraction command to use. This change removes EXTRACT_CMD.<suffix>.
2006-01-21 19:55:10 +01:00
_EXTRACT_ENV+= ${EXTRACT_OPTS_TAR:D EXTRACT_OPTS_TAR=${EXTRACT_OPTS_TAR:Q}}
_EXTRACT_ENV+= ${EXTRACT_OPTS_ZIP:D EXTRACT_OPTS_ZIP=${EXTRACT_OPTS_ZIP:Q}}
_EXTRACT_ENV+= ${EXTRACT_OPTS_ZOO:D EXTRACT_OPTS_ZOO=${EXTRACT_OPTS_ZOO:Q}}
tools definition of bzcat may have option (ex. bzip2 -cd), allow it.
2010-02-07 09:00:51 +01:00
_EXTRACT_ENV+= ${TOOLS_CMDLINE_BZCAT:D BZCAT=${TOOLS_CMDLINE_BZCAT:Q}}
Use /usr/pkgsrc/mk/scripts/extract to do extraction instead of using all that Makefile code to determine the right extraction command to use. This change removes EXTRACT_CMD.<suffix>.
2006-01-21 19:55:10 +01:00
_EXTRACT_ENV+= ${TOOLS_CAT:D CAT=${TOOLS_CAT:Q}}
_EXTRACT_ENV+= ${TOOLS_CP:D CP=${TOOLS_CP:Q}}
_EXTRACT_ENV+= ${TOOLS_ECHO:D ECHO=${TOOLS_ECHO:Q}}
gzcat needs the full command, not only the pathname, in case it is ${GZIP} -cd.
2006-01-23 15:43:50 +01:00
_EXTRACT_ENV+= ${TOOLS_CMDLINE.gzcat:D GZCAT=${TOOLS_CMDLINE.gzcat:Q}}
Use /usr/pkgsrc/mk/scripts/extract to do extraction instead of using all that Makefile code to determine the right extraction command to use. This change removes EXTRACT_CMD.<suffix>.
2006-01-21 19:55:10 +01:00
_EXTRACT_ENV+= ${TOOLS_LHA:D LHA=${TOOLS_LHA:Q}}
_EXTRACT_ENV+= ${TOOLS_MKDIR:D MKDIR=${TOOLS_MKDIR:Q}}
_EXTRACT_ENV+= ${TOOLS_RM:D RM=${TOOLS_RM:Q}}
Teach the extract module to extract RPMs with rpm2pkg.
2007-07-31 19:42:40 +02:00
_EXTRACT_ENV+= ${TOOLS_RPM2PKG:D RPM2PKG=${TOOLS_RPM2PKG:Q}}
Use /usr/pkgsrc/mk/scripts/extract to do extraction instead of using all that Makefile code to determine the right extraction command to use. This change removes EXTRACT_CMD.<suffix>.
2006-01-21 19:55:10 +01:00
_EXTRACT_ENV+= ${TOOLS_PAX:D PAX=${TOOLS_PAX:Q}}
_EXTRACT_ENV+= ${TOOLS_SH:D SH=${TOOLS_SH:Q}}
_EXTRACT_ENV+= ${TOOLS_TAR:D TAR=${TOOLS_TAR:Q}}
_EXTRACT_ENV+= ${TOOLS_TEST:D TEST=${TOOLS_TEST:Q}}
_EXTRACT_ENV+= ${TOOLS_UNRAR:D UNRAR=${TOOLS_UNRAR:Q}}
_EXTRACT_ENV+= ${TOOLS_UNZIP_CMD:D UNZIP_CMD=${TOOLS_UNZIP_CMD:Q}}
_EXTRACT_ENV+= ${TOOLS_UNZOO:D UNZOO=${TOOLS_UNZOO:Q}}
Uncompress .xz using xzcat.
2009-07-08 15:27:52 +02:00
_EXTRACT_ENV+= ${TOOLS_XZCAT:D XZCAT=${TOOLS_XZCAT:Q}}
Replace whitespace with tab.
2012-10-07 00:16:08 +02:00
_EXTRACT_ENV+= ${TOOLS_7ZA:D P7ZA=${TOOLS_7ZA:Q}}
Use /usr/pkgsrc/mk/scripts/extract to do extraction instead of using all that Makefile code to determine the right extraction command to use. This change removes EXTRACT_CMD.<suffix>.
2006-01-21 19:55:10 +01:00
_EXTRACT_ENV+= ${EXTRACT_ENV}
Separate out the variables and targets for the "extract" phase into a separate file pkgsrc/mk/bsd.pkg.extract.mk. Also, include this file ahead of the inclusion of bsd.tools.mk so that tools required to extract are created by the tools framework.
2005-05-11 06:01:49 +02:00
Add support to extract using bsdtar.
2008-05-25 22:02:02 +02:00
.if !empty(EXTRACT_USING:Mbsdtar)
_EXTRACT_TAR= ${TOOLS_PATH.bsdtar}
.elif !empty(EXTRACT_USING:Mgtar)
EXTRACT_USING is always set, even when the necessary tools are not depended on because it is not used. Work around it for now by checking that the target is actually non-empty explicitly. This is still simpler than the original code. After the branch, this will be reordered so that it only gets set to non-default values when it will be used.
2007-12-30 14:37:18 +01:00
_EXTRACT_TAR= ${TOOLS_PATH.gtar}
NetBSD's (and bootstrap's) pax-as-tar is GNUish enough to extract most GNU tar archives. Create a new EXTRACT_USING value "nbtar" that causes tar/ustar archives to be extracted using pax-as-tar, which understands most GNU tar extensions. Default to EXTRACT_USING=nbtar, as quite a few packages are distributed in GNU tar archives.
2005-05-16 20:43:20 +02:00
.elif !empty(EXTRACT_USING:Mnbtar)
EXTRACT_USING is always set, even when the necessary tools are not depended on because it is not used. Work around it for now by checking that the target is actually non-empty explicitly. This is still simpler than the original code. After the branch, this will be reordered so that it only gets set to non-default values when it will be used.
2007-12-30 14:37:18 +01:00
_EXTRACT_TAR= ${TOOLS_TAR}
.elif !empty(EXTRACT_USING:Mpax)
_EXTRACT_TAR= ${TOOLS_PAX}
Change the EXTRACT_USING_PAX defined/undefined option into a EXTRACT_USING which can take multiple values -- "pax" or "gtar". The default value of EXTRACT_USING is "pax", which more closely matches reality since before, we were using bootstrap "tar" for ${GTAR} and it was actually pax-as-tar. Also, stop pretending pax-as-tar from the bootstrap kit or on NetBSD is GNU tar. Lastly, in bsd.pkg.extract.mk, note whether we need "pax" or "gtar" depending on what we need to extract the distfiles.
2005-05-16 05:04:44 +02:00
.else
EXTRACT_USING is always set, even when the necessary tools are not depended on because it is not used. Work around it for now by checking that the target is actually non-empty explicitly. This is still simpler than the original code. After the branch, this will be reordered so that it only gets set to non-default values when it will be used.
2007-12-30 14:37:18 +01:00
_EXTRACT_TAR=
.endif
.if !empty(_EXTRACT_TAR)
EXTRACT_OPTS+= -t ${_EXTRACT_TAR}
Separate out the variables and targets for the "extract" phase into a separate file pkgsrc/mk/bsd.pkg.extract.mk. Also, include this file ahead of the inclusion of bsd.tools.mk so that tools required to extract are created by the tools framework.
2005-05-11 06:01:49 +02:00
.endif
Invent new variable EXTRACTOR that has the environment and path to the extract script. This can be used in a more natural way by custom do-extract targets than EXTRACT_CMD.
2008-03-12 16:51:39 +01:00
EXTRACTOR= \
Introduce PKGSRC_SETENV, defaulting to SETENV. Can be set to ${SETENV} -i to santise environment
2011-09-08 22:17:15 +02:00
${PKGSRC_SETENV} ${_EXTRACT_ENV} ${SH} ${PKGSRCDIR}/mk/extract/extract
Invent new variable EXTRACTOR that has the environment and path to the extract script. This can be used in a more natural way by custom do-extract targets than EXTRACT_CMD.
2008-03-12 16:51:39 +01:00
EXTRACT_CMD_DEFAULT= \
${EXTRACTOR} ${EXTRACT_OPTS} ${DOWNLOADED_DISTFILE} ${EXTRACT_ELEMENTS}
Set EXTRACT_CMD_DEFAULT to the default extraction command that invokes the "extract" script. This allows custom EXTRACT_CMD settings to still invoke ${EXTRACT_CMD_DEFAULT}.
2006-01-21 20:39:22 +01:00
EXTRACT_CMD?= ${EXTRACT_CMD_DEFAULT}
Separate out the variables and targets for the "extract" phase into a separate file pkgsrc/mk/bsd.pkg.extract.mk. Also, include this file ahead of the inclusion of bsd.tools.mk so that tools required to extract are created by the tools framework.
2005-05-11 06:01:49 +02:00
Use /usr/pkgsrc/mk/scripts/extract to do extraction instead of using all that Makefile code to determine the right extraction command to use. This change removes EXTRACT_CMD.<suffix>.
2006-01-21 19:55:10 +01:00
DOWNLOADED_DISTFILE= $${extract_file}
Separate out the variables and targets for the "extract" phase into a separate file pkgsrc/mk/bsd.pkg.extract.mk. Also, include this file ahead of the inclusion of bsd.tools.mk so that tools required to extract are created by the tools framework.
2005-05-11 06:01:49 +02:00
.if !target(do-extract)
do-extract: ${WRKDIR}
Got rid of _PKG_SILENT. Why use __file__ when a simple f does the same?
2008-01-23 15:59:35 +01:00
. for f in ${EXTRACT_ONLY}
${RUN} extract_file=${_DISTDIR:Q}/${f:Q}; export extract_file; \
Allow EXTRACT_DIR to be specified independently for each file. OK wiz@
2010-10-15 22:22:27 +02:00
cd ${WRKDIR} && cd ${EXTRACT_DIR.${f}} && ${EXTRACT_CMD}
Separate out the variables and targets for the "extract" phase into a separate file pkgsrc/mk/bsd.pkg.extract.mk. Also, include this file ahead of the inclusion of bsd.tools.mk so that tools required to extract are created by the tools framework.
2005-05-11 06:01:49 +02:00
. endfor
.endif
Move more of the "extract"-related variables and targets out of bsd.pkg.mk and into bsd.pkg.extract.mk.
2006-01-19 20:35:25 +01:00
.if !target(pre-extract)
pre-extract:
@${DO_NADA}
.endif
.if !target(post-extract)
post-extract:
@${DO_NADA}
.endif
Reference in a new issue Copy permalink