[Astlinux-commits] SF.net SVN: astlinux:[6966] branches/1.0

[<abe...@us...>]

Revision: 6966
          http://sourceforge.net/p/astlinux/code/6966
Author:   abelbeck
Date:     2015-02-08 01:09:32 +0000 (Sun, 08 Feb 2015)
Log Message:
-----------
php, major version bump to 5.5.21

Modified Paths:
--------------
    branches/1.0/astlinux-ast11.config
    branches/1.0/astlinux-ast13.config
    branches/1.0/astlinux18.config
    branches/1.0/package/lighttpd/php.ini.conf
    branches/1.0/package/php/Config.ext
    branches/1.0/package/php/Config.in
    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-no-iconv-search.patch
    branches/1.0/package/php/php-0002-dlopen.patch
    branches/1.0/package/php/php-0003-disable-pharcmd.patch

Removed Paths:
-------------
    branches/1.0/package/php/php-gcc-version-test.patch

Modified: branches/1.0/astlinux-ast11.config
===================================================================
--- branches/1.0/astlinux-ast11.config	2015-02-06 15:49:42 UTC (rev 6965)
+++ branches/1.0/astlinux-ast11.config	2015-02-08 01:09:32 UTC (rev 6966)
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Buildroot 2011.08-svn6930-dirty Configuration
-# Tue Jan 13 08:11:58 2015
+# Buildroot 2011.08-svn6965-dirty Configuration
+# Sat Feb  7 17:51:44 2015
 #
 BR2_HAVE_DOT_CONFIG=y
 # BR2_arm is not set
@@ -455,19 +455,19 @@
 BR2_PACKAGE_PERL=y
 BR2_PACKAGE_PHP=y
 BR2_PACKAGE_PHP_CGI=y
+BR2_PACKAGE_PHP_SAPI_CGI=y
 # BR2_PACKAGE_PHP_SAPI_CLI is not set
-BR2_PACKAGE_PHP_SAPI_CGI=y
+# BR2_PACKAGE_PHP_SAPI_FPM is not set
 # BR2_PACKAGE_PHP_SAPI_CLI_CGI is not set
-# BR2_PACKAGE_PHP_FASTCGI is not set
+# BR2_PACKAGE_PHP_SAPI_CLI_FPM is not set
 
 #
 # PHP Extensions
 #
-BR2_PACKAGE_PHP_CONFIG="$(PHP_DIR)/php.ini-dist"
 # BR2_PACKAGE_PHP_EXT_SOCKETS is not set
 BR2_PACKAGE_PHP_EXT_POSIX=y
-# BR2_PACKAGE_PHP_EXT_SPL is not set
 BR2_PACKAGE_PHP_EXT_SESSION=y
+BR2_PACKAGE_PHP_EXT_HASH=y
 BR2_PACKAGE_PHP_EXT_OPENSSL=y
 # BR2_PACKAGE_PHP_EXT_CURL is not set
 BR2_PACKAGE_PHP_EXT_LIBXML2=y
@@ -479,24 +479,22 @@
 # BR2_PACKAGE_PHP_EXT_GETTEXT is not set
 # BR2_PACKAGE_PHP_EXT_GMP is not set
 BR2_PACKAGE_PHP_EXT_JSON=y
+BR2_PACKAGE_PHP_EXT_TOKENIZER=y
 # BR2_PACKAGE_PHP_EXT_READLINE is not set
-# BR2_PACKAGE_PHP_EXT_NCURSES is not set
-BR2_PACKAGE_PHP_EXT_PCRE=y
 # BR2_PACKAGE_PHP_EXT_PCNTL is not set
 # BR2_PACKAGE_PHP_EXT_SYSVMSG is not set
 # BR2_PACKAGE_PHP_EXT_SYSVSEM is not set
 # BR2_PACKAGE_PHP_EXT_SYSVSHM is not set
 BR2_PACKAGE_PHP_EXT_ZIP=y
+BR2_PACKAGE_PHP_EXT_CTYPE=y
 BR2_PACKAGE_PHP_EXT_FILTER=y
 # BR2_PACKAGE_PHP_EXT_CALENDAR is not set
 
 #
 # Database extensions
 #
