Introduce a new make variable APACHE_CUSTOM_CFLAGS that can be set in

/etc/mk.conf to any string of legal compiler flags to tune different aspects
of the built httpd.

3 files changed, 24 insertions, 11 deletions

diff --git a/mk/mk.conf.example b/mk/mk.conf.example
index 024ff54c99f..d5706ca2523 100644
--- a/mk/mk.conf.example
+++ b/mk/mk.conf.example
@@ -1,4 +1,4 @@
-# $NetBSD: mk.conf.example,v 1.209 2001/05/14 18:59:23 jlam Exp $
+# $NetBSD: mk.conf.example,v 1.210 2001/05/18 06:01:35 jlam Exp $
 #
 
 # Sample /etc/mk.conf file, which can be used to set specific values
@@ -303,6 +303,11 @@
 # files. 
 # Default: /var/amanda
 
+#APACHE_CUSTOM_CFLAGS=
+# Extra CFLAGS to be passed to the compiler during the Apache build.
+# Possible: any legal compiler flags, e.g. -O6 -DHARD_SERVER_LIMIT=512
+# Default: not defined
+
 #APACHE_PERF_TUNING=	YES
 # Optimize for maximum Apache performance.
 # Possible: not defined, YES
diff --git a/www/apache/Makefile b/www/apache/Makefile
index 5910429fb47..80fb0ae5a1a 100644
--- a/www/apache/Makefile
+++ b/www/apache/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.71 2001/05/18 02:19:07 jlam Exp $
+# $NetBSD: Makefile,v 1.72 2001/05/18 06:01:35 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).
@@ -34,7 +34,7 @@ CONFIGURE_ARGS+=	--enable-rule=EAPI				\
 			--disable-module=ssl
 CONFIGURE_ARGS+=	--with-perl=${PERL5}
 CONFIGURE_ARGS+=	--with-port=80
-CONFIGURE_ENV+=		OPTIM="${OPTIM}"
+CONFIGURE_ENV+=		OPTIM="${APACHE_CUSTOM_CFLAGS}"
 
 .include "../../mk/bsd.prefs.mk"
 
@@ -65,9 +65,11 @@ CONFIGURE_ARGS+=	--disable-shared=define
 
 PLIST_SRC+=		${PKGDIR}/PLIST
 
+APACHE_CUSTOM_CFLAGS?=	# empty
+
 .if defined(APACHE_PERF_TUNING) && ${APACHE_PERF_TUNING} == YES
-OPTIM+=			-DBUFFERED_LOGS
-CFLAGS+=		-O6 -fomit-frame-pointer -fexpensive-optimizations
+APACHE_CUSTOM_CFLAGS+=	-DBUFFERED_LOGS
+APACHE_CUSTOM_CFLAGS+=	-O6 -fomit-frame-pointer -fexpensive-optimizations
 .endif
 
 .if (${OPSYS} == "SunOS")
@@ -78,7 +80,9 @@ CONFIGURE_ENV+=		INCLUDES="-I${LOCALBASE}/include/db2"
 CONFIGURE_ENV+=		LIBS="-ldbm -ldb2"
 .endif
 
-BUILD_DEFS+=		APACHE_PERF_TUNING APACHE_SUEXEC
+BUILD_DEFS+=		APACHE_CUSTOM_CFLAGS
+BUILD_DEFS+=		APACHE_PERF_TUNING
+BUILD_DEFS+=		APACHE_SUEXEC
 
 DEINSTALL_FILE=		${WRKDIR}/DEINSTALL
 INSTALL_FILE=		${WRKDIR}/INSTALL
diff --git a/www/apache6/Makefile b/www/apache6/Makefile
index 67d2a80dabe..323b40cae3a 100644
--- a/www/apache6/Makefile
+++ b/www/apache6/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2001/05/08 17:28:09 jlam Exp $
+# $NetBSD: Makefile,v 1.31 2001/05/18 06:01:36 jlam Exp $
 #
 # This package does not compile in mod_ssl support hooks, as it conflicts
 # with IPv6-enable patch.
@@ -36,7 +36,7 @@ CONFIGURE_ARGS+=	--enable-module=most				\
 			--disable-module=auth_dbm
 CONFIGURE_ARGS+=	--with-perl=${PERL5}
 CONFIGURE_ARGS+=	--with-port=80
-CONFIGURE_ENV+=		OPTIM="${OPTIM}"
+CONFIGURE_ENV+=		OPTIM="${APACHE_CUSTOM_CFLAGS}"
 
 BUILD_DEFS+=		USE_INET6
 
@@ -71,9 +71,11 @@ CONFIGURE_ARGS+=	--disable-module=proxy
 
 PLIST_SRC+=		${PKGDIR}/PLIST
 
+APACHE_CUSTOM_CFLAGS?=	# empty
+
 .if defined(APACHE_PERF_TUNING) && ${APACHE_PERF_TUNING} == YES
-OPTIM+=			-DBUFFERED_LOGS
-CFLAGS+=		-O6 -fomit-frame-pointer -fexpensive-optimizations
+APACHE_CUSTOM_CFLAGS+=	-DBUFFERED_LOGS
+APACHE_CUSTOM_CFLAGS+=	-O6 -fomit-frame-pointer -fexpensive-optimizations
 .endif
 
 .if (${OPSYS} == "SunOS")
@@ -84,7 +86,9 @@ CONFIGURE_ENV+=		INCLUDES="-I${LOCALBASE}/include/db2"
 CONFIGURE_ENV+=		LIBS="-ldbm -ldb2"
 .endif
 
-BUILD_DEFS+=		APACHE_PERF_TUNING APACHE_SUEXEC
+BUILD_DEFS+=		APACHE_CUSTOM_CFLAGS
+BUILD_DEFS+=		APACHE_PERF_TUNING
+BUILD_DEFS+=		APACHE_SUEXEC
 
 DEINSTALL_FILE=		${WRKDIR}/DEINSTALL
 INSTALL_FILE=		${WRKDIR}/INSTALL