18480574 Apache should link against system pcre s11-update
authorPetr Sumbera <petr.sumbera@oracle.com>
Wed, 18 Mar 2015 05:06:38 -0700
branchs11-update
changeset 3968 266f10e491cb
parent 3967 ec691805322c
child 3969 c01cdd40f814
18480574 Apache should link against system pcre
components/apache2/Makefile
components/apache2/patches/openldap.patch
components/apache2/patches/pcre.patch
components/apache2/resolve.deps
--- a/components/apache2/Makefile	Tue Mar 17 21:54:34 2015 -0700
+++ b/components/apache2/Makefile	Wed Mar 18 05:06:38 2015 -0700
@@ -18,7 +18,7 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
 #
 include ../../make-rules/shared-macros.mk
 
@@ -94,6 +94,7 @@
 CONFIGURE_OPTIONS +=	--enable-ldap
 CONFIGURE_OPTIONS +=	--enable-ssl
 CONFIGURE_OPTIONS +=	--enable-exception-hook
+CONFIGURE_OPTIONS +=	--with-pcre
 CONFIGURE_OPTIONS +=	CFLAGS="$(CFLAGS) -DSSL_EXPERIMENTAL -DSSL_ENGINE"
 CONFIGURE_OPTIONS +=	LTFLAGS="--silent --tag=CC"
 CONFIGURE_OPTIONS.32 +=	--enable-layout=Solaris-Apache2
--- a/components/apache2/patches/openldap.patch	Tue Mar 17 21:54:34 2015 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,11 +0,0 @@
---- configure.in	Sat Apr 16 12:09:47 2011
-+++ configure.in	Thu Nov 10 07:18:54 2011
[email protected]@ -144,7 +144,7 @@
- 
- APR_ADDTO(LDFLAGS, `$apu_config --ldflags`)
- APU_BINDIR=`$apu_config --bindir`
--APU_INCLUDEDIR=`$apu_config --includedir`
-+APU_INCLUDEDIR="`$apu_config --includedir` -I/usr/include/openldap"
- APU_VERSION=`$apu_config --version`
- APU_CONFIG="$APU_BINDIR/apu-`echo ${APU_VERSION} | sed 's,\..*,,'`-config"
- 
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/apache2/patches/pcre.patch	Wed Mar 18 05:06:38 2015 -0700
@@ -0,0 +1,26 @@
+Patch origin: upstream
+Patch status: already part of 2.4 and HEAD (bacport to 2.2 is unclear)
+
+https://svn.apache.org/viewvc?view=revision&revision=731058
+
+--- configure.in	2014-03-28 07:05:06.506452975 -0700
++++ configure.in	2014-03-28 07:08:12.121620041 -0700
[email protected]@ -184,7 +184,7 @@
+ 
+ if test "$PCRE_CONFIG" != "false"; then
+   AC_MSG_NOTICE([Using external PCRE library from $PCRE_CONFIG])
+-  APR_ADDTO(CFLAGS, [`$PCRE_CONFIG --cflags`])
++  APR_ADDTO(PCRE_INCLUDES, [`$PCRE_CONFIG --cflags`])
+   APR_ADDTO(LIBS, [`$PCRE_CONFIG --libs`])
+ else
+   # Build the bundled PCRE
[email protected]@ -219,6 +219,9 @@
+ APR_ADDTO(INCLUDES, `$apr_config --includes`)
+ APR_ADDTO(INCLUDES, `$apu_config --includes`)
+ 
++dnl Add in path to PCRE includes
++APR_ADDTO(INCLUDES, $PCRE_INCLUDES)
++
+ echo $ac_n "${nl}Applying OS-specific hints for httpd ...${nl}"
+ 
+ case $host in
--- a/components/apache2/resolve.deps	Tue Mar 17 21:54:34 2015 -0700
+++ b/components/apache2/resolve.deps	Wed Mar 18 05:06:38 2015 -0700
@@ -4,6 +4,7 @@
 library/apr-util-13/dbd-mysql
 library/apr-util-13/dbd-sqlite
 library/openldap
+library/pcre
 library/security/openssl
 library/zlib
 runtime/perl-512