diff options
| author | Changqing Li <changqing.li@windriver.com> | 2018-09-21 14:15:51 +0800 |
|---|---|---|
| committer | Khem Raj <raj.khem@gmail.com> | 2018-09-24 11:49:45 -0700 |
| commit | c467c5d609db3687cc3639849c287ff38c587dfe (patch) | |
| tree | 9892b13dbda4fd3235a5481c767399d52e6b5531 | |
| parent | 5c523902e51b50fd036240e95c0ba061002d9cfd (diff) | |
| download | meta-openembedded-c467c5d609db3687cc3639849c287ff38c587dfe.tar.gz | |
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 <changqing.li@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
| -rw-r--r-- | meta-oe/recipes-devtools/php/php.inc | 1 | ||||
| -rw-r--r-- | meta-oe/recipes-devtools/php/php_7.2.10.bb (renamed from meta-oe/recipes-devtools/php/php_7.2.9.bb) | 5 |
2 files changed, 3 insertions, 3 deletions
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} \ | |||
| 92 | PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6," | 92 | PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6," |
| 93 | PACKAGECONFIG[opcache] = "--enable-opcache,--disable-opcache" | 93 | PACKAGECONFIG[opcache] = "--enable-opcache,--disable-opcache" |
| 94 | PACKAGECONFIG[openssl] = "--with-openssl,--without-openssl,openssl" | 94 | PACKAGECONFIG[openssl] = "--with-openssl,--without-openssl,openssl" |
| 95 | PACKAGECONFIG[valgrind] = "--with-valgrind=${STAGING_DIR_TARGET}/usr,--with-valgrind=no,valgrind" | ||
| 96 | 95 | ||
| 97 | export PHP_NATIVE_DIR = "${STAGING_BINDIR_NATIVE}" | 96 | export PHP_NATIVE_DIR = "${STAGING_BINDIR_NATIVE}" |
| 98 | export PHP_PEAR_PHP_BIN = "${STAGING_BINDIR_NATIVE}/php" | 97 | export PHP_PEAR_PHP_BIN = "${STAGING_BINDIR_NATIVE}/php" |
diff --git a/meta-oe/recipes-devtools/php/php_7.2.9.bb b/meta-oe/recipes-devtools/php/php_7.2.10.bb index a5d5afecf3..8dc64bb89b 100644 --- a/meta-oe/recipes-devtools/php/php_7.2.9.bb +++ b/meta-oe/recipes-devtools/php/php_7.2.10.bb | |||
| @@ -13,12 +13,13 @@ SRC_URI_append_class-target = " \ | |||
| 13 | file://0001-opcache-config.m4-enable-opcache.patch \ | 13 | file://0001-opcache-config.m4-enable-opcache.patch \ |
| 14 | " | 14 | " |
| 15 | 15 | ||
| 16 | SRC_URI[md5sum] = "175023bc43fd8f883e60849a02a03b93" | 16 | SRC_URI[md5sum] = "0ce8ff615bfb9de7a89bab8d742c11c0" |
| 17 | SRC_URI[sha256sum] = "e9e3aaa6c317b7fea78246a758b017544366049d2789ad5a44fe9398464c53a8" | 17 | SRC_URI[sha256sum] = "01b6129a0921a1636b07da9bc598a876669e45a462cef4b5844fc26862dbda9d" |
| 18 | 18 | ||
| 19 | PACKAGECONFIG[mysql] = "--with-mysqli=${STAGING_BINDIR_CROSS}/mysql_config \ | 19 | PACKAGECONFIG[mysql] = "--with-mysqli=${STAGING_BINDIR_CROSS}/mysql_config \ |
| 20 | --with-pdo-mysql=${STAGING_BINDIR_CROSS}/mysql_config \ | 20 | --with-pdo-mysql=${STAGING_BINDIR_CROSS}/mysql_config \ |
| 21 | ,--without-mysqli --without-pdo-mysql \ | 21 | ,--without-mysqli --without-pdo-mysql \ |
| 22 | ,mysql5" | 22 | ,mysql5" |
| 23 | PACKAGECONFIG[valgrind] = "--with-valgrind=${STAGING_DIR_TARGET}/usr,--with-valgrind=no,valgrind" | ||
| 23 | 24 | ||
| 24 | FILES_${PN}-fpm += "${sysconfdir}/php-fpm.d/www.conf.default" | 25 | FILES_${PN}-fpm += "${sysconfdir}/php-fpm.d/www.conf.default" |