-# BR2_PACKAGE_PHP_EXT_SQLITE is not set
 BR2_PACKAGE_PHP_EXT_PDO=y
 BR2_PACKAGE_PHP_EXT_PDO_SQLITE=y
-BR2_PACKAGE_PHP_EXT_PDO_SQLITE_EXTERNAL=y
 # BR2_PACKAGE_PHP_EXT_PDO_MYSQL is not set
 # BR2_PACKAGE_PYTHON is not set
 # BR2_PACKAGE_RUBY is not set

Modified: branches/1.0/astlinux-ast13.config
===================================================================
--- branches/1.0/astlinux-ast13.config	2015-02-06 15:49:42 UTC (rev 6965)
+++ branches/1.0/astlinux-ast13.config	2015-02-08 01:09:32 UTC (rev 6966)
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Buildroot 2011.08-svn6930-dirty Configuration
-# Tue Jan 13 08:11:59 2015
+# Buildroot 2011.08-svn6965-dirty Configuration
+# Sat Feb  7 17:52:06 2015
 #
 BR2_HAVE_DOT_CONFIG=y
 # BR2_arm is not set
@@ -455,19 +455,19 @@
 BR2_PACKAGE_PERL=y
 BR2_PACKAGE_PHP=y
 BR2_PACKAGE_PHP_CGI=y
+BR2_PACKAGE_PHP_SAPI_CGI=y
 # BR2_PACKAGE_PHP_SAPI_CLI is not set
-BR2_PACKAGE_PHP_SAPI_CGI=y
+# BR2_PACKAGE_PHP_SAPI_FPM is not set
 # BR2_PACKAGE_PHP_SAPI_CLI_CGI is not set
-# BR2_PACKAGE_PHP_FASTCGI is not set
+# BR2_PACKAGE_PHP_SAPI_CLI_FPM is not set
 
 #
 # PHP Extensions
 #
-BR2_PACKAGE_PHP_CONFIG="$(PHP_DIR)/php.ini-dist"
 # BR2_PACKAGE_PHP_EXT_SOCKETS is not set
 BR2_PACKAGE_PHP_EXT_POSIX=y
-# BR2_PACKAGE_PHP_EXT_SPL is not set
 BR2_PACKAGE_PHP_EXT_SESSION=y
+BR2_PACKAGE_PHP_EXT_HASH=y
 BR2_PACKAGE_PHP_EXT_OPENSSL=y
 # BR2_PACKAGE_PHP_EXT_CURL is not set
 BR2_PACKAGE_PHP_EXT_LIBXML2=y
@@ -479,24 +479,22 @@
 # BR2_PACKAGE_PHP_EXT_GETTEXT is not set
 # BR2_PACKAGE_PHP_EXT_GMP is not set
 BR2_PACKAGE_PHP_EXT_JSON=y
+BR2_PACKAGE_PHP_EXT_TOKENIZER=y
 # BR2_PACKAGE_PHP_EXT_READLINE is not set
-# BR2_PACKAGE_PHP_EXT_NCURSES is not set
-BR2_PACKAGE_PHP_EXT_PCRE=y
 # BR2_PACKAGE_PHP_EXT_PCNTL is not set
 # BR2_PACKAGE_PHP_EXT_SYSVMSG is not set
 # BR2_PACKAGE_PHP_EXT_SYSVSEM is not set
 # BR2_PACKAGE_PHP_EXT_SYSVSHM is not set
 BR2_PACKAGE_PHP_EXT_ZIP=y
+BR2_PACKAGE_PHP_EXT_CTYPE=y
 BR2_PACKAGE_PHP_EXT_FILTER=y
 # BR2_PACKAGE_PHP_EXT_CALENDAR is not set
 
 #
 # Database extensions
 #
-# BR2_PACKAGE_PHP_EXT_SQLITE is not set
 BR2_PACKAGE_PHP_EXT_PDO=y
 BR2_PACKAGE_PHP_EXT_PDO_SQLITE=y
-BR2_PACKAGE_PHP_EXT_PDO_SQLITE_EXTERNAL=y
 # BR2_PACKAGE_PHP_EXT_PDO_MYSQL is not set
 # BR2_PACKAGE_PYTHON is not set
 # BR2_PACKAGE_RUBY is not set

