php: build both php-cgi and php-fpm
RFC 1/1 php: build both php-cgi and php-fpm
- when enabling fpm, CGI is disabled, so build php-cgi first and then reconfigure and build fpm
- php-fpm is run tested after this change
- php-cgi is only compil tested
- --enable-discard-path, --enable-fastcgi were removed as these options are not recognized by configure :
configure: WARNING: unrecognized options: --disable-silent-rules,
--disable-dependency-tracking, --enable-discard-path,
--enable-fastcgi, --enable-nlsSigned-off-by Eric Bénard <[email protected]>
--- meta-oe/recipes-devtools/php/php.inc | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-)
meta-oe/recipes-devtools/php/php.inc +8 -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 = "r4" +INC_PR = "r5" SRC_URI = "http://www.php.net/distributions/php-${PV}.tar.bz2"
@@ -19,8 +19,8 @@ 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-fpm \ +EXTRA_OECONF = "--enable-mbstring --enable-wddx \ + --enable-magic-quotes --enable-cgi \ --with-imap=${STAGING_DIR_HOST} \ --with-gettext=${STAGING_LIBDIR}/.. \ --with-imap-ssl=${STAGING_DIR_HOST} \
@@ -30,7 +30,7 @@ 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-sqlite3=${STAGING_LIBDIR}/.. --enable-sqlite-utf8 \ --with-pdo-mysql="${STAGING_BINDIR_CROSS}/mysql_config" \ --with-pdo-sqlite=${STAGING_LIBDIR}/.. ${COMMON_EXTRA_OECONF} \ "
@@ -63,6 +63,10 @@ do_install_append_pn-php-native() { # fixme do_install_append_pn-php() { + # reconfigure to build php-fpm + oe_runconf --enable-fpm + oe_runmake 'INSTALL_ROOT=${D}' install + install -d ${D}/${sysconfdir}/ mv ${D}/${STAGING_DIR_NATIVE}/${sysconfdir}/* ${D}/${sysconfdir}/ rm -rf ${D}/${TMPDIR}
Signature · 1 line
1.7.11.7