diff options
| author | jlam <jlam@pkgsrc.org> | 2001-10-16 04:11:06 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2001-10-16 04:11:06 +0000 |
| commit | b8d0b8d85a74408f1891ca24a76395faeaf3d1b3 (patch) | |
| tree | b61294158a165274e57678298ac816a4e05e3623 /www/apache | |
| parent | 04ce68172d7451240da810cbd75cc83d12465813 (diff) | |
| download | pkgsrc-b8d0b8d85a74408f1891ca24a76395faeaf3d1b3.tar.gz | |
Update apache{,6} to 1.3.20nb1. Changes from version 1.3.20 are:
On NetBSD, we need to link libgcc.a whole-archive so that certain symbols
from the C++ implementation (__get_eh_context, etc.) referenced by DSOs
written in C++ will resolve correctly. This makes php4-sablot work with
mod_php4.so (from ap-php4) on ELF platforms when loaded by Apache's httpd.
Diffstat (limited to 'www/apache')
| -rw-r--r-- | www/apache/Makefile | 13 | ||||
| -rw-r--r-- | www/apache/distinfo | 3 | ||||
| -rw-r--r-- | www/apache/patches/patch-ak | 13 |
3 files changed, 26 insertions, 3 deletions
diff --git a/www/apache/Makefile b/www/apache/Makefile index 9b072640e54..3c80e1c97dd 100644 --- a/www/apache/Makefile +++ b/www/apache/Makefile @@ -1,10 +1,10 @@ -# $NetBSD: Makefile,v 1.76 2001/09/27 23:18:51 jlam Exp $ +# $NetBSD: Makefile,v 1.77 2001/10/16 04:11:06 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.20 -PKGNAME= apache-1.3.20 +PKGNAME= apache-1.3.20nb1 CATEGORIES= www MASTER_SITES= http://httpd.apache.org/dist/httpd/ \ http://www.apache.de/dist/httpd/ \ @@ -76,6 +76,15 @@ APACHE_CUSTOM_CFLAGS+= -DBUFFERED_LOGS APACHE_CUSTOM_CFLAGS+= -O6 -fomit-frame-pointer -fexpensive-optimizations .endif +# On NetBSD, we need to link libgcc.a whole-archive so that certain symbols +# from the C++ implementation (__get_eh_context, etc.) referenced by DSOs +# written in C++ will resolve correctly. +# +.if (${OPSYS} == "NetBSD") +LINK_LIBGCC_LDFLAGS= -Wl,--whole-archive -lgcc -Wl,--no-whole-archive +MAKE_ENV+= LINK_LIBGCC_LDFLAGS="${LINK_LIBGCC_LDFLAGS}" +.endif + .if (${OPSYS} == "SunOS") DEPENDS+= db-2.7.7:../../databases/db LDFLAGS+= -Wl,-R/usr/ucblib -L/usr/ucblib \ diff --git a/www/apache/distinfo b/www/apache/distinfo index 0b16268eca7..3c95512b216 100644 --- a/www/apache/distinfo +++ b/www/apache/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.5 2001/06/09 06:36:42 jlam Exp $ +$NetBSD: distinfo,v 1.6 2001/10/16 04:11:06 jlam Exp $ SHA1 (apache_1.3.20.tar.gz) = c791b6513b253035c04e76f4e1882ad847134a12 Size (apache_1.3.20.tar.gz) = 1973138 bytes @@ -16,3 +16,4 @@ SHA1 (patch-ag) = 5586719f7fa7b5d670d2735e487943c046533ea6 SHA1 (patch-ah) = 553f8f2bf4bf7278adb46ff8749be154f10e39d3 SHA1 (patch-ai) = a5e66d9e64aa2fe59dc2a2186ae169bcb8e5e071 SHA1 (patch-aj) = 9070bd6b504701432302ef89a84b9270e646f833 +SHA1 (patch-ak) = 8f790a692ed9b2dd6943be43fa1cf7629c673955 diff --git a/www/apache/patches/patch-ak b/www/apache/patches/patch-ak new file mode 100644 index 00000000000..cb2ab5a2f00 --- /dev/null +++ b/www/apache/patches/patch-ak @@ -0,0 +1,13 @@ +$NetBSD: patch-ak,v 1.5 2001/10/16 04:11:06 jlam Exp $ + +--- src/Makefile.tmpl.orig Sun Oct 14 22:14:29 2001 ++++ src/Makefile.tmpl +@@ -2,7 +2,7 @@ + CFLAGS=$(OPTIM) $(CFLAGS1) $(EXTRA_CFLAGS) + LIBS=$(EXTRA_LIBS) $(LIBS1) + INCLUDES=$(INCLUDES1) $(INCLUDES0) $(EXTRA_INCLUDES) +-LDFLAGS=$(LDFLAGS1) $(EXTRA_LDFLAGS) ++LDFLAGS=$(LDFLAGS1) $(EXTRA_LDFLAGS) $(LINK_LIBGCC_LDFLAGS) + + OBJS= \ + modules.o \ |