Modified: branches/1.0/astlinux18.config
===================================================================
--- branches/1.0/astlinux18.config	2015-02-06 15:49:42 UTC (rev 6965)
+++ branches/1.0/astlinux18.config	2015-02-08 01:09:32 UTC (rev 6966)
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Buildroot 2011.08-svn6930-dirty Configuration
-# Tue Jan 13 08:11:58 2015
+# Buildroot 2011.08-svn6965-dirty Configuration
+# Sat Feb  7 17:51:39 2015
 #
 BR2_HAVE_DOT_CONFIG=y
 # BR2_arm is not set
@@ -455,19 +455,19 @@
 BR2_PACKAGE_PERL=y
 BR2_PACKAGE_PHP=y
 BR2_PACKAGE_PHP_CGI=y
+BR2_PACKAGE_PHP_SAPI_CGI=y
 # BR2_PACKAGE_PHP_SAPI_CLI is not set
-BR2_PACKAGE_PHP_SAPI_CGI=y
+# BR2_PACKAGE_PHP_SAPI_FPM is not set
 # BR2_PACKAGE_PHP_SAPI_CLI_CGI is not set
-# BR2_PACKAGE_PHP_FASTCGI is not set
+# BR2_PACKAGE_PHP_SAPI_CLI_FPM is not set
 
 #
 # PHP Extensions
 #
-BR2_PACKAGE_PHP_CONFIG="$(PHP_DIR)/php.ini-dist"
 # BR2_PACKAGE_PHP_EXT_SOCKETS is not set
 BR2_PACKAGE_PHP_EXT_POSIX=y
-# BR2_PACKAGE_PHP_EXT_SPL is not set
 BR2_PACKAGE_PHP_EXT_SESSION=y
+BR2_PACKAGE_PHP_EXT_HASH=y
 BR2_PACKAGE_PHP_EXT_OPENSSL=y
 # BR2_PACKAGE_PHP_EXT_CURL is not set
 BR2_PACKAGE_PHP_EXT_LIBXML2=y
@@ -479,24 +479,22 @@
 # BR2_PACKAGE_PHP_EXT_GETTEXT is not set
 # BR2_PACKAGE_PHP_EXT_GMP is not set
 BR2_PACKAGE_PHP_EXT_JSON=y
+BR2_PACKAGE_PHP_EXT_TOKENIZER=y
 # BR2_PACKAGE_PHP_EXT_READLINE is not set
-# BR2_PACKAGE_PHP_EXT_NCURSES is not set
-BR2_PACKAGE_PHP_EXT_PCRE=y
 # BR2_PACKAGE_PHP_EXT_PCNTL is not set
 # BR2_PACKAGE_PHP_EXT_SYSVMSG is not set
 # BR2_PACKAGE_PHP_EXT_SYSVSEM is not set
 # BR2_PACKAGE_PHP_EXT_SYSVSHM is not set
 BR2_PACKAGE_PHP_EXT_ZIP=y
+BR2_PACKAGE_PHP_EXT_CTYPE=y
 BR2_PACKAGE_PHP_EXT_FILTER=y
 # BR2_PACKAGE_PHP_EXT_CALENDAR is not set
 
 #
 # Database extensions
 #
-# BR2_PACKAGE_PHP_EXT_SQLITE is not set
 BR2_PACKAGE_PHP_EXT_PDO=y
 BR2_PACKAGE_PHP_EXT_PDO_SQLITE=y
-BR2_PACKAGE_PHP_EXT_PDO_SQLITE_EXTERNAL=y
 # BR2_PACKAGE_PHP_EXT_PDO_MYSQL is not set
 # BR2_PACKAGE_PYTHON is not set
 # BR2_PACKAGE_RUBY is not set

Modified: branches/1.0/package/lighttpd/php.ini.conf
===================================================================
--- branches/1.0/package/lighttpd/php.ini.conf	2015-02-06 15:49:42 UTC (rev 6965)
+++ branches/1.0/package/lighttpd/php.ini.conf	2015-02-08 01:09:32 UTC (rev 6966)
@@ -1,6 +1,6 @@
 display_errors = Off
 display_startup_errors = Off
-error_reporting = E_ALL & ~E_NOTICE & ~E_DEPRECATED
+error_reporting = E_ALL & ~E_NOTICE & ~E_DEPRECATED & ~E_STRICT
 log_errors = Off
 error_log = syslog
 
