php: upgrade to 5.3.19
PATCH 2/3 php: enable gettext and sqlite
In reply to Eric Bénard--- meta-oe/recipes-devtools/php/php.inc | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-)
meta-oe/recipes-devtools/php/php.inc +6 -4
@@ -4,16 +4,16 @@ SECTION = "console/network" LICENSE = "PHP-3.0" BBCLASSEXTEND = "native" DEPENDS = "zlib libxml2 virtual/libiconv php-native lemon-native mysql5 \ - libc-client openssl" + libc-client openssl sqlite3" DEPENDS_virtclass-native = "zlib-native libxml2-native" -INC_PR = "r0" +INC_PR = "r1" SRC_URI = "http://www.php.net/distributions/php-${PV}.tar.bz2" S = "${WORKDIR}/php-${PV}" -inherit autotools pkgconfig pythonnative +inherit autotools pkgconfig pythonnative gettext SSTATE_SCAN_FILES += "build-defs.h"
@@ -22,6 +22,7 @@ COMMON_EXTRA_OECONF = "--enable-sockets --enable-pcntl --enable-shared" EXTRA_OECONF = "--enable-mbstring --enable-discard-path --enable-wddx \ --enable-magic-quotes --enable-fastcgi \ --with-imap=${STAGING_DIR_HOST} \ + --with-gettext=${STAGING_LIBDIR}/.. \ --with-imap-ssl=${STAGING_DIR_HOST} \ --with-zlib --with-zlib-dir=${STAGING_LIBDIR}/.. \ --with-iconv=${STAGING_LIBDIR}/.. \
@@ -29,8 +30,9 @@ EXTRA_OECONF = "--enable-mbstring --enable-discard-path --enable-wddx \ --disable-embedded-mysqli \ --with-mysql="${STAGING_DIR_TARGET}${prefix}" \ --with-mysqli="${STAGING_BINDIR_CROSS}/mysql_config" \ + --with-sqlite3=${STAGING_LIBDIR}/.. --enable-sqlite-utf8 \ --with-pdo-mysql="${STAGING_BINDIR_CROSS}/mysql_config" \ - --without-pdo-sqlite ${COMMON_EXTRA_OECONF} \ + --with-pdo-sqlite=${STAGING_LIBDIR}/.. ${COMMON_EXTRA_OECONF} \ " EXTRA_OECONF_virtclass-native = "--with-cgi --without-libpng --without-libjpeg \ --with-zlib --with-zlib-dir=${STAGING_LIBDIR_NATIVE}/.. \
Signature · 1 line
1.7.10.4
PATCH 3/3 php: enable php-fpm
In reply to Eric Bénard- php-fpm is an alternative PHP FastCGI implementation which seems to be now prefered to php-fcgi
- this patch enable the build of php-fpm and packages it in its own package
- it's tested with hiawatha on an armv5te target
--- meta-oe/recipes-devtools/php/php.inc | 21 +- .../php/php/fix-fpm-cross-compile.patch | 38 ++ meta-oe/recipes-devtools/php/php/php-fpm.conf | 510 ++++++++++++++++++++ meta-oe/recipes-devtools/php/php_5.3.19.bb | 2 + 4 files changed, 567 insertions(+), 4 deletions(-) create mode 100644 meta-oe/recipes-devtools/php/php/fix-fpm-cross-compile.patch create mode 100644 meta-oe/recipes-devtools/php/php/php-fpm.conf
meta-oe/recipes-devtools/php/php.inc +17 -4
@@ -7,7 +7,7 @@ DEPENDS = "zlib libxml2 virtual/libiconv php-native lemon-native mysql5 \ libc-client openssl sqlite3" DEPENDS_virtclass-native = "zlib-native libxml2-native" -INC_PR = "r1" +INC_PR = "r2" SRC_URI = "http://www.php.net/distributions/php-${PV}.tar.bz2"
@@ -20,7 +20,7 @@ SSTATE_SCAN_FILES += "build-defs.h" # Common EXTRA_OECONF COMMON_EXTRA_OECONF = "--enable-sockets --enable-pcntl --enable-shared" EXTRA_OECONF = "--enable-mbstring --enable-discard-path --enable-wddx \ - --enable-magic-quotes --enable-fastcgi \ + --enable-magic-quotes --enable-fastcgi --enable-fpm \ --with-imap=${STAGING_DIR_HOST} \ --with-gettext=${STAGING_LIBDIR}/.. \ --with-imap-ssl=${STAGING_DIR_HOST} \
@@ -57,25 +57,38 @@ do_install () { # fixme do_install_append_pn-php() { - mv ${D}/${STAGING_DIR_NATIVE}/${sysconfdir} ${D}/${sysconfdir} + install -d ${D}/${sysconfdir}/ + mv ${D}/${STAGING_DIR_NATIVE}/${sysconfdir}/* ${D}/${sysconfdir}/ rm -rf ${D}/${STAGING_DIR_NATIVE} rm -rf ${D}/.registry rm -rf ${D}/.channels rm -rf ${D}/.[a-z]* sed -i 's:${STAGING_DIR_NATIVE}::g' ${D}/${sysconfdir}/pear.conf + install -m 0644 ${WORKDIR}/php-fpm.conf ${D}/${sysconfdir}/php-fpm.conf + install -d ${D}${sysconfdir}/init.d + sed -i 's:=/usr/sbin:=${sbindir}:g' ${S}/sapi/fpm/init.d.php-fpm + sed -i 's:=/etc:=${sysconfdir}:g' ${S}/sapi/fpm/init.d.php-fpm + sed -i 's:=/var:=${localstatedir}:g' ${S}/sapi/fpm/init.d.php-fpm + install -m 0755 ${S}/sapi/fpm/init.d.php-fpm ${D}${sysconfdir}/init.d/php-fpm } -PACKAGES = "${PN}-dbg ${PN}-cli ${PN}-cgi ${PN}-pear ${PN}-dev ${PN}-staticdev ${PN}-doc ${PN}" +PACKAGES = "${PN}-dbg ${PN}-cli ${PN}-cgi ${PN}-fpm ${PN}-pear ${PN}-dev ${PN}-staticdev ${PN}-doc ${PN}" RDEPENDS_${PN}-pear = "${PN}" RDEPENDS_${PN}-cli = "${PN}" RDEPENDS_${PN}-dev = "${PN}" +INITSCRIPT_PACKAGES = "${PN}-fpm" +inherit update-rc.d FILES_${PN}-dbg =+ "${bindir}/.debug" FILES_${PN}-doc += "${libdir}/php/doc" FILES_${PN}-cli = "${bindir}/php" FILES_${PN}-cgi = "${bindir}/php-cgi" +FILES_${PN}-fpm = "${sbindir}/php-fpm ${sysconfdir}/php-fpm.conf ${datadir}/fpm ${sysconfdir}/init.d/php-fpm" +CONFFILES_${PN}-fpm = "${sysconfdir}/php-fpm.conf" +INITSCRIPT_NAME_${PN}-fpm = "php-fpm" +INITSCRIPT_PARAMS_${PN}-fpm = "defaults 60" FILES_${PN}-pear = "${bindir}/pear* ${bindir}/pecl ${libdir}/php/PEAR \ ${libdir}/php/PEAR.php ${libdir}/php/System.php \ ${libdir}php/peclcmd.php ${libdir}/php/pearcmd.php \
meta-oe/recipes-devtools/php/php/fix-fpm-cross-compile.patch new file +38 -0
@@ -0,0 +1,38 @@ +From 0b44f16ea2f18a08eb1249db6621840527eab5e0 Mon Sep 17 00:00:00 2001 +From: Jerome Loyet <[email protected]> +Date: Wed, 23 May 2012 11:40:22 +0200 +Subject: [PATCH] - Fixed bug #61839 (Unable to cross-compile PHP with + --enable-fpm) + +--- +Upstream-Status: Applied +http://git.php.net/?p=php-src.git;a=commit;h=0b44f16ea2f18a08eb1249db6621840527eab5e0 + + NEWS | 1 + + sapi/fpm/config.m4 | 4 ++++ + 2 files changed, 5 insertions(+) + +diff --git a/sapi/fpm/config.m4 b/sapi/fpm/config.m4 +index 8962810..6c860c9 100644 +--- a/sapi/fpm/config.m4 ++++ b/sapi/fpm/config.m4 +@@ -192,6 +192,8 @@ AC_DEFUN([AC_FPM_TRACE], + have_ptrace=no + have_broken_ptrace=yes + AC_MSG_RESULT([no]) ++ ], [ ++ AC_MSG_RESULT([skipped (cross compiling)]) + ]) + fi + +@@ -264,6 +266,8 @@ AC_DEFUN([AC_FPM_TRACE], + ], [ + proc_mem_file="" + AC_MSG_RESULT([no]) ++ ], [ ++ AC_MSG_RESULT([skipped (cross compiling)]) + ]) + fi + +-- +1.7.11.5
meta-oe/recipes-devtools/php/php/php-fpm.conf new file +510 -0
510 lines not on this page · raw message
meta-oe/recipes-devtools/php/php_5.3.19.bb +2 -0
@@ -13,6 +13,8 @@ SRC_URI_append_pn-php += "file://iconv.patch \ file://pear-makefile.patch \ file://phar-makefile.patch \ file://php_exec_native.patch \ + file://fix-fpm-cross-compile.patch \ + file://php-fpm.conf \ " SRC_URI[md5sum] = "e1d2a3ec7849d4b3032bd1abf1916aa4"
Signature · 1 line
1.7.10.4
PATCH 1/3 php: upgrade to 5.3.19
--- meta-oe/recipes-devtools/php/php.inc | 4 ++-- meta-oe/recipes-devtools/php/php/iconv.patch | 26 +++++++++++++------------- meta-oe/recipes-devtools/php/php_5.3.19.bb | 19 +++++++++++++++++++ meta-oe/recipes-devtools/php/php_5.3.6.bb | 19 ------------------- 4 files changed, 34 insertions(+), 34 deletions(-) create mode 100644 meta-oe/recipes-devtools/php/php_5.3.19.bb delete mode 100644 meta-oe/recipes-devtools/php/php_5.3.6.bb
meta-oe/recipes-devtools/php/php.inc +2 -2
@@ -1,13 +1,13 @@ DESCRIPTION = "A server-side, HTML-embedded scripting language. This package provides the CGI." HOMEPAGE = "http://www.php.net" SECTION = "console/network" -LICENSE = "PHP" +LICENSE = "PHP-3.0" BBCLASSEXTEND = "native" DEPENDS = "zlib libxml2 virtual/libiconv php-native lemon-native mysql5 \ libc-client openssl" DEPENDS_virtclass-native = "zlib-native libxml2-native" -INC_PR = "r2" +INC_PR = "r0" SRC_URI = "http://www.php.net/distributions/php-${PV}.tar.bz2"
meta-oe/recipes-devtools/php/php/iconv.patch +13 -13
@@ -1,21 +1,21 @@ -Index: php-5.2.13/acinclude.m4 -=================================================================== ---- php-5.2.13.orig/acinclude.m4 -+++ php-5.2.13/acinclude.m4 -@@ -2430,7 +2430,8 @@ AC_DEFUN([PHP_SETUP_ICONV], [ - dnl +diff --git a/acinclude.m4 b/acinclude.m4 +index 4c28b80..d6491a1 100644 +--- a/acinclude.m4 ++++ b/acinclude.m4 +@@ -2439,7 +2439,8 @@ AC_DEFUN([PHP_SETUP_ICONV], [ dnl Check libc first if no path is provided in --with-iconv dnl + - if test "$PHP_ICONV" = "yes"; then + dnl must check against no, not against yes as PHP_ICONV can also include a path, which implies yes + if test "$PHP_ICONV" != "no"; then - AC_CHECK_FUNC(iconv, [ - found_iconv=yes - ],[ -Index: php-5.2.13/ext/iconv/config.m4 -=================================================================== ---- php-5.2.13.orig/ext/iconv/config.m4 -+++ php-5.2.13/ext/iconv/config.m4 + dnl Reset LIBS temporarily as it may have already been included + dnl -liconv in. + LIBS_save="$LIBS" +diff --git a/ext/iconv/config.m4 b/ext/iconv/config.m4 +index d673b0a..1fbef13 100644 +--- a/ext/iconv/config.m4 ++++ b/ext/iconv/config.m4 @@ -15,7 +15,7 @@ if test "$PHP_ICONV" != "no"; then if test "$iconv_avail" != "no"; then
meta-oe/recipes-devtools/php/php_5.3.19.bb new file +19 -0
@@ -0,0 +1,19 @@ +require php.inc + +LIC_FILES_CHKSUM = "file://LICENSE;md5=cb564efdf78cce8ea6e4b5a4f7c05d97" + +PR = "${INC_PR}.0" + +SRC_URI += "file://acinclude-xml2-config.patch \ + file://php-m4-divert.patch \ + file://0001-php-don-t-use-broken-wrapper-for-mkdir.patch" + +SRC_URI_append_pn-php += "file://iconv.patch \ + file://imap-fix-autofoo.patch \ + file://pear-makefile.patch \ + file://phar-makefile.patch \ + file://php_exec_native.patch \ + " + +SRC_URI[md5sum] = "e1d2a3ec7849d4b3032bd1abf1916aa4" +SRC_URI[sha256sum] = "814ce55b950158c4ddadbcd0b2d7d8cb4b570de4a29b9db021020594e2469fd6"
meta-oe/recipes-devtools/php/php_5.3.6.bb deleted +0 -19
@@ -1,19 +0,0 @@ -require php.inc - -LIC_FILES_CHKSUM = "file://LICENSE;md5=cb564efdf78cce8ea6e4b5a4f7c05d97" - -PR = "${INC_PR}.0" - -SRC_URI += "file://acinclude-xml2-config.patch \ - file://php-m4-divert.patch \ - file://0001-php-don-t-use-broken-wrapper-for-mkdir.patch" - -SRC_URI_append_pn-php += "file://iconv.patch \ - file://imap-fix-autofoo.patch \ - file://pear-makefile.patch \ - file://phar-makefile.patch \ - file://php_exec_native.patch \ - " - -SRC_URI[md5sum] = "2286f5a82a6e8397955a0025c1c2ad98" -SRC_URI[sha256sum] = "30ae880f22e3ee93eccc9b80e3c58b0d6364d139bb4366dcc27f2fab658d3198"
Signature · 1 line
1.7.10.4
For whole patchset as it works great on AArch64:
Re: [meta-oe][PATCH 3/3] php: enable php-fpm
In reply to Eric BénardW dniu 27.11.2012 17:16, Eric Bénard pisze:
Quoted 5 lines
- php-fpm is an alternative PHP FastCGI implementation which seems to be now prefered to php-fcgi
- this patch enable the build of php-fpm and packages it in its own package
- it's tested with hiawatha on an armv5te target
I tested with Apache 2.4.3 on AArch64 target. Works fine after extra 3 lines of configuration. I wonder what would be best place for those - maybe "php-fpm-apache"?
Quoted 1 line · Eric Bénard
[snip]
Was there a patch to bring this over to meta-webserver too?
Signature · 5 lines
Jack Mitchell ([email protected]) Embedded Systems Engineer http://www.embed.me.uk --
PATCH 1/1 php: add apache configuration for php-fpm
In reply to Marcin Juszkiewicz--- meta-oe/recipes-devtools/php/php.inc | 8 ++++++-- meta-oe/recipes-devtools/php/php_5.3.19.bb | 1 + 2 files changed, 7 insertions(+), 2 deletions(-)
meta-oe/recipes-devtools/php/php.inc +6 -2
@@ -7,7 +7,7 @@ DEPENDS = "zlib libxml2 virtual/libiconv php-native lemon-native mysql5 \ libc-client openssl sqlite3" DEPENDS_virtclass-native = "zlib-native libxml2-native" -INC_PR = "r2" +INC_PR = "r3" SRC_URI = "http://www.php.net/distributions/php-${PV}.tar.bz2"
@@ -65,6 +65,8 @@ do_install_append_pn-php() { rm -rf ${D}/.[a-z]* sed -i 's:${STAGING_DIR_NATIVE}::g' ${D}/${sysconfdir}/pear.conf install -m 0644 ${WORKDIR}/php-fpm.conf ${D}/${sysconfdir}/php-fpm.conf + install -d ${D}/${sysconfdir}/apache2/conf.d + install -m 0644 ${WORKDIR}/php-fpm-apache.conf ${D}/${sysconfdir}/apache2/conf.d/php-fpm.conf install -d ${D}${sysconfdir}/init.d sed -i 's:=/usr/sbin:=${sbindir}:g' ${S}/sapi/fpm/init.d.php-fpm sed -i 's:=/etc:=${sysconfdir}:g' ${S}/sapi/fpm/init.d.php-fpm
@@ -72,7 +74,7 @@ do_install_append_pn-php() { install -m 0755 ${S}/sapi/fpm/init.d.php-fpm ${D}${sysconfdir}/init.d/php-fpm } -PACKAGES = "${PN}-dbg ${PN}-cli ${PN}-cgi ${PN}-fpm ${PN}-pear ${PN}-dev ${PN}-staticdev ${PN}-doc ${PN}" +PACKAGES = "${PN}-dbg ${PN}-cli ${PN}-cgi ${PN}-fpm ${PN}-fpm-apache2 ${PN}-pear ${PN}-dev ${PN}-staticdev ${PN}-doc ${PN}" RDEPENDS_${PN}-pear = "${PN}" RDEPENDS_${PN}-cli = "${PN}"
@@ -86,7 +88,9 @@ FILES_${PN}-doc += "${libdir}/php/doc" FILES_${PN}-cli = "${bindir}/php" FILES_${PN}-cgi = "${bindir}/php-cgi" FILES_${PN}-fpm = "${sbindir}/php-fpm ${sysconfdir}/php-fpm.conf ${datadir}/fpm ${sysconfdir}/init.d/php-fpm" +FILES_${PN}-fpm-apache2 = "${sysconfdir}/apache2/conf.d/php-fpm.conf" CONFFILES_${PN}-fpm = "${sysconfdir}/php-fpm.conf" +CONFFILES_${PN}-fpm-apache2 = "${sysconfdir}/apache2/conf.d/php-fpm.conf" INITSCRIPT_NAME_${PN}-fpm = "php-fpm" INITSCRIPT_PARAMS_${PN}-fpm = "defaults 60" FILES_${PN}-pear = "${bindir}/pear* ${bindir}/pecl ${libdir}/php/PEAR \
meta-oe/recipes-devtools/php/php_5.3.19.bb +1 -0
@@ -15,6 +15,7 @@ SRC_URI_append_pn-php += "file://iconv.patch \ file://php_exec_native.patch \ file://fix-fpm-cross-compile.patch \ file://php-fpm.conf \ + file://php-fpm-apache.conf \ " SRC_URI[md5sum] = "e1d2a3ec7849d4b3032bd1abf1916aa4"
Signature · 1 line
1.8.0
Re: [meta-oe][PATCH] php: add apache configuration for php-fpm
Hi Marcin,
Quoted 11 lines · Marcin Juszkiewicz
Signed-off-by Marcin Juszkiewicz <[email protected]>--- meta-oe/recipes-devtools/php/php.inc | 8 ++++++-- meta-oe/recipes-devtools/php/php_5.3.19.bb | 1 + 2 files changed, 7 insertions(+), 2 deletions(-)meta-oe/recipes-devtools/php/php_5.3.19.bb +0
-0
meta-oe/recipes-devtools/php/php_5.3.19.bb SRC_URI_append_pn-php += "file://iconv.patch \ · line 19
Quoted 5 lines
meta-oe/recipes-devtools/php/php_5.3.19.bb +1
-0@@ -15,6 +15,7 @@ SRC_URI_append_pn-php += "file://iconv.patch \ file://php_exec_native.patch \ file://fix-fpm-cross-compile.patch \ file://php-fpm.conf \ + file://php-fpm-apache.conf \ "
the conf file is missing from your patch.
Eric
Quoted 5 lines · Jack Mitchell
Quoted 1 line · Eric Bénard
[snip]
Was there a patch to bring this over to meta-webserver too?
that's WIP based on a previous work by Marcin, I expect to be able to test that by the begining of next week.
PHP can be used as php-cli so not in a webserver context so maybe the best way to handle that would be to have php in meta-oe to generate php-cli and a bbappend in meta-webserver to general php-cgi, php-fpm and modphp when meta-webserver is enabled.
Eric
PATCH 1/1 php: add apache configuration for php-fpm
In reply to Eric Bénard--- meta-oe/recipes-devtools/php/php.inc | 8 ++++++-- meta-oe/recipes-devtools/php/php/php-fpm-apache.conf | 6 ++++++ meta-oe/recipes-devtools/php/php_5.3.19.bb | 1 + 3 files changed, 13 insertions(+), 2 deletions(-) create mode 100644 meta-oe/recipes-devtools/php/php/php-fpm-apache.conf
meta-oe/recipes-devtools/php/php.inc +6 -2
@@ -7,7 +7,7 @@ DEPENDS = "zlib libxml2 virtual/libiconv php-native lemon-native mysql5 \ libc-client openssl sqlite3" DEPENDS_virtclass-native = "zlib-native libxml2-native" -INC_PR = "r2" +INC_PR = "r3" SRC_URI = "http://www.php.net/distributions/php-${PV}.tar.bz2"
@@ -65,6 +65,8 @@ do_install_append_pn-php() { rm -rf ${D}/.[a-z]* sed -i 's:${STAGING_DIR_NATIVE}::g' ${D}/${sysconfdir}/pear.conf install -m 0644 ${WORKDIR}/php-fpm.conf ${D}/${sysconfdir}/php-fpm.conf + install -d ${D}/${sysconfdir}/apache2/conf.d + install -m 0644 ${WORKDIR}/php-fpm-apache.conf ${D}/${sysconfdir}/apache2/conf.d/php-fpm.conf install -d ${D}${sysconfdir}/init.d sed -i 's:=/usr/sbin:=${sbindir}:g' ${S}/sapi/fpm/init.d.php-fpm sed -i 's:=/etc:=${sysconfdir}:g' ${S}/sapi/fpm/init.d.php-fpm
@@ -72,7 +74,7 @@ do_install_append_pn-php() { install -m 0755 ${S}/sapi/fpm/init.d.php-fpm ${D}${sysconfdir}/init.d/php-fpm } -PACKAGES = "${PN}-dbg ${PN}-cli ${PN}-cgi ${PN}-fpm ${PN}-pear ${PN}-dev ${PN}-staticdev ${PN}-doc ${PN}" +PACKAGES = "${PN}-dbg ${PN}-cli ${PN}-cgi ${PN}-fpm ${PN}-fpm-apache2 ${PN}-pear ${PN}-dev ${PN}-staticdev ${PN}-doc ${PN}" RDEPENDS_${PN}-pear = "${PN}" RDEPENDS_${PN}-cli = "${PN}"
@@ -86,7 +88,9 @@ FILES_${PN}-doc += "${libdir}/php/doc" FILES_${PN}-cli = "${bindir}/php" FILES_${PN}-cgi = "${bindir}/php-cgi" FILES_${PN}-fpm = "${sbindir}/php-fpm ${sysconfdir}/php-fpm.conf ${datadir}/fpm ${sysconfdir}/init.d/php-fpm" +FILES_${PN}-fpm-apache2 = "${sysconfdir}/apache2/conf.d/php-fpm.conf" CONFFILES_${PN}-fpm = "${sysconfdir}/php-fpm.conf" +CONFFILES_${PN}-fpm-apache2 = "${sysconfdir}/apache2/conf.d/php-fpm.conf" INITSCRIPT_NAME_${PN}-fpm = "php-fpm" INITSCRIPT_PARAMS_${PN}-fpm = "defaults 60" FILES_${PN}-pear = "${bindir}/pear* ${bindir}/pecl ${libdir}/php/PEAR \
meta-oe/recipes-devtools/php/php/php-fpm-apache.conf new file +6 -0
@@ -0,0 +1,6 @@ +# Taken from http://wiki.apache.org/httpd/PHP-FPM + +LoadModule proxy_module lib/apache2/modules/mod_proxy.so +LoadModule proxy_fcgi_module lib/apache2/modules/mod_proxy_fcgi.so + +ProxyPassMatch ^/(.*\.php(/.*)?)$ fcgi://127.0.0.1:9000/usr/share/apache2/htdocs/
meta-oe/recipes-devtools/php/php_5.3.19.bb +1 -0
@@ -15,6 +15,7 @@ SRC_URI_append_pn-php += "file://iconv.patch \ file://php_exec_native.patch \ file://fix-fpm-cross-compile.patch \ file://php-fpm.conf \ + file://php-fpm-apache.conf \ " SRC_URI[md5sum] = "e1d2a3ec7849d4b3032bd1abf1916aa4"
Signature · 1 line
1.8.0