* [Buildroot] [PATCH 2/3] php: cleanup patches
2015-04-08 15:39 [Buildroot] [PATCH 1/3] php: bump to version 5.6.7 Gustavo Zacarias
@ 2015-04-08 15:39 ` Gustavo Zacarias
2015-04-08 19:25 ` Thomas Petazzoni
2015-04-08 15:39 ` [Buildroot] [PATCH 3/3] php: add opcache option Gustavo Zacarias
2015-04-08 19:25 ` [Buildroot] [PATCH 1/3] php: bump to version 5.6.7 Thomas Petazzoni
2 siblings, 1 reply; 8+ messages in thread
From: Gustavo Zacarias @ 2015-04-08 15:39 UTC (permalink / raw)
To: buildroot
Convert patches from pure configure ones to *.m4/configure.in cleanness.
This allows us to AUTORECONF (well, not quite, but close).
Even though upstream will probably not accept them it's the right way.
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
---
package/php/0001-ditch-unset.patch | 26 ++++++++++++++
package/php/0001-no-iconv-search.patch | 65 ----------------------------------
package/php/0002-dlopen.patch | 25 -------------
package/php/0002-no-iconv-search.patch | 55 ++++++++++++++++++++++++++++
package/php/0003-disable-pharcmd.patch | 9 ++---
package/php/php.mk | 7 ++++
6 files changed, 93 insertions(+), 94 deletions(-)
create mode 100644 package/php/0001-ditch-unset.patch
delete mode 100644 package/php/0001-no-iconv-search.patch
delete mode 100644 package/php/0002-dlopen.patch
create mode 100644 package/php/0002-no-iconv-search.patch
diff --git a/package/php/0001-ditch-unset.patch b/package/php/0001-ditch-unset.patch
new file mode 100644
index 0000000..b43b40f
--- /dev/null
+++ b/package/php/0001-ditch-unset.patch
@@ -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 <gustavo@zacarias.com.ar>
+
+diff -Nura php-5.6.7.orig/aclocal.m4 php-5.6.7/aclocal.m4
+--- php-5.6.7.orig/aclocal.m4 2015-04-08 11:08:11.208848359 -0300
++++ php-5.6.7/aclocal.m4 2015-04-08 11:08:49.828160195 -0300
+@@ -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]) ])
diff --git a/package/php/0001-no-iconv-search.patch b/package/php/0001-no-iconv-search.patch
deleted file mode 100644
index 1979b7d..0000000
--- a/package/php/0001-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 <gustavo@zacarias.com.ar>
-
-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
deleted file mode 100644
index 1dd009f..0000000
--- a/package/php/0002-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 <gustavo@zacarias.com.ar>
-
-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/0002-no-iconv-search.patch b/package/php/0002-no-iconv-search.patch
new file mode 100644
index 0000000..3496222
--- /dev/null
+++ b/package/php/0002-no-iconv-search.patch
@@ -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 <gustavo@zacarias.com.ar>
+[Gustavo: convert to nice m4 instead of patching configure]
+
+diff -Nura php-5.6.7.orig/aclocal.m4 php-5.6.7/aclocal.m4
+--- php-5.6.7.orig/aclocal.m4 2015-04-08 11:08:11.208848359 -0300
++++ php-5.6.7/aclocal.m4 2015-04-08 11:42:17.321044950 -0300
+@@ -2474,7 +2474,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.7.orig/ext/iconv/config.m4 php-5.6.7/ext/iconv/config.m4
+--- php-5.6.7.orig/ext/iconv/config.m4 2015-04-08 11:08:11.184847544 -0300
++++ php-5.6.7/ext/iconv/config.m4 2015-04-08 11:39:07.823608030 -0300
+@@ -14,28 +14,8 @@
+ ])
+
+ 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
++ PHP_ICONV_H_PATH="iconv.h"
+
+ AC_MSG_CHECKING([if iconv is glibc's])
+ AC_TRY_LINK([#include <gnu/libc-version.h>],[gnu_get_libc_version();],
diff --git a/package/php/0003-disable-pharcmd.patch b/package/php/0003-disable-pharcmd.patch
index d4a8464..bfcc956 100644
--- a/package/php/0003-disable-pharcmd.patch
+++ b/package/php/0003-disable-pharcmd.patch
@@ -4,11 +4,12 @@ a host-php instance and really probably nobody needs the phar tool
on the target.
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
+[Gustavo: update for autoreconf/configure.in]
-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 @@
+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"
diff --git a/package/php/php.mk b/package/php/php.mk
index ed842b0..12f8eaa 100644
--- a/package/php/php.mk
+++ b/package/php/php.mk
@@ -22,6 +22,13 @@ PHP_CONF_OPTS = \
--disable-rpath
PHP_CONF_ENV = 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) ; ./buildconf --force
+endef
+PHP_PRE_CONFIGURE_HOOKS += PHP_BUILDCONF
+
ifeq ($(BR2_ENDIAN),"BIG")
PHP_CONF_ENV += ac_cv_c_bigendian_php=yes
else
--
2.0.5
^ permalink raw reply related [flat|nested] 8+ messages in thread* [Buildroot] [PATCH 3/3] php: add opcache option
2015-04-08 15:39 [Buildroot] [PATCH 1/3] php: bump to version 5.6.7 Gustavo Zacarias
2015-04-08 15:39 ` [Buildroot] [PATCH 2/3] php: cleanup patches Gustavo Zacarias
@ 2015-04-08 15:39 ` Gustavo Zacarias
2015-04-08 19:26 ` Thomas Petazzoni
2015-04-08 19:25 ` [Buildroot] [PATCH 1/3] php: bump to version 5.6.7 Thomas Petazzoni
2 siblings, 1 reply; 8+ messages in thread
From: Gustavo Zacarias @ 2015-04-08 15:39 UTC (permalink / raw)
To: buildroot
Add a Zend OPcache option and tweak the build system into being
cross-compile friendly.
The OPcache extension allows for a neat intermediate bytecode cache in
memory to avoid reinterpreting/recompiling php scripts on multiple runs.
Make it an option since this takes up valuable RAM.
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
---
package/php/0004-flock-type-linux.patch | 48 +++++++++++++++++++++++++++++++++
package/php/Config.ext | 5 ++++
package/php/php.mk | 13 +++++++++
3 files changed, 66 insertions(+)
create mode 100644 package/php/0004-flock-type-linux.patch
diff --git a/package/php/0004-flock-type-linux.patch b/package/php/0004-flock-type-linux.patch
new file mode 100644
index 0000000..a03c262
--- /dev/null
+++ b/package/php/0004-flock-type-linux.patch
@@ -0,0 +1,48 @@
+OPcache: flock mechanism is obviously linux so force it.
+
+Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
+
+diff -Nura php-5.6.7.orig/ext/opcache/config.m4 php-5.6.7/ext/opcache/config.m4
+--- php-5.6.7.orig/ext/opcache/config.m4 2015-04-08 11:08:11.125845540 -0300
++++ php-5.6.7/ext/opcache/config.m4 2015-04-08 11:57:23.648831436 -0300
+@@ -326,38 +326,8 @@
+ msg=yes,msg=no,msg=no)
+ AC_MSG_RESULT([$msg])
+
+-flock_type=unknown
+-AC_MSG_CHECKING("whether flock struct is linux ordered")
+-AC_TRY_RUN([
+- #include <fcntl.h>
+- struct flock lock = { 1, 2, 3, 4, 5 };
+- int main() {
+- if(lock.l_type == 1 && lock.l_whence == 2 && lock.l_start == 3 && lock.l_len == 4) {
+- return 0;
+- }
+- return 1;
+- }
+-], [
+- flock_type=linux
+- AC_DEFINE([HAVE_FLOCK_LINUX], [], [Struct flock is Linux-type])
+- AC_MSG_RESULT("yes")
+-], AC_MSG_RESULT("no") )
+-
+-AC_MSG_CHECKING("whether flock struct is BSD ordered")
+-AC_TRY_RUN([
+- #include <fcntl.h>
+- struct flock lock = { 1, 2, 3, 4, 5 };
+- int main() {
+- if(lock.l_start == 1 && lock.l_len == 2 && lock.l_type == 4 && lock.l_whence == 5) {
+- return 0;
+- }
+- return 1;
+- }
+-], [
+- flock_type=bsd
+- AC_DEFINE([HAVE_FLOCK_BSD], [], [Struct flock is BSD-type])
+- AC_MSG_RESULT("yes")
+-], AC_MSG_RESULT("no") )
++flock_type=linux
++AC_DEFINE([HAVE_FLOCK_LINUX], [], [Struct flock is Linux-type])
+
+ if test "$flock_type" == "unknown"; then
+ AC_MSG_ERROR([Don't know how to define struct flock on this system[,] set --enable-opcache=no])
diff --git a/package/php/Config.ext b/package/php/Config.ext
index fafae26..a0898b9 100644
--- a/package/php/Config.ext
+++ b/package/php/Config.ext
@@ -10,6 +10,11 @@ config BR2_PACKAGE_PHP_EXT_FILEINFO
help
File Information support
+config BR2_PACKAGE_PHP_EXT_OPCACHE
+ bool "OPcache"
+ help
+ Enable the Zend OPcache accelerator.
+
config BR2_PACKAGE_PHP_EXT_READLINE
bool "Readline"
select BR2_PACKAGE_NCURSES
diff --git a/package/php/php.mk b/package/php/php.mk
index 12f8eaa..eb4f797 100644
--- a/package/php/php.mk
+++ b/package/php/php.mk
@@ -38,6 +38,19 @@ PHP_CONFIG_SCRIPTS = php-config
PHP_CFLAGS = $(TARGET_CFLAGS)
+# The OPcache extension isn't cross-compile friendly
+# Throw some defines here to avoid patching heavily
+ifeq ($(BR2_PACKAGE_PHP_EXT_OPCACHE),y)
+PHP_CONF_OPTS += --enable-opcache
+PHP_CONF_ENV += ac_cv_func_mprotect=yes
+PHP_CFLAGS += \
+ -DHAVE_SHM_IPC \
+ -DHAVE_SHM_MMAP_ANON \
+ -DHAVE_SHM_MMAP_ZERO \
+ -DHAVE_SHM_MMAP_POSIX \
+ -DHAVE_SHM_MMAP_FILE
+endif
+
# We need to force dl "detection"
ifeq ($(BR2_STATIC_LIBS),)
PHP_CONF_ENV += ac_cv_func_dlopen=yes ac_cv_lib_dl_dlopen=yes
--
2.0.5
^ permalink raw reply related [flat|nested] 8+ messages in thread