@@ -14,6 +14,3 @@
 
 date.timezone = @TIMEZONE@
 
-; Required for PHP 5.3 and earlier
-magic_quotes_gpc = Off
-

Modified: branches/1.0/package/php/Config.ext
===================================================================
--- branches/1.0/package/php/Config.ext	2015-02-06 15:49:42 UTC (rev 6965)
+++ branches/1.0/package/php/Config.ext	2015-02-08 01:09:32 UTC (rev 6966)
@@ -1,12 +1,5 @@
 menu "PHP Extensions"
 
-config BR2_PACKAGE_PHP_CONFIG
-	string "PHP configuration file to use"
-	default "$(PHP_DIR)/php.ini-dist"
-	help
-	  If you want to use a different php.ini file define it here.
-	  Otherwise it'll just copy the default php.ini-dist from PHP.
-
 config BR2_PACKAGE_PHP_EXT_SOCKETS
 	bool "socket"
 	help
@@ -18,18 +11,18 @@
 	help
 	  POSIX support
 
-config BR2_PACKAGE_PHP_EXT_SPL
-	bool "SPL"
-	default y
-	help
-	  Standard PHP library support
-
 config BR2_PACKAGE_PHP_EXT_SESSION
 	bool "Session"
 	default y
 	help
 	  Session support
 
+config BR2_PACKAGE_PHP_EXT_HASH
+	bool "hash"
+	default y
+	help
+	  HASH message digest framework
+
 config BR2_PACKAGE_PHP_EXT_OPENSSL
 	bool "openssl"
 	select BR2_PACKAGE_OPENSSL
@@ -99,23 +92,19 @@
 	help
 	  JavaScript Object Serialization support
 
+config BR2_PACKAGE_PHP_EXT_TOKENIZER
+	bool "tokenizer"
+	default y
+	help
+	  Tokenizer functions support
+
 config BR2_PACKAGE_PHP_EXT_READLINE
 	bool "readline"
-	depends on (BR2_PACKAGE_PHP_CLI || BR2_PACKAGE_PHP_CGI) && BR2_PACKAGE_READLINE
+	select BR2_PACKAGE_NCURSES
+	select BR2_PACKAGE_READLINE
 	help
 	  readline support
 
-config BR2_PACKAGE_PHP_EXT_NCURSES
-	bool "ncurses"
-	depends on (BR2_PACKAGE_PHP_CLI || BR2_PACKAGE_PHP_CGI) && BR2_PACKAGE_NCURSES
-	help
-	  ncurses support
-
-config BR2_PACKAGE_PHP_EXT_PCRE
-	bool "PCRE"
-	help
-	  Perl Compatible Regular Expressions support
-
 config BR2_PACKAGE_PHP_EXT_PCNTL
 	bool "PCNTL"
 	help
@@ -141,9 +130,14 @@
 	help
 	  Zip read/write support
 
+config BR2_PACKAGE_PHP_EXT_CTYPE
+	bool "ctype"
+	default y
+	help
+	  Character type checking support
+
 config BR2_PACKAGE_PHP_EXT_FILTER
 	bool "filter"
-	select BR2_PACKAGE_PHP_EXT_PCRE
 	help
 	  Input filter support
 
@@ -154,17 +148,6 @@
 
 comment "Database extensions"
 
-config BR2_PACKAGE_PHP_EXT_SQLITE
-	bool "SQLite"
-	help
-	  Legacy SQLite2 support
-
-config BR2_PACKAGE_PHP_EXT_SQLITE_UTF8
-	bool "sqlite UTF8 support"
-	depends on BR2_PACKAGE_PHP_EXT_SQLITE
-	help
-	  UTF8 Support for sqlite
-
 config BR2_PACKAGE_PHP_EXT_PDO
 	bool "PDO"
 	help
@@ -173,16 +156,10 @@
 config BR2_PACKAGE_PHP_EXT_PDO_SQLITE
 	bool "PDO_SQLite"
 	depends on BR2_PACKAGE_PHP_EXT_PDO
+	select BR2_PACKAGE_SQLITE
 	help
 	  SQLite driver for PDO
 
