[pkgsrc/trunk]: pkgsrc/www/apache Pass the DL_* flags to the compiler when bu...

[jlam <jlam%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/c5b2155fceef
branches:  trunk
changeset: 484258:c5b2155fceef
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Fri Nov 26 18:52:47 2004 +0000

description:
Pass the DL_* flags to the compiler when building httpd so that dlopen
will work correctly on NetBSD-2.x.  This should fix PR pkg/29398.

diffstat:

 www/apache/Makefile         |   4 +++-
 www/apache/distinfo         |   4 ++--
 www/apache/patches/patch-ak |  15 +++++++++------
 3 files changed, 14 insertions(+), 9 deletions(-)

diffs (67 lines):

diff -r f71361577943 -r c5b2155fceef www/apache/Makefile
--- a/www/apache/Makefile       Fri Nov 26 18:26:01 2004 +0000
+++ b/www/apache/Makefile       Fri Nov 26 18:52:47 2004 +0000
@@ -1,10 +1,11 @@
-# $NetBSD: Makefile,v 1.157 2004/11/22 22:19:35 wiz Exp $
+# $NetBSD: Makefile,v 1.158 2004/11/26 18:52:47 jlam Exp $
 #
 # This pkg does not compile in mod_ssl, only the `mod_ssl EAPI' (a set of
 # code hooks that allow mod_ssl to be compiled separately later, if desired).
 
 DISTNAME=              apache_1.3.33
 PKGNAME=               ${DISTNAME:S/_/-/}
+PKGREVISION=           1
 CATEGORIES=            www
 MASTER_SITES=          ${MASTER_SITE_APACHE:=httpd/} \
                        ${MASTER_SITE_APACHE:=httpd/old/}
@@ -162,6 +163,7 @@
 .include "../../devel/libmm/buildlink3.mk"
 .include "../../textproc/expat/buildlink3.mk"
 .include "../../mk/bdb.buildlink3.mk"
+.include "../../mk/dlopen.buildlink3.mk"
 
 post-extract:
        @${CP} ${FILESDIR}/ap_include_extern.h ${WRKSRC}/src/include
diff -r f71361577943 -r c5b2155fceef www/apache/distinfo
--- a/www/apache/distinfo       Fri Nov 26 18:26:01 2004 +0000
+++ b/www/apache/distinfo       Fri Nov 26 18:52:47 2004 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.41 2004/11/16 08:23:45 tron Exp $
+$NetBSD: distinfo,v 1.42 2004/11/26 18:52:47 jlam Exp $
 
 SHA1 (apache_1.3.33.tar.gz) = 4cd49534d1abd04c81ab215f2457122d85855b0d
 Size (apache_1.3.33.tar.gz) = 2468567 bytes
@@ -16,6 +16,6 @@
 SHA1 (patch-ah) = 477e32b049f66a326364236f63e96759f2274df6
 SHA1 (patch-ai) = e2e48f48bec8cba85345e31541d4e4ddcc30e799
 SHA1 (patch-aj) = ac7337b51d7d4ca25cef4020961736404ec79f01
-SHA1 (patch-ak) = a3790a19e06aa4aa02977f1f30c09697e46488c7
+SHA1 (patch-ak) = 1be52fb5fca6c05c7cf489de541e0d52383ee43a
 SHA1 (patch-am) = d298b35feb177f0efcda1f9f5ebcba562ae46c29
 SHA1 (patch-ao) = 9ec5f32b2e9cf4c423b5d819fc76f652b27c6c29
diff -r f71361577943 -r c5b2155fceef www/apache/patches/patch-ak
--- a/www/apache/patches/patch-ak       Fri Nov 26 18:26:01 2004 +0000
+++ b/www/apache/patches/patch-ak       Fri Nov 26 18:52:47 2004 +0000
@@ -1,13 +1,16 @@
-$NetBSD: patch-ak,v 1.6 2004/10/29 13:48:31 abs Exp $
+$NetBSD: patch-ak,v 1.7 2004/11/26 18:52:47 jlam Exp $
 
---- src/Makefile.tmpl.orig     2004-10-29 14:44:35.000000000 +0100
+--- src/Makefile.tmpl.orig     2004-11-26 04:47:20.000000000 -0500
 +++ src/Makefile.tmpl
-@@ -2,7 +2,7 @@
- CFLAGS=$(OPTIM) $(CFLAGS1) $(EXTRA_CFLAGS)
- LIBS=$(EXTRA_LIBS) $(LIBS1)
+@@ -1,8 +1,8 @@
+ 
+-CFLAGS=$(OPTIM) $(CFLAGS1) $(EXTRA_CFLAGS)
+-LIBS=$(EXTRA_LIBS) $(LIBS1)
++CFLAGS=$(OPTIM) $(CFLAGS1) $(EXTRA_CFLAGS) $(DL_CFLAGS)
++LIBS=$(EXTRA_LIBS) $(LIBS1) $(DL_LIBS)
  INCLUDES=$(INCLUDES1) $(INCLUDES0) $(EXTRA_INCLUDES)
 -LDFLAGS=$(LDFLAGS1) $(EXTRA_LDFLAGS)
-+LDFLAGS=$(LDFLAGS1) $(EXTRA_LDFLAGS) $(LINK_LIBGCC_LDFLAGS)
++LDFLAGS=$(LDFLAGS1) $(EXTRA_LDFLAGS) $(LINK_LIBGCC_LDFLAGS) $(DL_LDFLAGS)
  
  OBJS= \
    modules.o \