diff options
Diffstat (limited to 'import-layers/meta-openembedded/meta-oe/recipes-devtools/php/php.inc')
-rw-r--r-- | import-layers/meta-openembedded/meta-oe/recipes-devtools/php/php.inc | 37 |
1 files changed, 12 insertions, 25 deletions
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-devtools/php/php.inc b/import-layers/meta-openembedded/meta-oe/recipes-devtools/php/php.inc index 283d630f63..066b97cd26 100644 --- a/import-layers/meta-openembedded/meta-oe/recipes-devtools/php/php.inc +++ b/import-layers/meta-openembedded/meta-oe/recipes-devtools/php/php.inc @@ -6,26 +6,22 @@ LICENSE = "PHP-3.0" BBCLASSEXTEND = "native" DEPENDS = "zlib bzip2 libxml2 virtual/libiconv php-native lemon-native \ - openssl libmcrypt" + openssl" DEPENDS_class-native = "zlib-native libxml2-native" PHP_MAJOR_VERSION = "${@d.getVar('PV', True).split('.')[0]}" SRC_URI = "http://php.net/distributions/php-${PV}.tar.bz2 \ - file://acinclude-xml2-config.patch \ file://0001-php-don-t-use-broken-wrapper-for-mkdir.patch \ - file://0001-acinclude-use-pkgconfig-for-libxml2-config.patch \ " SRC_URI_append_class-target = " \ file://iconv.patch \ file://imap-fix-autofoo.patch \ - file://pear-makefile.patch \ - file://phar-makefile.patch \ file://php_exec_native.patch \ file://php-fpm.conf \ file://php-fpm-apache.conf \ - file://configure.patch \ + file://0001-acinclude.m4-don-t-unset-cache-variables.patch \ file://70_mod_php${PHP_MAJOR_VERSION}.conf \ file://php-fpm.service \ " @@ -44,7 +40,6 @@ PHP_LIBDIR = "${libdir}/php${PHP_MAJOR_VERSION}" COMMON_EXTRA_OECONF = "--enable-sockets \ --enable-pcntl \ --enable-shared \ - --disable-opcache \ --disable-rpath \ --with-pic \ --libdir=${PHP_LIBDIR} \ @@ -57,20 +52,22 @@ EXTRA_OECONF = "--enable-mbstring \ --with-gettext=${STAGING_LIBDIR}/.. \ --with-zlib=${STAGING_LIBDIR}/.. \ --with-iconv=${STAGING_LIBDIR}/.. \ - --with-mcrypt=${STAGING_DIR_TARGET}${exec_prefix} \ --with-bz2=${STAGING_DIR_TARGET}${exec_prefix} \ --with-config-file-path=${sysconfdir}/php/apache2-php${PHP_MAJOR_VERSION} \ - ${@base_conditional('SITEINFO_ENDIANNESS', 'le', 'ac_cv_c_bigendian_php=no', 'ac_cv_c_bigendian_php=yes', d)} \ + ${@oe.utils.conditional('SITEINFO_ENDIANNESS', 'le', 'ac_cv_c_bigendian_php=no', 'ac_cv_c_bigendian_php=yes', d)} \ ${@bb.utils.contains('PACKAGECONFIG', 'pam', '', 'ac_cv_lib_pam_pam_start=no', d)} \ ${COMMON_EXTRA_OECONF} \ " + +CACHED_CONFIGUREVARS += "ac_cv_func_dlopen=yes ac_cv_lib_dl_dlopen=yes" + EXTRA_OECONF_class-native = " \ --with-zlib=${STAGING_LIBDIR_NATIVE}/.. \ --without-iconv \ ${COMMON_EXTRA_OECONF} \ " -PACKAGECONFIG ??= "mysql sqlite3 imap \ +PACKAGECONFIG ??= "mysql sqlite3 imap opcache \ ${@bb.utils.filter('DISTRO_FEATURES', 'ipv6 pam', d)} \ " PACKAGECONFIG_class-native = "" @@ -94,7 +91,7 @@ PACKAGECONFIG[imap] = "--with-imap=${STAGING_DIR_HOST} \ ,--without-imap --without-imap-ssl \ ,uw-imap" PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6," - +PACKAGECONFIG[opcache] = ",--disable-opcache" export PHP_NATIVE_DIR = "${STAGING_BINDIR_NATIVE}" export PHP_PEAR_PHP_BIN = "${STAGING_BINDIR_NATIVE}/php" @@ -201,14 +198,14 @@ php_sysroot_preprocess () { MODPHP_PACKAGE = "${@bb.utils.contains('PACKAGECONFIG', 'apache2', '${PN}-modphp', '', d)}" -PACKAGES = "${PN}-dbg ${PN}-cli ${PN}-cgi ${PN}-fpm ${PN}-fpm-apache2 ${PN}-pear ${PN}-phar ${MODPHP_PACKAGE} ${PN}-dev ${PN}-staticdev ${PN}-doc ${PN}" +PACKAGES = "${PN}-dbg ${PN}-cli ${PN}-cgi ${PN}-fpm ${PN}-fpm-apache2 ${PN}-pear ${PN}-phar ${MODPHP_PACKAGE} ${PN}-dev ${PN}-staticdev ${PN}-doc ${PN}-opcache ${PN}" RDEPENDS_${PN} += "libgcc" RDEPENDS_${PN}-pear = "${PN}" RDEPENDS_${PN}-phar = "${PN}-cli" RDEPENDS_${PN}-cli = "${PN}" RDEPENDS_${PN}-modphp = "${PN} apache2" -RDEPENDS_${PN}-dev = "${PN}" +RDEPENDS_${PN}-opcache = "${PN}" INITSCRIPT_PACKAGES = "${PN}-fpm" inherit update-rc.d @@ -237,6 +234,8 @@ FILES_${PN}-dev = "${includedir}/php ${PHP_LIBDIR}/build ${bindir}/phpize \ ${bindir}/php-config ${PHP_LIBDIR}/php/.depdb \ ${PHP_LIBDIR}/php/.depdblock ${PHP_LIBDIR}/php/.filemap \ ${PHP_LIBDIR}/php/.lock ${PHP_LIBDIR}/php/test" +FILES_${PN}-staticdev += "${PHP_LIBDIR}/extensions/*/*.a" +FILES_${PN}-opcache = "${PHP_LIBDIR}/extensions/*/opcache${SOLIBSDEV}" FILES_${PN} = "${PHP_LIBDIR}/php" FILES_${PN} += "${bindir}" @@ -253,18 +252,6 @@ do_install_append_class-native() { PHP_PEAR_SYSCONF_DIR=${sysconfdir}/ } -SSTATEPOSTINSTFUNCS_append_class-native = " php_sstate_postinst " - -php_sstate_postinst() { - if [ "${BB_CURRENTTASK}" = "populate_sysroot_setscene" ] - then - head -n1 ${sysconfdir}/pear.conf > ${sysconfdir}/pear.tmp.conf - for p in `tail -n1 ${sysconfdir}/pear.conf | sed -s 's/;/ /g'`; do - echo $p | awk -F: 'BEGIN {OFS = ":"; ORS = ";"}{if(NF==3){print $1, length($3)-2*match($3, /^"/), $3} else {print $0}}'; - done >> ${sysconfdir}/pear.tmp.conf - mv -f ${sysconfdir}/pear.tmp.conf ${sysconfdir}/pear.conf - fi -} # Fails to build with thumb-1 (qemuarm) # | {standard input}: Assembler messages: |