diff options
| author | chris <chris> | 2003-07-08 09:20:30 +0000 |
|---|---|---|
| committer | chris <chris> | 2003-07-08 09:20:30 +0000 |
| commit | c4deafe529ad5e7906da26ecb93f94f2244d3fd3 (patch) | |
| tree | d60bc7ed6601ef70bf053beaff23d53ef10f98e7 /mk | |
| parent | 11a0587cd12e0f59ef7698b8c08f4716b21453b5 (diff) | |
| download | pkgsrc-c4deafe529ad5e7906da26ecb93f94f2244d3fd3.tar.gz | |
Fix for _CONFIGURE_PREREQ targets not being run when a package defines a
do-configure target. To do this I've introduced a new target,
pre-configure-overrides, that depends on ${_CONFIGURE_PREREQ}. It's run
after pre-configure but before do-configure.
This fixes pkg/22077, and allows benchmarks/benchfft to build correctly on
a -current cats box.
Reviewed by wiz@
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/bsd.pkg.mk | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk index 69bf69984d7..0ead9fad345 100644 --- a/mk/bsd.pkg.mk +++ b/mk/bsd.pkg.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.mk,v 1.1203 2003/07/02 23:02:23 jmmv Exp $ +# $NetBSD: bsd.pkg.mk,v 1.1204 2003/07/08 09:20:30 chris Exp $ # # This file is in the public domain. # @@ -1975,7 +1975,8 @@ do-patch: uptodate-digest # _CONFIGURE_PREREQ is a list of targets to run after pre-configure but before # do-configure. These targets typically edit the files used by the -# do-configure target. +# do-configure target. The targets are run as dependacies of +# pre-configure-override. # # _CONFIGURE_POSTREQ is a list of targets to run after do-configure but before # post-configure. These targets typically edit the files generated by @@ -2117,8 +2118,12 @@ automake-post-override: . endif # AUTOMAKE_OVERRIDE .endif # USE_BUILDLINK != "no" +# By adding this target, it makes sure the the above PREREQ's work. +pre-configure-override: ${_CONFIGURE_PREREQ} + ${DO_NADA} + .if !target(do-configure) -do-configure: ${_CONFIGURE_PREREQ} +do-configure: . if defined(HAS_CONFIGURE) . for DIR in ${CONFIGURE_DIRS} ${_PKG_SILENT}${_PKG_DEBUG}${_ULIMIT_CMD}cd ${DIR} && ${SETENV} \ @@ -2828,7 +2833,7 @@ test-cookie: .ORDER: extract-message install-depends pre-extract do-extract post-extract extract-cookie .ORDER: patch-message pre-patch do-patch post-patch patch-cookie .ORDER: buildlink-message pre-buildlink do-buildlink post-buildlink buildlink-cookie -.ORDER: configure-message pre-configure do-configure post-configure configure-cookie +.ORDER: configure-message pre-configure pre-configure-override do-configure post-configure configure-cookie .ORDER: build-message pre-build do-build post-build build-cookie .ORDER: test-message pre-test do-test post-test test-cookie @@ -2839,7 +2844,7 @@ real-fetch: pre-fetch do-fetch post-fetch real-extract: extract-message install-depends pre-extract do-extract post-extract extract-cookie real-patch: patch-message pre-patch do-patch post-patch patch-cookie real-buildlink: buildlink-message pre-buildlink do-buildlink post-buildlink buildlink-cookie -real-configure: configure-message pre-configure do-configure post-configure configure-cookie +real-configure: configure-message pre-configure pre-configure-override do-configure post-configure configure-cookie real-build: build-message pre-build do-build post-build build-cookie real-test: test-message pre-test do-test post-test test-cookie real-install: do-su-install |