[php] rebuild against httpd 2.4
jorton
jorton at fedoraproject.org
Mon Mar 26 15:49:49 UTC 2012
commit e77af5a17029d7724c6a3d7154da013b9c91aeb4
Author: Joe Orton <jorton at redhat.com>
Date: Mon Mar 26 16:49:30 2012 +0100
rebuild against httpd 2.4
- use _httpd_mmn, _httpd_apxs macros
.gitignore | 1 +
php-5.4.0-httpd24.patch | 85 +++++++++++++++++++++++++++++++++++++++++++++++
php.spec | 18 +++++++---
3 files changed, 99 insertions(+), 5 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 07e7112..90f158c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@ php.spec~
/php-5.4.0RC7.tar.bz2
/php-5.4.0RC8.tar.bz2
/php-5.4.0.tar.bz2
+/php-5.?.?
diff --git a/php-5.4.0-httpd24.patch b/php-5.4.0-httpd24.patch
new file mode 100644
index 0000000..74e6d48
--- /dev/null
+++ b/php-5.4.0-httpd24.patch
@@ -0,0 +1,85 @@
+
+http://svn.php.net/viewvc?view=revision&revision=323750
+
+--- php-5.4.0/configure.in.httpd24
++++ php-5.4.0/configure.in
+@@ -1587,6 +1587,21 @@ cat <<X
+ X
+ fi
+
++ if test "$PHP_SAPI" = "apache2handler" || test "$PHP_SAPI" = "apache2filter"; then
++ if test "$APACHE_VERSION" -ge 2004001; then
++ if test -z "$APACHE_THREADED_MPM"; then
++cat <<X
+++--------------------------------------------------------------------+
++| *** WARNING *** |
++| |
++| You have built PHP for Apache's current non-threaded MPM. |
++| If you change Apache to use a threaded MPM you must reconfigure |
++| PHP with --enable-maintainer-zts |
++X
++ fi
++ fi
++ fi
++
+ # Warn about linking Apache with libpthread if oci8 extension is enabled on linux.
+ if test "$PHP_OCI8" != "no"; then
+ if test "$PHP_SAPI" = "apache"; then
+--- php-5.4.0/sapi/apache2filter/config.m4.httpd24
++++ php-5.4.0/sapi/apache2filter/config.m4
+@@ -39,7 +39,6 @@ if test "$PHP_APXS2FILTER" != "no"; then
+ APXS_BINDIR=`$APXS -q BINDIR`
+ APXS_HTTPD=`$APXS -q SBINDIR`/`$APXS -q TARGET`
+ APXS_CFLAGS=`$APXS -q CFLAGS`
+- APXS_MPM=`$APXS -q MPM_NAME`
+ APU_BINDIR=`$APXS -q APU_BINDIR`
+ APR_BINDIR=`$APXS -q APR_BINDIR`
+
+@@ -118,8 +117,16 @@ if test "$PHP_APXS2FILTER" != "no"; then
+ ;;
+ esac
+
+- if test "$APXS_MPM" != "prefork" && test "$APXS_MPM" != "peruser"; then
+- PHP_BUILD_THREAD_SAFE
++ if test "$APACHE_VERSION" -lt 2004001; then
++ APXS_MPM=`$APXS -q MPM_NAME`
++ if test "$APXS_MPM" != "prefork" && test "$APXS_MPM" != "peruser" && test "$APXS_MPM" != "itk"; then
++ PHP_BUILD_THREAD_SAFE
++ fi
++ else
++ APACHE_THREADED_MPM=`$APXS_HTTPD -V | grep 'threaded:.*yes'`
++ if test -n "$APACHE_THREADED_MPM"; then
++ PHP_BUILD_THREAD_SAFE
++ fi
+ fi
+ AC_MSG_RESULT(yes)
+ PHP_SUBST(APXS)
+--- php-5.4.0/sapi/apache2handler/config.m4.httpd24
++++ php-5.4.0/sapi/apache2handler/config.m4
+@@ -38,7 +38,6 @@ if test "$PHP_APXS2" != "no"; then
+ APXS_BINDIR=`$APXS -q BINDIR`
+ APXS_HTTPD=`$APXS -q SBINDIR`/`$APXS -q TARGET`
+ APXS_CFLAGS=`$APXS -q CFLAGS`
+- APXS_MPM=`$APXS -q MPM_NAME`
+ APU_BINDIR=`$APXS -q APU_BINDIR`
+ APR_BINDIR=`$APXS -q APR_BINDIR`
+
+@@ -117,8 +116,16 @@ if test "$PHP_APXS2" != "no"; then
+ ;;
+ esac
+
+- if test "$APXS_MPM" != "prefork" && test "$APXS_MPM" != "peruser" && test "$APXS_MPM" != "itk"; then
+- PHP_BUILD_THREAD_SAFE
++ if test "$APACHE_VERSION" -lt 2004001; then
++ APXS_MPM=`$APXS -q MPM_NAME`
++ if test "$APXS_MPM" != "prefork" && test "$APXS_MPM" != "peruser" && test "$APXS_MPM" != "itk"; then
++ PHP_BUILD_THREAD_SAFE
++ fi
++ else
++ APACHE_THREADED_MPM=`$APXS_HTTPD -V | grep 'threaded:.*yes'`
++ if test -n "$APACHE_THREADED_MPM"; then
++ PHP_BUILD_THREAD_SAFE
++ fi
+ fi
+ AC_MSG_RESULT(yes)
+ PHP_SUBST(APXS)
diff --git a/php.spec b/php.spec
index 7443e9a..b03deb6 100644
--- a/php.spec
+++ b/php.spec
@@ -9,7 +9,7 @@
%global zipver 1.9.1
%global jsonver 1.2.1
-%global httpd_mmn %(cat %{_includedir}/httpd/.mmn || echo missing-httpd-devel)
+%{!?_httpd_mmn: %{expand: %%global _httpd_mmn %%(cat %{_includedir}/httpd/.mmn || echo missing-httpd-devel)}}
%global mysql_sock %(mysql_config --socket || echo /var/lib/mysql/mysql.sock)
# Regression tests take a long time, you can skip 'em with this
@@ -31,6 +31,8 @@
%global isasuffix %nil
%endif
+%{!?_httpd_apxs: %{expand: %%global _httpd_apxs %%{_sbindir}/apxs}}
+
%if 0%{?fedora} >= 17
%global with_zip 1
%global with_libzip 1
@@ -44,7 +46,7 @@
Summary: PHP scripting language for creating dynamic web sites
Name: php
Version: 5.4.0
-Release: 1%{?dist}
+Release: 2%{?dist}
License: PHP
Group: Development/Languages
URL: http://www.php.net/
@@ -60,6 +62,7 @@ Source7: php-fpm.logrotate
Source8: php-fpm.sysconfig
# Build fixes
+Patch1: php-5.4.0-httpd24.patch
Patch5: php-5.2.0-includedir.patch
Patch6: php-5.2.4-embed.patch
Patch7: php-5.3.0-recode.patch
@@ -69,7 +72,7 @@ Patch7: php-5.3.0-recode.patch
# Functional changes
Patch40: php-5.4.0-dlopen.patch
Patch41: php-5.4.0-easter.patch
-Patch42: php-5.3.1-systzdata-v7.patch
+Patch42: php-5.3.1-systzdata-v8.patch
# See http://bugs.php.net/53436
Patch43: php-5.4.0-phpize.patch
# Use system libzip instead of bundled one
@@ -559,6 +562,7 @@ support for using the enchant library to PHP.
%prep
%setup -q -n php-%{version}%{?rcver}
+%patch1 -p1 -b .httpd24
%patch5 -p1 -b .includedir
%patch6 -p1 -b .embed
%patch7 -p1 -b .recode
@@ -802,7 +806,7 @@ without_shared="--without-gd \
# Build Apache module, and the CLI SAPI, /usr/bin/php
pushd build-apache
-build --with-apxs2=%{_sbindir}/apxs \
+build --with-apxs2=%{_httpd_apxs} \
--libdir=%{_libdir}/php \
--enable-pdo=shared \
--with-mysql=shared,%{_prefix} \
@@ -897,7 +901,7 @@ popd
# Build a special thread-safe Apache SAPI
pushd build-zts
-build --with-apxs2=%{_sbindir}/apxs \
+build --with-apxs2=%{_httpd_apxs} \
--includedir=%{_includedir}/php-zts \
--libdir=%{_libdir}/php-zts \
--enable-maintainer-zts \
@@ -1255,6 +1259,10 @@ fi
%changelog
+* Mon Mar 26 2012 Joe Orton <jorton at redhat.com> - 5.4.0-2
+- rebuild against httpd 2.4
+- use _httpd_mmn, _httpd_apxs macros
+
* Fri Mar 02 2012 Remi Collet <remi at fedoraproject.org> 5.4.0-1
- update to PHP 5.4.0 finale
More information about the scm-commits
mailing list