diff options
| author | jlam <jlam> | 2004-11-30 23:21:43 +0000 |
|---|---|---|
| committer | jlam <jlam> | 2004-11-30 23:21:43 +0000 |
| commit | f56020f53b2bc79427e7e67cd7374e9665842227 (patch) | |
| tree | e4f2b94dbd7a4f712a3298ad181985fa7c52cad5 /www | |
| parent | 17bef65ee21b57d2b396ea66643ee619d3e95b12 (diff) | |
| download | pkgsrc-f56020f53b2bc79427e7e67cd7374e9665842227.tar.gz | |
Modify the apxs(8) script to use ${APR_LIBTOOL} as the libtool to
build modules if APR_LIBTOOL is defined in the environment. Force
the use of the libtool wrapper by module packages by setting APR_LIBTOOL
in apache2/buildlink3.mk. Bump the PKGREVISION.
Diffstat (limited to 'www')
| -rw-r--r-- | www/apache2/Makefile | 4 | ||||
| -rw-r--r-- | www/apache2/buildlink3.mk | 6 | ||||
| -rw-r--r-- | www/apache2/distinfo | 3 | ||||
| -rw-r--r-- | www/apache2/patches/patch-ai | 20 |
4 files changed, 28 insertions, 5 deletions
diff --git a/www/apache2/Makefile b/www/apache2/Makefile index 519e8198b40..500c060f6a9 100644 --- a/www/apache2/Makefile +++ b/www/apache2/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.58 2004/11/26 23:07:58 jlam Exp $ +# $NetBSD: Makefile,v 1.59 2004/11/30 23:21:43 jlam Exp $ .include "Makefile.common" PKGNAME= apache-${APACHE_VERSION} -PKGREVISION= 3 +PKGREVISION= 4 CATEGORIES= www HOMEPAGE= http://httpd.apache.org/ diff --git a/www/apache2/buildlink3.mk b/www/apache2/buildlink3.mk index 5f569079fff..aa0dcc4b705 100644 --- a/www/apache2/buildlink3.mk +++ b/www/apache2/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.9 2004/11/23 20:17:55 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.10 2004/11/30 23:21:44 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ APACHE_BUILDLINK3_MK:= ${APACHE_BUILDLINK3_MK}+ @@ -20,7 +20,9 @@ BUILDLINK_DEPMETHOD.apache+= full . endif .endif # APACHE_BUILDLINK3_MK -USE_PERL5?= build # for "apxs" +USE_PERL5?= build # for "apxs" +CONFIGURE_ENV+= APR_LIBTOOL=${LIBTOOL} # make apxs use the libtool we specify +MAKE_ENV+= APR_LIBTOOL=${LIBTOOL} APXS?= ${BUILDLINK_PREFIX.apache}/sbin/apxs .if !empty(APACHE_BUILDLINK3_MK:M+) diff --git a/www/apache2/distinfo b/www/apache2/distinfo index a2b6bb84e45..3793bee5567 100644 --- a/www/apache2/distinfo +++ b/www/apache2/distinfo @@ -1,10 +1,11 @@ -$NetBSD: distinfo,v 1.31 2004/11/26 23:07:59 jlam Exp $ +$NetBSD: distinfo,v 1.32 2004/11/30 23:21:44 jlam Exp $ SHA1 (httpd-2.0.52.tar.gz) = 2a22fde052adc7d7258f999cd7dd8a7592ff36e7 Size (httpd-2.0.52.tar.gz) = 6918995 bytes SHA1 (patch-aa) = 8ff497da17144d191e633d59274bf2f7e0e7c08c SHA1 (patch-ad) = 27fa3655d6ba4840296e79fa6fd96cd9de79a33a SHA1 (patch-ag) = 78dcb023f524ef65928b529320932c9664ec0d01 +SHA1 (patch-ai) = d728490b66032d8bb2aa8d4ccdeca3d45f7c2b08 SHA1 (patch-ak) = f11a86b1235d5c595fa381bbb474db4fe8448215 SHA1 (patch-al) = 29cc52616c50b7ec998339cca386112a8f1611cc SHA1 (patch-am) = ff60a7b69ad949363ebec194141e9b95cb796426 diff --git a/www/apache2/patches/patch-ai b/www/apache2/patches/patch-ai new file mode 100644 index 00000000000..037ab26777b --- /dev/null +++ b/www/apache2/patches/patch-ai @@ -0,0 +1,20 @@ +$NetBSD: patch-ai,v 1.6 2004/11/30 23:21:44 jlam Exp $ + +--- support/apxs.in.orig 2004-02-09 15:59:49.000000000 -0500 ++++ support/apxs.in +@@ -337,9 +337,12 @@ if (! -x "$apu_bindir/apu-config") { + exit(1); + } + +-my $libtool = `$apr_bindir/apr-config --installbuilddir`; +-chomp($libtool); +-$libtool = "$libtool/libtool"; ++my $libtool = $ENV{'APR_LIBTOOL'}; ++unless ($libtool) { ++ $libtool = `$apr_bindir/apr-config --installbuilddir`; ++ chomp($libtool); ++ $libtool = "$libtool/libtool"; ++} + + my $apr_includedir = `$apr_bindir/apr-config --includes`; + chomp($apr_includedir); |