tech-pkg archive

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

Removing APACHE_CUSTOM_CFLAGS



			Hi there,

I would like to know if it would be fine to remove support for the
APACHE_CUSTOM_CFLAGS variable in pkgsrc. It is not used by default, and
breaks normal support for CFLAGS in www/apache{22,24}.

Is anyone using this? If yes, I will welcome alternative solutions
allowing support for CFLAGS and APACHE_CUSTOM_CFLAGS together.

In the meantime, I am attaching my current patch here.

HTH,
-- 
khorben
Index: mk/defaults/mk.conf
===================================================================
RCS file: /cvsroot/pkgsrc/mk/defaults/mk.conf,v
retrieving revision 1.260
diff -p -u -r1.260 mk.conf
--- mk/defaults/mk.conf	5 Sep 2015 21:25:30 -0000	1.260
+++ mk/defaults/mk.conf	20 Jan 2016 12:50:04 -0000
@@ -663,12 +663,6 @@ AMANDA_VAR?=	${VARBASE}/amanda
 # files.
 # Default: ${VARBASE}/amanda
 
-#APACHE_CUSTOM_CFLAGS=
-# Used in apache to pass extra CFLAGS to the compiler during
-# the build.
-# Possible: any legal compiler flags, e.g. -O6 -DHARD_SERVER_LIMIT=512
-# Default: not defined
-
 APACHE_USER?=	www
 # Used in apache22, apache24, isap, and smb2www to specify the user
 # allowed to execute the `suexec' wrapper.  Expected to be the user the
Index: www/apache22/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/www/apache22/Makefile,v
retrieving revision 1.106
diff -p -u -r1.106 Makefile
--- www/apache22/Makefile	12 Nov 2015 15:21:51 -0000	1.106
+++ www/apache22/Makefile	20 Jan 2016 12:50:06 -0000
@@ -25,9 +25,6 @@ CONFIGURE_ARGS+=	--with-port=80
 CONFIGURE_ARGS+=	--enable-so
 CONFIGURE_ENV+=		perlbin=${PERL5:Q}
 CONFIGURE_ENV+=		ac_cv_path_RSYNC=/nonexistent
-CONFIGURE_ARGS+=	CFLAGS=${APACHE_CUSTOM_CFLAGS:M*:Q}
-
-BUILD_DEFS+=		APACHE_CUSTOM_CFLAGS
 
 # Apache Portable Runtime library configure options
 CONFIGURE_ARGS+=	--with-apr=${BUILDLINK_PREFIX.apr}
Index: www/apache24/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/www/apache24/Makefile,v
retrieving revision 1.41
diff -p -u -r1.41 Makefile
--- www/apache24/Makefile	27 Dec 2015 12:50:54 -0000	1.41
+++ www/apache24/Makefile	20 Jan 2016 12:50:06 -0000
@@ -15,7 +15,6 @@ LICENSE=	apache-2.0
 
 BUILD_DEFS+=	IPV6_READY
 BUILD_DEFS+=	VARBASE
-BUILD_DEFS+=	APACHE_CUSTOM_CFLAGS
 
 USE_LIBTOOL=		yes
 USE_TOOLS+=		pax perl pkg-config
@@ -28,7 +27,6 @@ CONFIGURE_ARGS+=	--with-apr-util=${BUILD
 CONFIGURE_ARGS+=	--with-port=80
 CONFIGURE_ENV+=		perlbin=${PERL5:Q}
 CONFIGURE_ENV+=		ac_cv_path_RSYNC=/nonexistent
-CONFIGURE_ENV+=		CFLAGS=${APACHE_CUSTOM_CFLAGS:M*:Q}
 
 CFLAGS.SunOS+=	-D_XOPEN_SOURCE -D_XOPEN_SOURCE_EXTENDED=1 -D__EXTENSIONS__
 


Home | Main Index | Thread Index | Old Index