-config BR2_PACKAGE_PHP_EXT_PDO_SQLITE_EXTERNAL
-	bool "PDO_SQLite external"
-	depends on BR2_PACKAGE_PHP_EXT_PDO_SQLITE
-	select BR2_PACKAGE_SQLITE
-	help
-	  Use external sqlite3 library
-
 config BR2_PACKAGE_PHP_EXT_PDO_MYSQL
 	bool "PDO_MySQL"
 	depends on BR2_PACKAGE_PHP_EXT_PDO

Modified: branches/1.0/package/php/Config.in
===================================================================
--- branches/1.0/package/php/Config.in	2015-02-06 15:49:42 UTC (rev 6965)
+++ branches/1.0/package/php/Config.in	2015-02-08 01:09:32 UTC (rev 6966)
@@ -10,44 +10,53 @@
 if BR2_PACKAGE_PHP
 
 config BR2_PACKAGE_PHP_CLI
-       bool
+	bool
 
 config BR2_PACKAGE_PHP_CGI
-       bool
+	bool
 
+config BR2_PACKAGE_PHP_FPM
+	bool
+
 choice
-        prompt "PHP interface"
-        default BR2_PACKAGE_PHP_SAPI_CGI
-        help
-          Select the PHP interface(s).
+	prompt "PHP interface"
+	default BR2_PACKAGE_PHP_SAPI_CGI
+	help
+	  Select the PHP interface(s).
 
+config BR2_PACKAGE_PHP_SAPI_CGI
+	bool "cgi interface"
+	select BR2_PACKAGE_PHP_CGI
+	help
+	  Common Gateway Interface
+
 config BR2_PACKAGE_PHP_SAPI_CLI
-        bool "cli interface"
+	bool "cli interface"
 	select BR2_PACKAGE_PHP_CLI
-        help
-          Command line interface for PHP.
+	help
+	  Command Line Interface
 
-config BR2_PACKAGE_PHP_SAPI_CGI
-        bool "cgi interface"
-        select BR2_PACKAGE_PHP_CGI
-        help
-          CGI interface for PHP.
+config BR2_PACKAGE_PHP_SAPI_FPM
+	bool "fpm interface"
+	select BR2_PACKAGE_PHP_FPM
+	help
+	  PHP-FPM (FastCGI Process Manager)
 
 config BR2_PACKAGE_PHP_SAPI_CLI_CGI
-        bool "cli and cgi interfaces"
+	bool "cli and cgi interfaces"
 	select BR2_PACKAGE_PHP_CLI
 	select BR2_PACKAGE_PHP_CGI
 	help
-	  Command line and CGI interfaces for PHP.
+	  Command line and Common gateway interfaces
 
+config BR2_PACKAGE_PHP_SAPI_CLI_FPM
+	bool "cli and fpm interfaces"
+	select BR2_PACKAGE_PHP_CLI
+	select BR2_PACKAGE_PHP_FPM
+	help
+	  Command line and PHP-FPM (FastCGI Process Manager)
+
 endchoice
 
-config BR2_PACKAGE_PHP_FASTCGI
-        bool "fastcgi"
-        depends on BR2_PACKAGE_PHP_CGI
-        default y
-        help
-          fast cgi interface for php
-
 source "package/php/Config.ext"
 endif

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	2015-02-08 01:09:32 UTC (rev 6966)
@@ -0,0 +1,11 @@
+--- 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
+@@ -5454,7 +5454,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-no-iconv-search.patch
===================================================================
--- branches/1.0/package/php/php-0001-no-iconv-search.patch	                        (rev 0)
+++ branches/1.0/package/php/php-0001-no-iconv-search.patch	2015-02-08 01:09:32 UTC (rev 6966)
@@ -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 <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
+@@ -45929,12 +45929,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
+@@ -45964,14 +45958,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; }
+@@ -46369,8 +46356,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
+ 
+@@ -97595,12 +97580,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

Added: branches/1.0/package/php/php-0002-dlopen.patch
===================================================================
--- branches/1.0/package/php/php-0002-dlopen.patch	                        (rev 0)
+++ branches/1.0/package/php/php-0002-dlopen.patch	2015-02-08 01:09:32 UTC (rev 6966)
@@ -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 <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
+@@ -17153,7 +17153,6 @@
+ 
+ 
+ 
+-  unset ac_cv_func_dlopen
+   unset ac_cv_func___dlopen
+   unset found
+ 
+@@ -17181,7 +17180,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-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	2015-02-08 01:09:32 UTC (rev 6966)
@@ -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 <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
+@@ -113130,13 +113130,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"

