diff options
| author | jlam <jlam@pkgsrc.org> | 2004-03-18 09:12:08 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2004-03-18 09:12:08 +0000 |
| commit | 7db11b582a4d621362622fad99df1da62e930ffa (patch) | |
| tree | 98bc5d9451729f031998fd23ac3319a5618c75b0 /www/apache2/buildlink3.mk | |
| parent | 46cf8098c1fdcd3f6e05f41ed78671dfaa7ae192 (diff) | |
| download | pkgsrc-7db11b582a4d621362622fad99df1da62e930ffa.tar.gz | |
Fix serious bug where BUILDLINK_PACKAGES wasn't being ordered properly
by moving the inclusion of buildlink3.mk files outside of the protected
region. This bug would be seen by users that have set PREFER_PKGSRC
or PREFER_NATIVE to non-default values.
BUILDLINK_PACKAGES should be ordered so that for any package in the
list, that package doesn't depend on any packages to the left of it
in the list. This ordering property is used to check for builtin
packages in the correct order. The problem was that including a
buildlink3.mk file for <pkg> correctly ensured that <pkg> was removed
from BUILDLINK_PACKAGES and appended to the end. However, since the
inclusion of any other buildlink3.mk files within that buildlink3.mk
was in a region that was protected against multiple inclusion, those
dependencies weren't also moved to the end of BUILDLINK_PACKAGES.
Diffstat (limited to 'www/apache2/buildlink3.mk')
| -rw-r--r-- | www/apache2/buildlink3.mk | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/www/apache2/buildlink3.mk b/www/apache2/buildlink3.mk index 2e8cc2831aa..1daad9d5fab 100644 --- a/www/apache2/buildlink3.mk +++ b/www/apache2/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.1 2004/03/08 00:15:53 minskim Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2004/03/18 09:12:15 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ APACHE_BUILDLINK3_MK:= ${APACHE_BUILDLINK3_MK}+ @@ -14,20 +14,20 @@ BUILDLINK_PACKAGES+= apache BUILDLINK_DEPENDS.apache+= apache>=2.0.48nb3 BUILDLINK_PKGSRCDIR.apache?= ../../www/apache2 BUILDLINK_DEPMETHOD.apache?= build - -USE_PERL5?= build # for "apxs" - -.if defined(APACHE_MODULE) +. if defined(APACHE_MODULE) BUILDLINK_DEPMETHOD.apache+= full -.endif +. endif +.endif # APACHE_BUILDLINK3_MK + +USE_PERL5?= build # for "apxs" +APXS?= ${BUILDLINK_PREFIX.apache}/sbin/apxs .include "../../devel/apr/buildlink3.mk" -APXS?= ${BUILDLINK_PREFIX.apache}/sbin/apxs -.if defined(GNU_CONFIGURE) +.if !empty(APACHE_BUILDLINK3_MK:M+) +. if defined(GNU_CONFIGURE) CONFIGURE_ARGS+= --with-apxs2="${APXS}" -.endif - +. endif .endif # APACHE_BUILDLINK3_MK BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} |