summaryrefslogtreecommitdiffstats
path: root/meta-oe/recipes-devtools/php/php.inc
diff options
context:
space:
mode:
authorAnuj Mittal <anuj.mittal@intel.com>2018-04-03 17:50:13 +0800
committerArmin Kuster <akuster808@gmail.com>2018-04-08 17:00:06 -0700
commit2768c1deb3e3e8ad96c0f251fd44d76c5b044159 (patch)
tree4678d8f415af8d4076285c9b30e790ceee8467bb /meta-oe/recipes-devtools/php/php.inc
parent08c5797ccb39ace8d53a43d3c706a0fb80415daa (diff)
downloadmeta-openembedded-2768c1deb3e3e8ad96c0f251fd44d76c5b044159.tar.gz
php7: upgrade to 7.2.4
* For changes, see: http://www.php.net/ChangeLog-7.php#7.2.4 * Remove patches as they've been upstreamed: - 0001-Specify-tag-with-libtool.patch - CVE-2017-16642.patch - CVE-2018-5711.patch * mcrypt module has been deprecated and as such dependency has been moved from php.inc to php5 recipe. * Refresh patches to avoid fuzz warnings. * New patches to: - Make sure libxml is detected using pkg-config instead of binconfig. - Fix link time warnings (backport, see patch for details) * Move the following patches to php5 from inc as they were getting applied out of context: - acinclude-xml2-config.patch - 0001-acinclude-use-pkgconfig-for-libxml2-config.patch License-Update: License is same, just a change in copyright year to 2018. Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> Signed-off-by: Armin Kuster <akuster808@gmail.com>
Diffstat (limited to 'meta-oe/recipes-devtools/php/php.inc')
-rw-r--r--meta-oe/recipes-devtools/php/php.inc5
1 files changed, 1 insertions, 4 deletions
diff --git a/meta-oe/recipes-devtools/php/php.inc b/meta-oe/recipes-devtools/php/php.inc
index 8394c4f647..d2af4f6195 100644
--- a/meta-oe/recipes-devtools/php/php.inc
+++ b/meta-oe/recipes-devtools/php/php.inc
@@ -6,15 +6,13 @@ LICENSE = "PHP-3.0"
6 6
7BBCLASSEXTEND = "native" 7BBCLASSEXTEND = "native"
8DEPENDS = "zlib bzip2 libxml2 virtual/libiconv php-native lemon-native \ 8DEPENDS = "zlib bzip2 libxml2 virtual/libiconv php-native lemon-native \
9 openssl libmcrypt" 9 openssl"
10DEPENDS_class-native = "zlib-native libxml2-native" 10DEPENDS_class-native = "zlib-native libxml2-native"
11 11
12PHP_MAJOR_VERSION = "${@d.getVar('PV', True).split('.')[0]}" 12PHP_MAJOR_VERSION = "${@d.getVar('PV', True).split('.')[0]}"
13 13
14SRC_URI = "http://php.net/distributions/php-${PV}.tar.bz2 \ 14SRC_URI = "http://php.net/distributions/php-${PV}.tar.bz2 \
15 file://acinclude-xml2-config.patch \
16 file://0001-php-don-t-use-broken-wrapper-for-mkdir.patch \ 15 file://0001-php-don-t-use-broken-wrapper-for-mkdir.patch \
17 file://0001-acinclude-use-pkgconfig-for-libxml2-config.patch \
18 " 16 "
19 17
20SRC_URI_append_class-target = " \ 18SRC_URI_append_class-target = " \
@@ -57,7 +55,6 @@ EXTRA_OECONF = "--enable-mbstring \
57 --with-gettext=${STAGING_LIBDIR}/.. \ 55 --with-gettext=${STAGING_LIBDIR}/.. \
58 --with-zlib=${STAGING_LIBDIR}/.. \ 56 --with-zlib=${STAGING_LIBDIR}/.. \
59 --with-iconv=${STAGING_LIBDIR}/.. \ 57 --with-iconv=${STAGING_LIBDIR}/.. \
60 --with-mcrypt=${STAGING_DIR_TARGET}${exec_prefix} \
61 --with-bz2=${STAGING_DIR_TARGET}${exec_prefix} \ 58 --with-bz2=${STAGING_DIR_TARGET}${exec_prefix} \
62 --with-config-file-path=${sysconfdir}/php/apache2-php${PHP_MAJOR_VERSION} \ 59 --with-config-file-path=${sysconfdir}/php/apache2-php${PHP_MAJOR_VERSION} \
63 ${@oe.utils.conditional('SITEINFO_ENDIANNESS', 'le', 'ac_cv_c_bigendian_php=no', 'ac_cv_c_bigendian_php=yes', d)} \ 60 ${@oe.utils.conditional('SITEINFO_ENDIANNESS', 'le', 'ac_cv_c_bigendian_php=no', 'ac_cv_c_bigendian_php=yes', d)} \