Deleted: branches/1.0/package/php/php-gcc-version-test.patch
===================================================================
--- branches/1.0/package/php/php-gcc-version-test.patch	2015-02-06 15:49:42 UTC (rev 6965)
+++ branches/1.0/package/php/php-gcc-version-test.patch	2015-02-08 01:09:32 UTC (rev 6966)
@@ -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
-@@ -3200,7 +3200,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

Modified: branches/1.0/package/php/php.mk
===================================================================
--- branches/1.0/package/php/php.mk	2015-02-06 15:49:42 UTC (rev 6965)
+++ branches/1.0/package/php/php.mk	2015-02-08 01:09:32 UTC (rev 6966)
@@ -4,56 +4,62 @@
 #
 #############################################################
 
-PHP_VERSION = 5.3.29
-PHP_SOURCE = php-$(PHP_VERSION).tar.bz2
+PHP_VERSION = 5.5.21
 PHP_SITE = http://www.php.net/distributions
+PHP_SOURCE = php-$(PHP_VERSION).tar.xz
 PHP_INSTALL_STAGING = YES
 PHP_INSTALL_STAGING_OPT = INSTALL_ROOT=$(STAGING_DIR) install
 PHP_INSTALL_TARGET_OPT = INSTALL_ROOT=$(TARGET_DIR) install
-PHP_LIBTOOL_PATCH = NO
-PHP_CONF_OPT =  --mandir=/usr/share/man \
-		--infodir=/usr/share/info \
-		--disable-all \
-		--without-pear \
-		--without-iconv \
-		--without-gd \
-		--enable-ctype \
-		--enable-hash \
-		--enable-tokenizer \
-		--with-config-file-path=/etc \
-		--localstatedir=/var
+PHP_DEPENDENCIES = host-pkg-config
+PHP_CONF_OPT = \
+	--mandir=/usr/share/man \
+	--infodir=/usr/share/info \
+	--disable-all \
+	--without-pear \
+	--without-iconv \
+	--with-config-file-path=/etc \
+	--localstatedir=/var \
+	--disable-rpath
 
-PHP_CFLAGS = $(TARGET_CFLAGS)
+PHP_CONF_ENV = EXTRA_LIBS="$(PHP_EXTRA_LIBS)"
 
-ifneq ($(BR2_PACKAGE_PHP_CLI),y)
-	PHP_CONF_OPT += --disable-cli
+ifeq ($(BR2_ENDIAN),"BIG")
+PHP_CONF_ENV += ac_cv_c_bigendian_php=yes
 else
-	PHP_CONF_OPT += --enable-cli
+PHP_CONF_ENV += ac_cv_c_bigendian_php=no
 endif
 
-ifneq ($(BR2_PACKAGE_PHP_CGI),y)
-	PHP_CONF_OPT += --disable-cgi
-else
-	PHP_CONF_OPT += --enable-cgi
-endif
+PHP_CFLAGS = $(TARGET_CFLAGS)
 
-### Extensions
-ifeq ($(BR2_PACKAGE_PHP_EXT_SOCKETS),y)
-	PHP_CONF_OPT += --enable-sockets
-endif
+# We need to force dl "detection"
+PHP_CONF_ENV += ac_cv_func_dlopen=yes ac_cv_lib_dl_dlopen=yes
+PHP_EXTRA_LIBS += -ldl
 
-ifeq ($(BR2_PACKAGE_PHP_EXT_POSIX),y)
-	PHP_CONF_OPT += --enable-posix
-endif
+PHP_CONF_OPT += $(if $(BR2_PACKAGE_PHP_CLI),,--disable-cli)
+PHP_CONF_OPT += $(if $(BR2_PACKAGE_PHP_CGI),,--disable-cgi)
+PHP_CONF_OPT += $(if $(BR2_PACKAGE_PHP_FPM),--enable-fpm,--disable-fpm)
 
