From c467c5d609db3687cc3639849c287ff38c587dfe Mon Sep 17 00:00:00 2001 From: Changqing Li Date: Fri, 21 Sep 2018 14:15:51 +0800 Subject: php: Upgrade 7.2.9 -< 7.2.10 1. Upgrade 7.2.9 -> 7.2.10 2. php 5.x not support valgrind config, so move it to php_7.x.bb Signed-off-by: Changqing Li Signed-off-by: Khem Raj --- meta-oe/recipes-devtools/php/php.inc | 1 - meta-oe/recipes-devtools/php/php_7.2.10.bb | 25 +++++++++++++++++++++++++ meta-oe/recipes-devtools/php/php_7.2.9.bb | 24 ------------------------ 3 files changed, 25 insertions(+), 25 deletions(-) create mode 100644 meta-oe/recipes-devtools/php/php_7.2.10.bb delete mode 100644 meta-oe/recipes-devtools/php/php_7.2.9.bb (limited to 'meta-oe/recipes-devtools/php') diff --git a/meta-oe/recipes-devtools/php/php.inc b/meta-oe/recipes-devtools/php/php.inc index 65dfd2d896..9eacabe03e 100644 --- a/meta-oe/recipes-devtools/php/php.inc +++ b/meta-oe/recipes-devtools/php/php.inc @@ -92,7 +92,6 @@ 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" diff --git a/meta-oe/recipes-devtools/php/php_7.2.10.bb b/meta-oe/recipes-devtools/php/php_7.2.10.bb new file mode 100644 index 0000000000..8dc64bb89b --- /dev/null +++ b/meta-oe/recipes-devtools/php/php_7.2.10.bb @@ -0,0 +1,25 @@ +require php.inc + +LIC_FILES_CHKSUM = "file://LICENSE;md5=67e369bc8d1f2e641236b8002039a6a2" + +SRC_URI += "file://change-AC_TRY_RUN-to-AC_TRY_LINK.patch \ + file://0001-acinclude.m4-skip-binconfig-check-for-libxml.patch \ + file://0001-fix-error-caused-by-a-new-variable-is-declared-after.patch \ + file://CVE-2017-9120.patch \ + " +SRC_URI_append_class-target = " \ + file://pear-makefile.patch \ + file://phar-makefile.patch \ + file://0001-opcache-config.m4-enable-opcache.patch \ + " + +SRC_URI[md5sum] = "0ce8ff615bfb9de7a89bab8d742c11c0" +SRC_URI[sha256sum] = "01b6129a0921a1636b07da9bc598a876669e45a462cef4b5844fc26862dbda9d" + +PACKAGECONFIG[mysql] = "--with-mysqli=${STAGING_BINDIR_CROSS}/mysql_config \ + --with-pdo-mysql=${STAGING_BINDIR_CROSS}/mysql_config \ + ,--without-mysqli --without-pdo-mysql \ + ,mysql5" +PACKAGECONFIG[valgrind] = "--with-valgrind=${STAGING_DIR_TARGET}/usr,--with-valgrind=no,valgrind" + +FILES_${PN}-fpm += "${sysconfdir}/php-fpm.d/www.conf.default" diff --git a/meta-oe/recipes-devtools/php/php_7.2.9.bb b/meta-oe/recipes-devtools/php/php_7.2.9.bb deleted file mode 100644 index a5d5afecf3..0000000000 --- a/meta-oe/recipes-devtools/php/php_7.2.9.bb +++ /dev/null @@ -1,24 +0,0 @@ -require php.inc - -LIC_FILES_CHKSUM = "file://LICENSE;md5=67e369bc8d1f2e641236b8002039a6a2" - -SRC_URI += "file://change-AC_TRY_RUN-to-AC_TRY_LINK.patch \ - file://0001-acinclude.m4-skip-binconfig-check-for-libxml.patch \ - file://0001-fix-error-caused-by-a-new-variable-is-declared-after.patch \ - file://CVE-2017-9120.patch \ - " -SRC_URI_append_class-target = " \ - file://pear-makefile.patch \ - file://phar-makefile.patch \ - file://0001-opcache-config.m4-enable-opcache.patch \ - " - -SRC_URI[md5sum] = "175023bc43fd8f883e60849a02a03b93" -SRC_URI[sha256sum] = "e9e3aaa6c317b7fea78246a758b017544366049d2789ad5a44fe9398464c53a8" - -PACKAGECONFIG[mysql] = "--with-mysqli=${STAGING_BINDIR_CROSS}/mysql_config \ - --with-pdo-mysql=${STAGING_BINDIR_CROSS}/mysql_config \ - ,--without-mysqli --without-pdo-mysql \ - ,mysql5" - -FILES_${PN}-fpm += "${sysconfdir}/php-fpm.d/www.conf.default" -- cgit 1.2.3-korg