pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/www/apache Replace USE_GCC_SHLIB with USE_LANGUAGES=c ...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/a052304737b2
branches:  trunk
changeset: 483961:a052304737b2
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Mon Nov 22 22:19:35 2004 +0000

description:
Replace USE_GCC_SHLIB with USE_LANGUAGES=c c++ and a nice big comment why
we add c++ to the variable.

diffstat:

 www/apache/Makefile |  7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

diffs (28 lines):

diff -r 44b4c03b0898 -r a052304737b2 www/apache/Makefile
--- a/www/apache/Makefile       Mon Nov 22 22:09:34 2004 +0000
+++ b/www/apache/Makefile       Mon Nov 22 22:19:35 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.156 2004/11/15 15:05:34 sketch Exp $
+# $NetBSD: Makefile,v 1.157 2004/11/22 22:19:35 wiz 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).
@@ -29,6 +29,10 @@
 
 EXTRACT_ONLY=          ${DISTFILES:N*.gif}
 USE_BUILDLINK3=                YES
+# Actually, apache is only written in C, but we need this so that
+# a dlopen()ed apache module that's written in C++ will have static
+# objects constructed properly.
+USE_LANGUAGES=         c c++
 USE_PKGINSTALL=                YES
 HAS_CONFIGURE=         YES
 CONFIGURE_ARGS+=       --with-layout="${WRKDIR}/config.layout:pkgsrc"
@@ -126,7 +130,6 @@
 # ensures modules can resolve symbols they require from gcc.
 #
 .    if !empty(CC_VERSION:Mgcc-3*)
-USE_GCC_SHLIB=         YES
 LINK_LIBGCC_LDFLAGS+=  -lgcc_s
 .    endif
 .  endif



Home | Main Index | Thread Index | Old Index