-ifeq ($(BR2_PACKAGE_PHP_EXT_SPL),y)
-	PHP_CONF_OPT += --enable-spl
-endif
+### Extensions
+PHP_CONF_OPT += \
+	$(if $(BR2_PACKAGE_PHP_EXT_SOCKETS),--enable-sockets) \
+	$(if $(BR2_PACKAGE_PHP_EXT_POSIX),--enable-posix) \
+	$(if $(BR2_PACKAGE_PHP_EXT_SESSION),--enable-session) \
+	$(if $(BR2_PACKAGE_PHP_EXT_HASH),--enable-hash) \
+	$(if $(BR2_PACKAGE_PHP_EXT_SIMPLEXML),--enable-simplexml) \
+	$(if $(BR2_PACKAGE_PHP_EXT_XMLPARSER),--enable-xml) \
+	$(if $(BR2_PACKAGE_PHP_EXT_EXIF),--enable-exif) \
+	$(if $(BR2_PACKAGE_PHP_EXT_FTP),--enable-ftp) \
+	$(if $(BR2_PACKAGE_PHP_EXT_JSON),--enable-json) \
+	$(if $(BR2_PACKAGE_PHP_EXT_TOKENIZER),--enable-tokenizer) \
+	$(if $(BR2_PACKAGE_PHP_EXT_PCNTL),--enable-pcntl) \
+	$(if $(BR2_PACKAGE_PHP_EXT_SYSVMSG),--enable-sysvmsg) \
+	$(if $(BR2_PACKAGE_PHP_EXT_SYSVSEM),--enable-sysvsem) \
+	$(if $(BR2_PACKAGE_PHP_EXT_SYSVSHM),--enable-sysvshm) \
+	$(if $(BR2_PACKAGE_PHP_EXT_ZIP),--enable-zip) \
+	$(if $(BR2_PACKAGE_PHP_EXT_CTYPE),--enable-ctype) \
+	$(if $(BR2_PACKAGE_PHP_EXT_FILTER),--enable-filter) \
+	$(if $(BR2_PACKAGE_PHP_EXT_CALENDAR),--enable-calendar)
 
-ifeq ($(BR2_PACKAGE_PHP_EXT_SESSION),y)
-	PHP_CONF_OPT += --enable-session
-endif
-
 ifeq ($(BR2_PACKAGE_PHP_EXT_OPENSSL),y)
 	PHP_CONF_OPT += --with-openssl=$(STAGING_DIR)/usr
 	PHP_DEPENDENCIES += openssl
@@ -70,27 +76,11 @@
 	PHP_DEPENDENCIES += libxml2
 endif
 
-ifeq ($(BR2_PACKAGE_PHP_EXT_XMLPARSER),y)
-	PHP_CONF_OPT += --enable-xml
-endif
-
-ifeq ($(BR2_PACKAGE_PHP_EXT_SIMPLEXML),y)
-	PHP_CONF_OPT += --enable-simplexml
-endif
-
 ifeq ($(BR2_PACKAGE_PHP_EXT_ZLIB),y)
 	PHP_CONF_OPT += --with-zlib=$(STAGING_DIR)/usr
 	PHP_DEPENDENCIES += zlib
 endif
 
-ifeq ($(BR2_PACKAGE_PHP_EXT_EXIF),y)
-	PHP_CONF_OPT += --enable-exif
-endif
-
-ifeq ($(BR2_PACKAGE_PHP_EXT_FTP),y)
-	PHP_CONF_OPT += --enable-ftp
-endif
-
 ifeq ($(BR2_PACKAGE_PHP_EXT_GETTEXT),y)
 	PHP_CONF_OPT += --with-gettext=$(STAGING_DIR)/usr
 	PHP_DEPENDENCIES += $(if $(BR2_NEEDS_GETTEXT),gettext)
@@ -101,73 +91,17 @@
 	PHP_DEPENDENCIES += gmp
 endif
 
-ifeq ($(BR2_PACKAGE_PHP_EXT_JSON),y)
-	PHP_CONF_OPT += --enable-json
-endif
-
 ifeq ($(BR2_PACKAGE_PHP_EXT_READLINE),y)
 	PHP_CONF_OPT += --with-readline=$(STAGING_DIR)/usr
 	PHP_DEPENDENCIES += readline
 endif
 
