pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/www/apache2 Pass DL_* flags to the compiler when linki...
details: https://anonhg.NetBSD.org/pkgsrc/rev/ca769ea63521
branches: trunk
changeset: 484293:ca769ea63521
user: jlam <jlam%pkgsrc.org@localhost>
date: Fri Nov 26 23:07:58 2004 +0000
description:
Pass DL_* flags to the compiler when linking httpd since it dlopens
shared modules. Bump the PKGREVISION.
diffstat:
www/apache2/Makefile | 5 +++--
www/apache2/distinfo | 4 ++--
www/apache2/patches/patch-aa | 33 +++++++++++++++++++++------------
3 files changed, 26 insertions(+), 16 deletions(-)
diffs (134 lines):
diff -r ac3de7bb1069 -r ca769ea63521 www/apache2/Makefile
--- a/www/apache2/Makefile Fri Nov 26 23:05:37 2004 +0000
+++ b/www/apache2/Makefile Fri Nov 26 23:07:58 2004 +0000
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.57 2004/11/24 07:39:50 jlam Exp $
+# $NetBSD: Makefile,v 1.58 2004/11/26 23:07:58 jlam Exp $
.include "Makefile.common"
PKGNAME= apache-${APACHE_VERSION}
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= www
HOMEPAGE= http://httpd.apache.org/
@@ -32,6 +32,7 @@
.include "../../devel/apr/buildlink3.mk"
.include "../../lang/perl5/buildlink3.mk"
.include "../../textproc/expat/buildlink3.mk"
+.include "../../mk/dlopen.buildlink3.mk"
# Set the "Multi-Processing Model" used by Apache to handle requests.
# Valid values are:
diff -r ac3de7bb1069 -r ca769ea63521 www/apache2/distinfo
--- a/www/apache2/distinfo Fri Nov 26 23:05:37 2004 +0000
+++ b/www/apache2/distinfo Fri Nov 26 23:07:58 2004 +0000
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.30 2004/10/02 15:47:02 reed Exp $
+$NetBSD: distinfo,v 1.31 2004/11/26 23:07:59 jlam Exp $
SHA1 (httpd-2.0.52.tar.gz) = 2a22fde052adc7d7258f999cd7dd8a7592ff36e7
Size (httpd-2.0.52.tar.gz) = 6918995 bytes
-SHA1 (patch-aa) = 341d546fa758ae65023ff13422a3a002a7f1686b
+SHA1 (patch-aa) = 8ff497da17144d191e633d59274bf2f7e0e7c08c
SHA1 (patch-ad) = 27fa3655d6ba4840296e79fa6fd96cd9de79a33a
SHA1 (patch-ag) = 78dcb023f524ef65928b529320932c9664ec0d01
SHA1 (patch-ak) = f11a86b1235d5c595fa381bbb474db4fe8448215
diff -r ac3de7bb1069 -r ca769ea63521 www/apache2/patches/patch-aa
--- a/www/apache2/patches/patch-aa Fri Nov 26 23:05:37 2004 +0000
+++ b/www/apache2/patches/patch-aa Fri Nov 26 23:07:58 2004 +0000
@@ -1,8 +1,17 @@
-$NetBSD: patch-aa,v 1.12 2004/07/14 08:28:51 adrianp Exp $
+$NetBSD: patch-aa,v 1.13 2004/11/26 23:07:59 jlam Exp $
---- Makefile.in.orig Sat Dec 27 12:00:42 2003
-+++ Makefile.in Sat Jul 3 18:13:46 2004
-@@ -14,7 +14,7 @@
+--- Makefile.in.orig 2004-08-26 09:01:18.000000000 -0400
++++ Makefile.in
+@@ -4,7 +4,7 @@ CLEAN_SUBDIRS = test
+
+ PROGRAM_NAME = $(progname)
+ PROGRAM_SOURCES = modules.c
+-PROGRAM_LDADD = $(HTTPD_LDFLAGS) $(PROGRAM_DEPENDENCIES) $(EXTRA_LIBS) $(AP_LIBS) $(LIBS)
++PROGRAM_LDADD = $(HTTPD_LDFLAGS) $(DL_LDFLAGS) $(PROGRAM_DEPENDENCIES) $(EXTRA_LIBS) $(AP_LIBS) $(LIBS) $(DL_LIBS)
+ PROGRAM_DEPENDENCIES = \
+ $(BUILTIN_LIBS) \
+ $(MPM_LIB) \
+@@ -14,7 +14,7 @@ PROGRAM_DEPENDENCIES = \
PROGRAMS = $(PROGRAM_NAME)
TARGETS = $(PROGRAMS) $(shared_build) $(other_targets)
PHONY_TARGETS = $(srcdir)/buildmark.c
@@ -11,7 +20,7 @@
install-other install-cgi install-include install-suexec install-man \
install-build
-@@ -71,6 +71,7 @@
+@@ -71,6 +71,7 @@ install-conf:
< $$i; \
fi \
) > $(DESTDIR)$(sysconfdir)/$$i; \
@@ -19,7 +28,7 @@
chmod 0644 $(DESTDIR)$(sysconfdir)/$$i; \
file=`echo $$i|sed s/-std//`; \
if [ "$$file" = "httpd.conf" ]; then \
-@@ -79,13 +80,16 @@
+@@ -79,13 +80,16 @@ install-conf:
if test "$$file" != "$$i" && test ! -f $(DESTDIR)$(sysconfdir)/$$file; then \
$(INSTALL_DATA) $(DESTDIR)$(sysconfdir)/$$i $(DESTDIR)$(sysconfdir)/$$file; \
fi; \
@@ -36,7 +45,7 @@
fi
install-build:
-@@ -93,8 +97,6 @@
+@@ -93,8 +97,6 @@ install-build:
@test -d $(DESTDIR)$(installbuilddir) || $(MKINSTALLDIRS) $(DESTDIR)$(installbuilddir)
@cp $(top_srcdir)/build/*.mk $(DESTDIR)$(installbuilddir); \
cp build/*.mk $(DESTDIR)$(installbuilddir); \
@@ -45,7 +54,7 @@
cp $(top_srcdir)/build/instdso.sh $(DESTDIR)$(installbuilddir); \
cp $(top_builddir)/config.nice $(DESTDIR)$(installbuilddir);
-@@ -108,7 +110,7 @@
+@@ -108,7 +110,7 @@ dox::
doxygen $(top_srcdir)/docs/doxygen.conf
install-htdocs:
@@ -54,7 +63,7 @@
echo "[PRESERVING EXISTING HTDOCS SUBDIR: $(DESTDIR)$(htdocsdir)]"; \
else \
echo Installing HTML documents ; \
-@@ -118,7 +120,7 @@
+@@ -118,7 +120,7 @@ install-htdocs:
fi
install-error:
@@ -63,7 +72,7 @@
echo "[PRESERVING EXISTING ERROR SUBDIR: $(DESTDIR)$(errordir)]"; \
else \
echo Installing error documents ; \
-@@ -128,7 +130,7 @@
+@@ -128,7 +130,7 @@ install-error:
fi
install-icons:
@@ -72,7 +81,7 @@
echo "[PRESERVING EXISTING ICONS SUBDIR: $(DESTDIR)$(iconsdir)]"; \
else \
echo Installing icons ; \
-@@ -138,7 +140,7 @@
+@@ -138,7 +140,7 @@ install-icons:
fi
install-cgi:
@@ -81,7 +90,7 @@
echo "[PRESERVING EXISTING CGI SUBDIR: $(DESTDIR)$(cgidir)]"; \
else \
echo Installing CGIs ; \
-@@ -191,8 +193,6 @@
+@@ -191,8 +193,6 @@ install-man:
@test -d $(DESTDIR)$(manualdir) || $(MKINSTALLDIRS) $(DESTDIR)$(manualdir)
@cp -p $(top_srcdir)/docs/man/*.1 $(DESTDIR)$(mandir)/man1
@cp -p $(top_srcdir)/docs/man/*.8 $(DESTDIR)$(mandir)/man8
Home |
Main Index |
Thread Index |
Old Index