Menu
▾
▴
[Astlinux-commits] SF.net SVN: astlinux:[7773] branches/1.0/package/php
|
From: <abe...@us...> - 2016-07-25 17:25:22
|
Revision: 7773
http://sourceforge.net/p/astlinux/code/7773
Author: abelbeck
Date: 2016-07-25 17:25:20 +0000 (Mon, 25 Jul 2016)
Log Message:
-----------
php, major version bump to 5.6.24
Modified Paths:
--------------
branches/1.0/package/php/php.mk
Added Paths:
-----------
branches/1.0/package/php/php-0000-gcc-version-test.patch
branches/1.0/package/php/php-0001-ditch-unset.patch
branches/1.0/package/php/php-0002-no-iconv-search.patch
branches/1.0/package/php/php-0003-disable-pharcmd.patch
branches/1.0/package/php/php-0005-ac-cache-strcasestr.patch
Removed Paths:
-------------
branches/1.0/package/php/php-0000-gcc-version-test.patch
branches/1.0/package/php/php-0001-no-iconv-search.patch
branches/1.0/package/php/php-0002-dlopen.patch
branches/1.0/package/php/php-0003-disable-pharcmd.patch
Deleted: branches/1.0/package/php/php-0000-gcc-version-test.patch
===================================================================
--- branches/1.0/package/php/php-0000-gcc-version-test.patch 2016-07-22 13:58:56 UTC (rev 7772)
+++ branches/1.0/package/php/php-0000-gcc-version-test.patch 2016-07-25 17:25:20 UTC (rev 7773)
@@ -1,11 +0,0 @@
---- php-5.3.22/configure.orig 2013-03-17 14:56:49.000000000 -0500
-+++ php-5.3.22/configure 2013-03-17 14:58:16.000000000 -0500
-@@ -5457,7 +5457,7 @@
- GCC_MAJOR_VERSION=`$CC -dumpversion | /usr/bin/sed -nE '1s/([0-9]+)\.[0-9]+\..*/\1/;1p'`
- ;;
- *)
-- GCC_MAJOR_VERSION=`$CC --version | $SED -n '1s/[^0-9]*//;1s/\..*//;1p'`
-+ GCC_MAJOR_VERSION=`$CC -dumpversion | cut -d'.' -f1`
- ;;
- esac
- if test $GCC_MAJOR_VERSION -ge 4; then
Added: branches/1.0/package/php/php-0000-gcc-version-test.patch
===================================================================
--- branches/1.0/package/php/php-0000-gcc-version-test.patch (rev 0)
+++ branches/1.0/package/php/php-0000-gcc-version-test.patch 2016-07-25 17:25:20 UTC (rev 7773)
@@ -0,0 +1,11 @@
+--- php-5.6.24/configure.in.orig 2016-07-25 10:47:22.942680457 -0500
++++ php-5.6.24/configure.in 2016-07-25 10:48:07.381446344 -0500
+@@ -292,7 +292,7 @@
+ GCC_MAJOR_VERSION=`$CC -dumpversion | /usr/bin/sed -nE '1s/([[0-9]]+)\.[[0-9]]+\..*/\1/;1p'`
+ ;;
+ *)
+- GCC_MAJOR_VERSION=`$CC --version | $SED -n '1s/[[^0-9]]*//;1s/\..*//;1p'`
++ GCC_MAJOR_VERSION=`$CC -dumpversion | cut -d'.' -f1`
+ ;;
+ esac
+ if test $GCC_MAJOR_VERSION -ge 4; then
Added: branches/1.0/package/php/php-0001-ditch-unset.patch
===================================================================
--- branches/1.0/package/php/php-0001-ditch-unset.patch (rev 0)
+++ branches/1.0/package/php/php-0001-ditch-unset.patch 2016-07-25 17:25:20 UTC (rev 7773)
@@ -0,0 +1,26 @@
+Unsetting ac_cv_{func,lib}_* is bad, you can't feed the configure cache.
+Terminate them with extreme prejudice.
+
+Signed-off-by: Gustavo Zacarias <gu...@za...>
+
+diff -Nura php-5.6.8.orig/acinclude.m4 php-5.6.8/acinclude.m4
+--- php-5.6.8.orig/acinclude.m4 2015-04-15 20:05:57.000000000 +0200
++++ php-5.6.8/acinclude.m4 2015-05-18 20:03:50.833099001 +0200
+@@ -1897,8 +1897,6 @@
+ dnl
+ AC_DEFUN([PHP_CHECK_FUNC_LIB],[
+ ifelse($2,,:,[
+- unset ac_cv_lib_$2[]_$1
+- unset ac_cv_lib_$2[]___$1
+ unset found
+ AC_CHECK_LIB($2, $1, [found=yes], [
+ AC_CHECK_LIB($2, __$1, [found=yes], [found=no])
+@@ -1930,8 +1928,6 @@
+ dnl Defines HAVE_func and HAVE_library if found and adds the library to LIBS.
+ dnl
+ AC_DEFUN([PHP_CHECK_FUNC],[
+- unset ac_cv_func_$1
+- unset ac_cv_func___$1
+ unset found
+
+ AC_CHECK_FUNC($1, [found=yes],[ AC_CHECK_FUNC(__$1,[found=yes],[found=no]) ])
Deleted: branches/1.0/package/php/php-0001-no-iconv-search.patch
===================================================================
--- branches/1.0/package/php/php-0001-no-iconv-search.patch 2016-07-22 13:58:56 UTC (rev 7772)
+++ branches/1.0/package/php/php-0001-no-iconv-search.patch 2016-07-25 17:25:20 UTC (rev 7773)
@@ -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 <gu...@za...>
-
-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
-@@ -45944,12 +45944,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
-@@ -45979,14 +45973,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; }
-@@ -46446,8 +46433,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
-
-@@ -97775,12 +97760,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
Deleted: branches/1.0/package/php/php-0002-dlopen.patch
===================================================================
--- branches/1.0/package/php/php-0002-dlopen.patch 2016-07-22 13:58:56 UTC (rev 7772)
+++ branches/1.0/package/php/php-0002-dlopen.patch 2016-07-25 17:25:20 UTC (rev 7773)
@@ -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 <gu...@za...>
-
-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
-@@ -17156,7 +17156,6 @@
-
-
-
-- unset ac_cv_func_dlopen
- unset ac_cv_func___dlopen
- unset found
-
-@@ -17184,7 +17183,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
Added: branches/1.0/package/php/php-0002-no-iconv-search.patch
===================================================================
--- branches/1.0/package/php/php-0002-no-iconv-search.patch (rev 0)
+++ branches/1.0/package/php/php-0002-no-iconv-search.patch 2016-07-25 17:25:20 UTC (rev 7773)
@@ -0,0 +1,55 @@
+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.
+
+Signed-off-by: Gustavo Zacarias <gu...@za...>
+[Gustavo: convert to nice m4 instead of patching configure]
+[Gustavo: update for 5.6.10]
+
+diff -Nura php-5.6.10.orig/acinclude.m4 php-5.6.10/acinclude.m4
+--- php-5.6.10.orig/acinclude.m4 2015-06-12 16:09:06.274355813 -0300
++++ php-5.6.10/acinclude.m4 2015-06-12 16:10:10.884544865 -0300
+@@ -2470,7 +2470,7 @@
+ dnl
+ if test "$found_iconv" = "no"; then
+
+- for i in $PHP_ICONV /usr/local /usr; do
++ for i in $PHP_ICONV; do
+ if test -r $i/include/giconv.h; then
+ AC_DEFINE(HAVE_GICONV_H, 1, [ ])
+ ICONV_DIR=$i
+diff -Nura php-5.6.10.orig/ext/iconv/config.m4 php-5.6.10/ext/iconv/config.m4
+--- php-5.6.10.orig/ext/iconv/config.m4 2015-06-12 16:09:07.792407246 -0300
++++ php-5.6.10/ext/iconv/config.m4 2015-06-12 16:11:07.752471600 -0300
+@@ -14,28 +14,6 @@
+ ])
+
+ if test "$iconv_avail" != "no"; then
+- if test -z "$ICONV_DIR"; then
+- for i in /usr/local /usr; do
+- if test -f "$i/include/iconv.h" || test -f "$i/include/giconv.h"; then
+- PHP_ICONV_PREFIX="$i"
+- break
+- fi
+- done
+- if test -z "$PHP_ICONV_PREFIX"; then
+- PHP_ICONV_PREFIX="/usr"
+- fi
+- else
+- 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
+
+ AC_MSG_CHECKING([if iconv is glibc's])
+ AC_TRY_LINK([#include <gnu/libc-version.h>],[gnu_get_libc_version();],
Deleted: branches/1.0/package/php/php-0003-disable-pharcmd.patch
===================================================================
--- branches/1.0/package/php/php-0003-disable-pharcmd.patch 2016-07-22 13:58:56 UTC (rev 7772)
+++ branches/1.0/package/php/php-0003-disable-pharcmd.patch 2016-07-25 17:25:20 UTC (rev 7773)
@@ -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 <gu...@za...>
-
-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
-@@ -113259,13 +113259,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"
Added: branches/1.0/package/php/php-0003-disable-pharcmd.patch
===================================================================
--- branches/1.0/package/php/php-0003-disable-pharcmd.patch (rev 0)
+++ branches/1.0/package/php/php-0003-disable-pharcmd.patch 2016-07-25 17:25:20 UTC (rev 7773)
@@ -0,0 +1,27 @@
+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 <gu...@za...>
+[Gustavo: update for autoreconf/configure.in]
+
+diff -Nura php-5.6.7.orig/configure.in php-5.6.7/configure.in
+--- php-5.6.7.orig/configure.in 2015-04-08 11:08:10.815835010 -0300
++++ php-5.6.7/configure.in 2015-04-08 11:16:20.460467444 -0300
+@@ -1437,13 +1437,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"
Added: branches/1.0/package/php/php-0005-ac-cache-strcasestr.patch
===================================================================
--- branches/1.0/package/php/php-0005-ac-cache-strcasestr.patch (rev 0)
+++ branches/1.0/package/php/php-0005-ac-cache-strcasestr.patch 2016-07-25 17:25:20 UTC (rev 7773)
@@ -0,0 +1,24 @@
+Allow cache answer for strcasestr discovery.
+
+Signed-off-by: Gustavo Zacarias <gu...@za...>
+
+diff -Nura php-5.6.7.orig/ext/fileinfo/config.m4 php-5.6.7/ext/fileinfo/config.m4
+--- php-5.6.7.orig/ext/fileinfo/config.m4 2015-04-08 22:19:45.798770792 -0300
++++ php-5.6.7/ext/fileinfo/config.m4 2015-04-08 22:26:33.110654338 -0300
+@@ -14,6 +14,7 @@
+ libmagic/readcdf.c libmagic/softmagic.c"
+
+ AC_MSG_CHECKING([for strcasestr])
++ AC_CACHE_VAL(ac_cv_func_strcasestr,
+ AC_TRY_RUN([
+ #include <string.h>
+ #include <strings.h>
+@@ -46,7 +47,7 @@
+ AC_MSG_RESULT(no)
+ AC_MSG_NOTICE(using libmagic strcasestr implementation)
+ libmagic_sources="$libmagic_sources libmagic/strcasestr.c"
+- ])
++ ]))
+
+ PHP_NEW_EXTENSION(fileinfo, fileinfo.c $libmagic_sources, $ext_shared,,-I@ext_srcdir@/libmagic)
+ PHP_ADD_BUILD_DIR($ext_builddir/libmagic)
Modified: branches/1.0/package/php/php.mk
===================================================================
--- branches/1.0/package/php/php.mk 2016-07-22 13:58:56 UTC (rev 7772)
+++ branches/1.0/package/php/php.mk 2016-07-25 17:25:20 UTC (rev 7773)
@@ -4,7 +4,7 @@
#
#############################################################
-PHP_VERSION = 5.5.38
+PHP_VERSION = 5.6.24
PHP_SITE = http://www.php.net/distributions
PHP_SOURCE = php-$(PHP_VERSION).tar.xz
PHP_INSTALL_STAGING = YES
@@ -41,8 +41,17 @@
--localstatedir=/var \
--disable-rpath
-PHP_CONF_ENV = EXTRA_LIBS="$(PHP_EXTRA_LIBS)"
+PHP_CONF_ENV = \
+ ac_cv_func_strcasestr=yes \
+ EXTRA_LIBS="$(PHP_EXTRA_LIBS)"
+# PHP can't be AUTORECONFed the standard way unfortunately
+PHP_DEPENDENCIES += host-autoconf host-automake host-libtool
+define PHP_BUILDCONF
+ cd $(@D) ; $(TARGET_MAKE_ENV) ./buildconf --force
+endef
+PHP_PRE_CONFIGURE_HOOKS += PHP_BUILDCONF
+
ifeq ($(BR2_ENDIAN),"BIG")
PHP_CONF_ENV += ac_cv_c_bigendian_php=yes
else
@@ -160,7 +169,7 @@
define PHP_INSTALL_FIXUP
mv $(TARGET_DIR)/usr/bin/php-cgi $(TARGET_DIR)/usr/bin/php
- rm -rf $(TARGET_DIR)/usr/lib/php
+ rm -rf $(TARGET_DIR)/usr/lib/php/build
rm -f $(TARGET_DIR)/usr/bin/phpize
rm -f $(TARGET_DIR)/usr/bin/php-config
ln -sf /tmp/etc/php.ini $(TARGET_DIR)/etc/php.ini
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