-ifeq ($(BR2_PACKAGE_PHP_EXT_NCURSES),y)
-	PHP_CONF_OPT += --with-ncurses=$(STAGING_DIR)/usr
-	PHP_DEPENDENCIES += ncurses
-endif
-
-ifeq ($(BR2_PACKAGE_PHP_EXT_PCNTL),y)
-	PHP_CONF_OPT += --enable-pcntl
-endif
-
-ifeq ($(BR2_PACKAGE_PHP_EXT_SYSVMSG),y)
-	PHP_CONF_OPT += --enable-sysvmsg
-endif
-
-ifeq ($(BR2_PACKAGE_PHP_EXT_SYSVSEM),y)
-	PHP_CONF_OPT += --enable-sysvsem
-endif
-
-ifeq ($(BR2_PACKAGE_PHP_EXT_SYSVSHM),y)
-	PHP_CONF_OPT += --enable-sysvshm
-endif
-
-ifeq ($(BR2_PACKAGE_PHP_EXT_ZIP),y)
-	PHP_CONF_OPT += --enable-zip
-endif
-
-ifeq ($(BR2_PACKAGE_PHP_EXT_FILTER),y)
-	PHP_CONF_OPT += --enable-filter
-endif
-
-ifeq ($(BR2_PACKAGE_PHP_EXT_CALENDAR),y)
-	PHP_CONF_OPT += --enable-calendar
-endif
-
-ifeq ($(BR2_PACKAGE_PHP_EXT_PCRE),y)
-	PHP_CONF_OPT += --with-pcre-regex
-endif
-
-### Legacy sqlite2 support
-ifeq ($(BR2_PACKAGE_PHP_EXT_SQLITE),y)
-	PHP_CONF_OPT += --with-sqlite
-ifneq ($(BR2_LARGEFILE),y)
-	PHP_CFLAGS += -DSQLITE_DISABLE_LFS
-endif
-ifeq ($(BR2_PACKAGE_PHP_EXT_SQLITE_UTF8),y)
-	PHP_CONF_OPT += --enable-sqlite-utf8
-endif
-endif
-
 ### PDO
 ifeq ($(BR2_PACKAGE_PHP_EXT_PDO),y)
 	PHP_CONF_OPT += --enable-pdo
 ifeq ($(BR2_PACKAGE_PHP_EXT_PDO_SQLITE),y)
-ifeq ($(BR2_PACKAGE_PHP_EXT_PDO_SQLITE_EXTERNAL),y)
 	PHP_CONF_OPT += --with-pdo-sqlite=$(STAGING_DIR)/usr
 	PHP_DEPENDENCIES += sqlite
-else
-	PHP_CONF_OPT += --with-pdo-sqlite
-endif
 	PHP_CFLAGS += -DSQLITE_OMIT_LOAD_EXTENSION
 ifneq ($(BR2_LARGEFILE),y)
 	PHP_CFLAGS += -DSQLITE_DISABLE_LFS
@@ -179,6 +113,12 @@
 endif
 endif
 
+### Use external PCRE if it's available
+ifeq ($(BR2_PACKAGE_PCRE),y)
+	PHP_CONF_OPT += --with-pcre-regex=$(STAGING_DIR)/usr
+	PHP_DEPENDENCIES += pcre
+endif
+
 ### LDAP
 ifeq ($(BR2_PACKAGE_OPENLDAP),y)
 	PHP_CONF_OPT += --with-ldap=$(STAGING_DIR)/usr
@@ -190,6 +130,10 @@
 	$(SED) 's%^prefix="/usr"%prefix="$(STAGING_DIR)/usr"%' \
 		-e 's%^exec_prefix="/usr"%exec_prefix="$(STAGING_DIR)/usr"%' \
 		$(STAGING_DIR)/usr/bin/php-config
+	$(SED) "/prefix/ s:/usr:$(STAGING_DIR)/usr:" \
+		$(STAGING_DIR)/usr/bin/phpize
+	$(SED) "/extension_dir/ s:/usr:$(TARGET_DIR)/usr:" \
+		$(STAGING_DIR)/usr/bin/php-config
 endef
 
 PHP_POST_INSTALL_STAGING_HOOKS += PHP_FIXUP_PHP_CONFIG

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.