diff options
| author | Remi Collet <fedora@famillecollet.com> | 2014-07-19 18:37:37 +0200 |
|---|---|---|
| committer | Remi Collet <fedora@famillecollet.com> | 2014-07-19 18:37:37 +0200 |
| commit | 3198361bf65c4b591cb5aef22ba88c5418db8aca (patch) | |
| tree | 97e37d3a936b3f5c9c7e4273a5e6952a1b3334a5 | |
| parent | 4fec15b899dba55d93c3b616c9e26720bf24f5ee (diff) | |
php 5.6: test build for #67635
| -rw-r--r-- | php-systemd.patch | 49 | ||||
| -rw-r--r-- | php56.spec | 9 |
2 files changed, 56 insertions, 2 deletions
diff --git a/php-systemd.patch b/php-systemd.patch new file mode 100644 index 0000000..3d2435a --- /dev/null +++ b/php-systemd.patch @@ -0,0 +1,49 @@ +diff --git a/sapi/fpm/config.m4 b/sapi/fpm/config.m4 +index bd6d649..85eff65 100644 +--- a/sapi/fpm/config.m4 ++++ b/sapi/fpm/config.m4 +@@ -567,14 +567,26 @@ if test "$PHP_FPM" != "no"; then + [ --with-fpm-systemd Activate systemd integration], no, no) + + if test "$PHP_FPM_SYSTEMD" != "no" ; then +- AC_CHECK_LIB(systemd-daemon, sd_notify, SYSTEMD_LIBS="-lsystemd-daemon") +- AC_CHECK_HEADERS(systemd/sd-daemon.h, [HAVE_SD_DAEMON_H="yes"], [HAVE_SD_DAEMON_H="no"]) ++ if test -z "$PKG_CONFIG"; then ++ AC_PATH_PROG(PKG_CONFIG, pkg-config, no) ++ fi ++ unset SYSTEMD_LIBS ++ unset SYSTEMD_INCS ++ if test -x "$PKG_CONFIG" && $PKG_CONFIG --exists libsystemd; then ++ SYSTEMD_LIBS=`$PKG_CONFIG --libs libsystemd` ++ SYSTEMD_INCS=`$PKG_CONFIG --cflags-only-I libsystemd` ++ HAVE_SD_DAEMON_H="yes" ++ else ++ AC_CHECK_LIB(systemd-daemon, sd_notify, SYSTEMD_LIBS="-lsystemd-daemon") ++ AC_CHECK_HEADERS(systemd/sd-daemon.h, [HAVE_SD_DAEMON_H="yes"], [HAVE_SD_DAEMON_H="no"]) ++ fi + if test $HAVE_SD_DAEMON_H = "no" || test -z "${SYSTEMD_LIBS}"; then + AC_MSG_ERROR([Your system does not support systemd.]) + else + AC_DEFINE(HAVE_SYSTEMD, 1, [FPM use systemd integration]) + PHP_FPM_SD_FILES="fpm/fpm_systemd.c" +- PHP_ADD_LIBRARY(systemd-daemon) ++ PHP_EVAL_LIBLINE($SYSTEMD_LIBS) ++ PHP_EVAL_INCLINE($SYSTEMD_INCS) + php_fpm_systemd=notify + fi + else +--- a/sapi/fpm/config.m4 ++++ b/sapi/fpm/config.m4 +@@ -590,9 +590,12 @@ + unset SYSTEMD_LIBS + unset SYSTEMD_INCS + if test -x "$PKG_CONFIG" && $PKG_CONFIG --exists libsystemd; then ++ AC_MSG_CHECKING([for libsystemd]) + SYSTEMD_LIBS=`$PKG_CONFIG --libs libsystemd` + SYSTEMD_INCS=`$PKG_CONFIG --cflags-only-I libsystemd` ++ SYSTEMD_VERS=`$PKG_CONFIG --modversion libsystemd` + HAVE_SD_DAEMON_H="yes" ++ AC_MSG_RESULT([version $SYSTEMD_VERS]) + else + AC_CHECK_LIB(systemd-daemon, sd_notify, SYSTEMD_LIBS="-lsystemd-daemon") + AC_CHECK_HEADERS(systemd/sd-daemon.h, [HAVE_SD_DAEMON_H="yes"], [HAVE_SD_DAEMON_H="no"]) @@ -121,7 +121,7 @@ Summary: PHP scripting language for creating dynamic web sites Name: php Version: 5.6.0 %if 0%{?snapdate:1}%{?rcver:1} -Release: 0.16.%{?snapdate}%{?rcver}%{?dist} +Release: 0.17.%{?snapdate}%{?rcver}%{?dist} %else Release: 1%{?dist} %endif @@ -196,6 +196,7 @@ Patch301: php-5.6.0-oldpcre.patch Patch302: php-5.6.0-noNO.patch # WIP +Patch400: php-systemd.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -925,6 +926,7 @@ rm -rf ext/json %patch302 -p0 -b .971416 # WIP patch +%patch400 -p1 -b .systemd # Prevent %%doc confusion over LICENSE files cp Zend/LICENSE Zend/ZEND_LICENSE @@ -1917,7 +1919,10 @@ fi %changelog -* Mon Jul 7 2014 Remi Collet <rcollet@redhat.com> 5.6.0-0.13.RC2 +* Sat Jul 19 2014 Remi Collet <rcollet@redhat.com> 5.6.0-0.17.RC2 +- test build for #67635 + +* Mon Jul 7 2014 Remi Collet <rcollet@redhat.com> 5.6.0-0.16.RC2 - php 5.6.0RC2 * Mon Jun 23 2014 Remi Collet <rcollet@redhat.com> 5.6.0-0.15.RC1 |