From 40614d0b3ca35e2c5b10e307c2c29f92feb73486 Mon Sep 17 00:00:00 2001 From: grant Date: Wed, 17 Sep 2003 19:39:58 +0000 Subject: get rid of USE_GCC2/3 in pkg Makefiles, and set GCC_REQD or USE_PKGSRC_GCC as appropriate, as this is handled by compiler.mk now. --- www/apache/Makefile | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'www/apache') diff --git a/www/apache/Makefile b/www/apache/Makefile index 53537c0f5d6..3dc5fcfd459 100644 --- a/www/apache/Makefile +++ b/www/apache/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.132 2003/07/19 12:31:05 tron Exp $ +# $NetBSD: Makefile,v 1.133 2003/09/17 19:41:17 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). @@ -91,9 +91,10 @@ CONFIGURE_ARGS+= ${_ENABLE_MOD}=define # from mod_ssl pkg.addon APACHE_CUSTOM_CFLAGS?= # empty -.if defined(APACHE_PERF_TUNING) && ${APACHE_PERF_TUNING} == YES +.if defined(APACHE_PERF_TUNING) && ${APACHE_PERF_TUNING} == "YES" APACHE_CUSTOM_CFLAGS+= -DBUFFERED_LOGS -APACHE_CUSTOM_CFLAGS+= -O6 -fomit-frame-pointer -fexpensive-optimizations +APACHE_CUSTOM_CFLAGS+= ${COMPILER_PERFTUNE_FLAGS} +LDFLAGS+= ${COMPILER_PERFTUNE_FLAGS} .endif # Explicitly turn on large file support @@ -111,7 +112,7 @@ MAKE_ENV+= LINK_LIBGCC_LDFLAGS="${LINK_LIBGCC_LDFLAGS}" # 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 +USE_GCC_SHLIB= YES # defined LINK_LIBGCC_LDFLAGS+= -lgcc_s . endif . endif -- cgit v1.2.3