summaryrefslogtreecommitdiff
path: root/www
diff options
context:
space:
mode:
authorgrant <grant@pkgsrc.org>2003-09-17 19:39:58 +0000
committergrant <grant@pkgsrc.org>2003-09-17 19:39:58 +0000
commit40614d0b3ca35e2c5b10e307c2c29f92feb73486 (patch)
tree0fac5bcd059b9978cb00a239158f9a96c183b38c /www
parent1d2b1c74f08592097c443978439fe9248a24ab83 (diff)
downloadpkgsrc-40614d0b3ca35e2c5b10e307c2c29f92feb73486.tar.gz
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.
Diffstat (limited to 'www')
-rw-r--r--www/apache/Makefile9
-rw-r--r--www/apache6/Makefile7
2 files changed, 11 insertions, 5 deletions
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
diff --git a/www/apache6/Makefile b/www/apache6/Makefile
index 53caff2d4fe..8abf582d2d1 100644
--- a/www/apache6/Makefile
+++ b/www/apache6/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.80 2003/09/13 23:37:06 itojun Exp $
+# $NetBSD: Makefile,v 1.81 2003/09/17 19:41:19 grant Exp $
#
# This package does not compile in mod_ssl support hooks, as it conflicts
# with IPv6-enable patch.
@@ -8,7 +8,12 @@
DISTNAME= apache_${APACHE_VERSION}
PKGNAME= apache6-${APACHE_VERSION}
+<<<<<<< Makefile
+#PKGREVISION= 3
APACHE_VERSION= 1.3.28
+=======
+APACHE_VERSION= 1.3.28
+>>>>>>> 1.79
CATEGORIES= www
MASTER_SITES= ${MASTER_SITE_APACHE:=httpd/} \
${MASTER_SITE_APACHE:=httpd/old/}