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

199 lines
6.9 KiB
Makefile
Raw Normal View History

The cookie files are indirectly made using *-cookie targets, so verify that they are never being created more than once by inserting a check into the *-cookie targets.
2006-07-07 00:29:52 +02:00
# $NetBSD: extract.mk,v 1.10 2006/07/06 22:29:52 jlam 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:
#
# 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
# "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
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= ${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
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+= checksum
Introduce "makedirs" as a helper target to create directories with unprivileged ownership.
2006-06-08 18:21:51 +02:00
_EXTRACT_TARGETS+= makedirs
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+= depends
Separate out the part of bsd.tools.mk that actually created the tools into a new file pkgsrc/mk/tools/create.mk. This leaves bsd.tools.mk as a file that pulls in all of the other ones. Also move the tools-related targets from bsd.pkg.mk into bsd.tools.mk. The tools cookie file has been removed, as well as hooks for {pre,do,post}-tools. Instead, there is now only a single public target "tools" which may be invoked. Invoking "tools" will always cause all of the tools in ${TOOLS_DIR} to be created. The "tools" step has been moved and is now just after the "depends" step and before sources are extracted. This is the earliest place where the "tools" step can be taken, and it allows the created tools to be used in all steps/phases after it, starting with "extract". As a consequence, we should just invoke tools by their bare names in targets, e.g. awk, sed, patch, etc., instead of with the ${VARIABLE} names, e.g. ${AWK}, ${SED}, ${PATCH}, etc.
2006-06-06 08:30: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
_EXTRACT_TARGETS+= ${_EXTRACT_COOKIE}
_EXTRACT_TARGETS+= release-extract-lock
.PHONY: extract
.if !target(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
. if exists(${_EXTRACT_COOKIE})
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}
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
. else
extract: ${_EXTRACT_TARGETS}
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
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
.if exists(${_EXTRACT_COOKIE})
${_EXTRACT_COOKIE}:
@${DO_NADA}
.else
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}: 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
_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}"
######################################################################
### 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.
###
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\""
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
@${TOUCH} ${_INTERACTIVE_COOKIE}
@${FALSE}
.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:
The cookie files are indirectly made using *-cookie targets, so verify that they are never being created more than once by inserting a check into the *-cookie targets.
2006-07-07 00:29:52 +02:00
${_PKG_SILENT}${_PKG_DEBUG}${TEST} ! -f ${_EXTRACT_COOKIE} || ${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
${_PKG_SILENT}${_PKG_DEBUG}${MKDIR} ${_EXTRACT_COOKIE:H}
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
${_PKG_SILENT}${_PKG_DEBUG}${ECHO} ${PKGNAME} > ${_EXTRACT_COOKIE}
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}}
_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}}
_EXTRACT_ENV+= ${TOOLS_BZCAT:D BZCAT=${TOOLS_BZCAT:Q}}
_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}}
_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}}
_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
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
.if !empty(EXTRACT_USING:Mgtar)
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+= ${TOOLS_GTAR:D -t ${TOOLS_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)
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+= ${TOOLS_TAR:D -t ${TOOLS_TAR}}
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
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+= ${TOOLS_PAX:D -t ${TOOLS_PAX}}
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
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_DEFAULT= \
${SETENV} ${_EXTRACT_ENV} \
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
${SH} ${PKGSRCDIR}//mk/extract/extract \
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_OPTS} \
${DOWNLOADED_DISTFILE} ${EXTRACT_ELEMENTS}
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}
. for __file__ in ${EXTRACT_ONLY}
${_PKG_SILENT}${_PKG_DEBUG} \
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_file=${_DISTDIR:Q}/${__file__:Q}; export extract_file; \
cd ${WRKDIR} && ${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