From: Gustavo Zacarias Date: Thu, 22 Jan 2015 17:17:46 +0000 (-0300) Subject: php: rename patches to new naming convention X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=9a4d760e1b0d3e4ff81f855486668952a20701df;p=buildroot.git php: rename patches to new naming convention Signed-off-by: Gustavo Zacarias Signed-off-by: Peter Korsgaard --- diff --git a/package/php/0001-no-iconv-search.patch b/package/php/0001-no-iconv-search.patch new file mode 100644 index 0000000000..1979b7d0a5 --- /dev/null +++ b/package/php/0001-no-iconv-search.patch @@ -0,0 +1,65 @@ +Tweak PHP_SETUP_ICONV from aclocal/acinclude.m4 to not +PHP_ADD_INCLUDE $ICONV_DIR/include since the tests use +test instead of AC_TRY_LINK to find headers which is bad, +specially when adding /usr and /usr/local to the mix. +Do basically the same with ext/iconv/config.m4 by tweaking +PHP_ICONV_H_PATH which, again, uses test and absolute paths. +And all this directly in configure since autoreconf isn't +happy with php. + +Signed-off-by: Gustavo Zacarias + +diff -Nura php-5.5.11.orig/configure php-5.5.11/configure +--- php-5.5.11.orig/configure 2014-04-16 14:55:52.300838499 -0300 ++++ php-5.5.11/configure 2014-04-22 21:54:01.499097295 -0300 +@@ -45751,12 +45751,6 @@ + if test -n "$unique" && test "`eval $cmd`" = "" ; then + eval "INCLUDEPATH$unique=set" + +- if test ""; then +- INCLUDES="-I$ai_p $INCLUDES" +- else +- INCLUDES="$INCLUDES -I$ai_p" +- fi +- + fi + + fi +@@ -45786,14 +45780,7 @@ + PHP_ICONV_PREFIX="$ICONV_DIR" + fi + +- CFLAGS="-I$PHP_ICONV_PREFIX/include $CFLAGS" +- LDFLAGS="-L$PHP_ICONV_PREFIX/$PHP_LIBDIR $LDFLAGS" +- +- if test -r "$PHP_ICONV_PREFIX/include/giconv.h"; then +- PHP_ICONV_H_PATH="$PHP_ICONV_PREFIX/include/giconv.h" +- else +- PHP_ICONV_H_PATH="$PHP_ICONV_PREFIX/include/iconv.h" +- fi ++ PHP_ICONV_H_PATH="iconv.h" + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if iconv is glibc's" >&5 + $as_echo_n "checking if iconv is glibc's... " >&6; } +@@ -46191,8 +46178,6 @@ + ext_builddir=ext/iconv + ext_srcdir=$abs_srcdir/ext/iconv + +- ac_extra=`echo "-I\"$PHP_ICONV_PREFIX/include\""|$SED s#@ext_srcdir@#$ext_srcdir#g|$SED s#@ext_builddir@#$ext_builddir#g` +- + if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then + PHP_ICONV_SHARED=no + +@@ -97419,12 +97404,6 @@ + if test -n "$unique" && test "`eval $cmd`" = "" ; then + eval "INCLUDEPATH$unique=set" + +- if test ""; then +- INCLUDES="-I$ai_p $INCLUDES" +- else +- INCLUDES="$INCLUDES -I$ai_p" +- fi +- + fi + + fi diff --git a/package/php/0002-dlopen.patch b/package/php/0002-dlopen.patch new file mode 100644 index 0000000000..1dd009f799 --- /dev/null +++ b/package/php/0002-dlopen.patch @@ -0,0 +1,25 @@ +PHP can't be AUTORECONF with any modern autotools and the dl tests are +pretty bad for cross-compilation, so just kill the needed ac_cv value unsets +so they can flow through from the package makefile. + +Signed-off-by: Gustavo Zacarias + +diff -Nura php-5.5.8.orig/configure php-5.5.8/configure +--- php-5.5.8.orig/configure 2014-01-28 17:41:33.943851727 -0300 ++++ php-5.5.8/configure 2014-01-28 17:42:53.785493795 -0300 +@@ -16985,7 +16985,6 @@ + + + +- unset ac_cv_func_dlopen + unset ac_cv_func___dlopen + unset found + +@@ -17013,7 +17012,6 @@ + + *) + +- unset ac_cv_lib_dl_dlopen + unset ac_cv_lib_dl___dlopen + unset found + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5 diff --git a/package/php/0003-disable-pharcmd.patch b/package/php/0003-disable-pharcmd.patch new file mode 100644 index 0000000000..d4a8464195 --- /dev/null +++ b/package/php/0003-disable-pharcmd.patch @@ -0,0 +1,26 @@ +Disable the 'phar' command-line tool build/installation since it requires +php to run and pack up phar itself in phar format. This would require +a host-php instance and really probably nobody needs the phar tool +on the target. + +Signed-off-by: Gustavo Zacarias + +diff -Nura php-5.5.14.orig/configure php-5.5.14/configure +--- php-5.5.14.orig/configure 2014-07-08 09:52:52.657753194 -0300 ++++ php-5.5.14/configure 2014-07-08 09:53:07.610243933 -0300 +@@ -112930,13 +112930,8 @@ + INLINE_CFLAGS="$INLINE_CFLAGS $standard_libtool_flag" + CXXFLAGS="$CXXFLAGS $standard_libtool_flag" + +-if test "$PHP_PHAR" != "no" && test "$PHP_CLI" != "no"; then +- pharcmd=pharcmd +- pharcmd_install=install-pharcmd +-else +- pharcmd= +- pharcmd_install= +-fi; ++pharcmd= ++pharcmd_install= + + all_targets="$lcov_target \$(OVERALL_TARGET) \$(PHP_MODULES) \$(PHP_ZEND_EX) \$(PHP_BINARIES) $pharcmd" + install_targets="$install_sapi $install_modules $install_binaries install-build install-headers install-programs $install_pear $pharcmd_install" diff --git a/package/php/php-01-no-iconv-search.patch b/package/php/php-01-no-iconv-search.patch deleted file mode 100644 index 1979b7d0a5..0000000000 --- a/package/php/php-01-no-iconv-search.patch +++ /dev/null @@ -1,65 +0,0 @@ -Tweak PHP_SETUP_ICONV from aclocal/acinclude.m4 to not -PHP_ADD_INCLUDE $ICONV_DIR/include since the tests use -test instead of AC_TRY_LINK to find headers which is bad, -specially when adding /usr and /usr/local to the mix. -Do basically the same with ext/iconv/config.m4 by tweaking -PHP_ICONV_H_PATH which, again, uses test and absolute paths. -And all this directly in configure since autoreconf isn't -happy with php. - -Signed-off-by: Gustavo Zacarias - -diff -Nura php-5.5.11.orig/configure php-5.5.11/configure ---- php-5.5.11.orig/configure 2014-04-16 14:55:52.300838499 -0300 -+++ php-5.5.11/configure 2014-04-22 21:54:01.499097295 -0300 -@@ -45751,12 +45751,6 @@ - if test -n "$unique" && test "`eval $cmd`" = "" ; then - eval "INCLUDEPATH$unique=set" - -- if test ""; then -- INCLUDES="-I$ai_p $INCLUDES" -- else -- INCLUDES="$INCLUDES -I$ai_p" -- fi -- - fi - - fi -@@ -45786,14 +45780,7 @@ - PHP_ICONV_PREFIX="$ICONV_DIR" - fi - -- CFLAGS="-I$PHP_ICONV_PREFIX/include $CFLAGS" -- LDFLAGS="-L$PHP_ICONV_PREFIX/$PHP_LIBDIR $LDFLAGS" -- -- if test -r "$PHP_ICONV_PREFIX/include/giconv.h"; then -- PHP_ICONV_H_PATH="$PHP_ICONV_PREFIX/include/giconv.h" -- else -- PHP_ICONV_H_PATH="$PHP_ICONV_PREFIX/include/iconv.h" -- fi -+ PHP_ICONV_H_PATH="iconv.h" - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if iconv is glibc's" >&5 - $as_echo_n "checking if iconv is glibc's... " >&6; } -@@ -46191,8 +46178,6 @@ - ext_builddir=ext/iconv - ext_srcdir=$abs_srcdir/ext/iconv - -- ac_extra=`echo "-I\"$PHP_ICONV_PREFIX/include\""|$SED s#@ext_srcdir@#$ext_srcdir#g|$SED s#@ext_builddir@#$ext_builddir#g` -- - if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then - PHP_ICONV_SHARED=no - -@@ -97419,12 +97404,6 @@ - if test -n "$unique" && test "`eval $cmd`" = "" ; then - eval "INCLUDEPATH$unique=set" - -- if test ""; then -- INCLUDES="-I$ai_p $INCLUDES" -- else -- INCLUDES="$INCLUDES -I$ai_p" -- fi -- - fi - - fi diff --git a/package/php/php-02-dlopen.patch b/package/php/php-02-dlopen.patch deleted file mode 100644 index 1dd009f799..0000000000 --- a/package/php/php-02-dlopen.patch +++ /dev/null @@ -1,25 +0,0 @@ -PHP can't be AUTORECONF with any modern autotools and the dl tests are -pretty bad for cross-compilation, so just kill the needed ac_cv value unsets -so they can flow through from the package makefile. - -Signed-off-by: Gustavo Zacarias - -diff -Nura php-5.5.8.orig/configure php-5.5.8/configure ---- php-5.5.8.orig/configure 2014-01-28 17:41:33.943851727 -0300 -+++ php-5.5.8/configure 2014-01-28 17:42:53.785493795 -0300 -@@ -16985,7 +16985,6 @@ - - - -- unset ac_cv_func_dlopen - unset ac_cv_func___dlopen - unset found - -@@ -17013,7 +17012,6 @@ - - *) - -- unset ac_cv_lib_dl_dlopen - unset ac_cv_lib_dl___dlopen - unset found - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5 diff --git a/package/php/php-03-disable-pharcmd.patch b/package/php/php-03-disable-pharcmd.patch deleted file mode 100644 index d4a8464195..0000000000 --- a/package/php/php-03-disable-pharcmd.patch +++ /dev/null @@ -1,26 +0,0 @@ -Disable the 'phar' command-line tool build/installation since it requires -php to run and pack up phar itself in phar format. This would require -a host-php instance and really probably nobody needs the phar tool -on the target. - -Signed-off-by: Gustavo Zacarias - -diff -Nura php-5.5.14.orig/configure php-5.5.14/configure ---- php-5.5.14.orig/configure 2014-07-08 09:52:52.657753194 -0300 -+++ php-5.5.14/configure 2014-07-08 09:53:07.610243933 -0300 -@@ -112930,13 +112930,8 @@ - INLINE_CFLAGS="$INLINE_CFLAGS $standard_libtool_flag" - CXXFLAGS="$CXXFLAGS $standard_libtool_flag" - --if test "$PHP_PHAR" != "no" && test "$PHP_CLI" != "no"; then -- pharcmd=pharcmd -- pharcmd_install=install-pharcmd --else -- pharcmd= -- pharcmd_install= --fi; -+pharcmd= -+pharcmd_install= - - all_targets="$lcov_target \$(OVERALL_TARGET) \$(PHP_MODULES) \$(PHP_ZEND_EX) \$(PHP_BINARIES) $pharcmd" - install_targets="$install_sapi $install_modules $install_binaries install-build install-headers install-programs $install_pear $pharcmd_install"