diff options
| author | grant <grant@pkgsrc.org> | 2003-05-31 13:29:20 +0000 |
|---|---|---|
| committer | grant <grant@pkgsrc.org> | 2003-05-31 13:29:20 +0000 |
| commit | 853782d996b439be31ecbd82b1265cc5b2d9533c (patch) | |
| tree | d3e7464e99ad43f8dbd2645feaa3074a338a9a4e /www | |
| parent | 6a6efe4bc34d54b511a3cb420505638dfdc61209 (diff) | |
| download | pkgsrc-853782d996b439be31ecbd82b1265cc5b2d9533c.tar.gz | |
link against shared libgcc_s when built with gcc3 so Apache modules
can resolve the required symbols.
Diffstat (limited to 'www')
| -rw-r--r-- | www/apache/Makefile | 12 | ||||
| -rw-r--r-- | www/apache6/Makefile | 12 |
2 files changed, 20 insertions, 4 deletions
diff --git a/www/apache/Makefile b/www/apache/Makefile index 4de8cde9f88..cdeaa5c3b89 100644 --- a/www/apache/Makefile +++ b/www/apache/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.125 2003/04/15 01:39:15 grant Exp $ +# $NetBSD: Makefile,v 1.126 2003/05/31 13:29:20 grant 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). @@ -107,9 +107,17 @@ APACHE_CUSTOM_CFLAGS+= -D_FILE_OFFSET_BITS=64 # .if (${OPSYS} == "NetBSD") && (${OBJECT_FMT} == "ELF") LINK_LIBGCC_LDFLAGS= -Wl,--whole-archive -lgcc -Wl,--no-whole-archive -MAKE_ENV+= LINK_LIBGCC_LDFLAGS="${LINK_LIBGCC_LDFLAGS}" .endif +# if we are using gcc3, we need to link against libgcc_s, too. This +# ensures modules can resolve symbols they require from gcc. +.if defined(USE_GCC3) +USE_GCC_SHLIB= # defined +LINK_LIBGCC_LDFLAGS+= -lgcc_s +.endif + +MAKE_ENV+= LINK_LIBGCC_LDFLAGS="${LINK_LIBGCC_LDFLAGS}" + # Use operating system's db1 functions (where available) USE_DB185= # defined diff --git a/www/apache6/Makefile b/www/apache6/Makefile index ae710e16a50..1b322433d37 100644 --- a/www/apache6/Makefile +++ b/www/apache6/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.70 2003/04/15 01:39:15 grant Exp $ +# $NetBSD: Makefile,v 1.71 2003/05/31 13:29:21 grant Exp $ # # This package does not compile in mod_ssl support hooks, as it conflicts # with IPv6-enable patch. @@ -110,9 +110,17 @@ APACHE_CUSTOM_CFLAGS+= -D_FILE_OFFSET_BITS=64 # .if (${OPSYS} == "NetBSD") && (${OBJECT_FMT} == "ELF") LINK_LIBGCC_LDFLAGS= -Wl,--whole-archive -lgcc -Wl,--no-whole-archive -MAKE_ENV+= LINK_LIBGCC_LDFLAGS="${LINK_LIBGCC_LDFLAGS}" .endif +# if we are using gcc3, we need to link against libgcc_s, too. This +# ensures modules can resolve symbols they require from gcc. +.if defined(USE_GCC3) +USE_GCC_SHLIB= # defined +LINK_LIBGCC_LDFLAGS+= -lgcc_s +.endif + +MAKE_ENV+= LINK_LIBGCC_LDFLAGS="${LINK_LIBGCC_LDFLAGS}" + # Use operating system's db1 functions (where available) .include "../../databases/db/buildlink2.mk" BUILDLINK_DEPENDS.db= db>=2.7.7 |