meta-openembedded: subtree update:ce51958eca..a2928764c2

Adrian Bunk (3):
      python3-cmd2: Remove PNBLACKLIST
      php: Remove no longer needed CFLAGS_append_aarch64
      php: Move more into php.inc after php5 removal

Alistair Francis (4):
      python3-requests-future: Initial commit of 0.9.5
      python3-xmlrunner: Initial commit of 1.7.7
      python3-fasteners: Initial commit of 0.15
      python3-python-vlc: Initial commit of 3.0.7110

Anuj Mittal (3):
      python3-defusedxml: add recipe
      python-networkx: upgrade 2.1 -> 2.2
      python3-networkx: add recipe

Khem Raj (9):
      php: Turn PCRE JIT off for riscv
      redis: Fix build with clang/x86
      android-tools: Recognise i686 for HOST_ARCH
      netdata: Update to 1.17.0 and fix build with clang/x86
      safec: Define _GNU_SOURCE
      safec: Upgrade to 3.5 release
      openocd: Add --disable-werror always
      breakpad: Update dont-clobber-rsp patch to latest
      gparted: add to deps instead of overwriting

Martin Jansa (3):
      remmina: add distro_features_check for GTK3DISTROFEATURES
      ceres-solver: fix the paths in .cmake files
      ceres-solver: add PACKAGECONFIG for suitesparse and lapack

Naveen Saini (1):
      pm-graph: upgrade 5.3 -> 5.5

Oleksandr Kravchuk (1):
      analyze-suspend: update to 5.5

Peter Kjellerstedt (1):
      lvm2/libdevmapper: Make it build for native

Randy MacLeod (1):
      poppler: update from 0.79.0 to 0.80.0

Slater, Joseph (1):
      openhpi: control snmp-bc ptest generation

Stefan Agner (1):
      fuse3: add libfuse3 recipe

Trevor Gamblin (1):
      gvfs: upgrade 1.40.2 -> 1.41.2 for CVE fixes

Yi Zhao (2):
      php: fix module path in mod_php.conf
      apache-websocket: fix module path

Yuan Chao (2):
      python-atomicwrites: new recipe
      python-pytest: fix runtime error

Zang Ruochen (1):
      python-certifi: upgrade 2019.6.16 -> 2019.9.11

Change-Id: Iba065b25686a1ac22d647226d9ea0c61c5b4578f
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>

1 files changed, 9 insertions, 7 deletions

diff --git a/meta-openembedded/meta-oe/recipes-devtools/php/php.inc b/meta-openembedded/meta-oe/recipes-devtools/php/php.inc
index d738d2d93..3d537e5b6 100644
--- a/meta-openembedded/meta-oe/recipes-devtools/php/php.inc
+++ b/meta-openembedded/meta-oe/recipes-devtools/php/php.inc
@@ -56,6 +56,9 @@ EXTRA_OECONF = "--enable-mbstring \
                 ${COMMON_EXTRA_OECONF} \
 "
 
+EXTRA_OECONF_append_riscv64 = " --with-pcre-jit=no"
+EXTRA_OECONF_append_riscv32 = " --with-pcre-jit=no"
+
 CACHED_CONFIGUREVARS += "ac_cv_func_dlopen=no ac_cv_lib_dl_dlopen=yes"
 
 EXTRA_OECONF_class-native = " \
@@ -71,10 +74,9 @@ PACKAGECONFIG_class-native = ""
 
 PACKAGECONFIG[zip] = "--enable-zip --with-libzip=${STAGING_EXECPREFIXDIR},,libzip"
 
-PACKAGECONFIG[mysql] = "--with-mysql=${STAGING_DIR_TARGET}${prefix} \
-                        --with-mysqli=${STAGING_BINDIR_CROSS}/mysql_config \
-                        --with-pdo-mysql=${STAGING_BINDIR_CROSS}/mysql_config \
-                        ,--without-mysql --without-mysqli --without-pdo-mysql \
+PACKAGECONFIG[mysql] = "--with-mysqli=mysqlnd \
+                        --with-pdo-mysql=mysqlnd \
+                        ,--without-mysqli --without-pdo-mysql \
                         ,mysql5"
 
 PACKAGECONFIG[sqlite3] = "--with-sqlite3=${STAGING_LIBDIR}/.. \
@@ -92,11 +94,11 @@ PACKAGECONFIG[imap] = "--with-imap=${STAGING_DIR_HOST} \
 PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6,"
 PACKAGECONFIG[opcache] = "--enable-opcache,--disable-opcache"
 PACKAGECONFIG[openssl] = "--with-openssl,--without-openssl,openssl"
+PACKAGECONFIG[valgrind] = "--with-valgrind=${STAGING_DIR_TARGET}/usr,--with-valgrind=no,valgrind"
 
 export PHP_NATIVE_DIR = "${STAGING_BINDIR_NATIVE}"
 export PHP_PEAR_PHP_BIN = "${STAGING_BINDIR_NATIVE}/php"
 CFLAGS += " -D_GNU_SOURCE -g -DPTYS_ARE_GETPT -DPTYS_ARE_SEARCHED -I${STAGING_INCDIR}/apache2"
-CFLAGS_append_aarch64 = " -O2"
 
 EXTRA_OEMAKE = "INSTALL_ROOT=${D}"
 
@@ -175,7 +177,7 @@ do_install_append_class-target() {
         install -d ${D}${sysconfdir}/apache2/modules.d
         install -d ${D}${sysconfdir}/php/apache2-php${PHP_MAJOR_VERSION}
         install -m 644  ${WORKDIR}/70_mod_php${PHP_MAJOR_VERSION}.conf ${D}${sysconfdir}/apache2/modules.d
-        sed -i s,lib/,${libdir}/, ${D}${sysconfdir}/apache2/modules.d/70_mod_php${PHP_MAJOR_VERSION}.conf
+        sed -i s,lib/,${libexecdir}/, ${D}${sysconfdir}/apache2/modules.d/70_mod_php${PHP_MAJOR_VERSION}.conf
         cat ${S}/php.ini-production | \
             sed -e 's,extension_dir = \"\./\",extension_dir = \"/usr/lib/extensions\",' \
             > ${D}${sysconfdir}/php/apache2-php${PHP_MAJOR_VERSION}/php.ini
@@ -214,7 +216,7 @@ FILES_${PN}-doc += "${PHP_LIBDIR}/php/doc"
 FILES_${PN}-cli = "${bindir}/php"
 FILES_${PN}-phar = "${bindir}/phar*"
 FILES_${PN}-cgi = "${bindir}/php-cgi"
-FILES_${PN}-fpm = "${sbindir}/php-fpm ${sysconfdir}/php-fpm.conf ${datadir}/fpm ${sysconfdir}/init.d/php-fpm ${systemd_unitdir}/system/php-fpm.service"
+FILES_${PN}-fpm = "${sbindir}/php-fpm ${sysconfdir}/php-fpm.conf ${datadir}/fpm ${sysconfdir}/init.d/php-fpm ${systemd_unitdir}/system/php-fpm.service ${sysconfdir}/php-fpm.d/www.conf.default"
 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"