aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2014-12-31 11:17:31 +0000
committerMartin Jansa <Martin.Jansa@gmail.com>2015-01-08 12:04:25 +0100
commit2b30fc6fe906d525b703e999138fcb9a0da150db (patch)
treef1415a372f7371cec5ee82db8636e10023192d60
parentfc7132ede27ac67669448d3d2845ce7d46c6a1ee (diff)
downloadmeta-openembedded-contrib-2b30fc6fe906d525b703e999138fcb9a0da150db.tar.gz
meta-openembedded-contrib-2b30fc6fe906d525b703e999138fcb9a0da150db.tar.bz2
meta-openembedded-contrib-2b30fc6fe906d525b703e999138fcb9a0da150db.zip
php: upgrade to 5.5.15
Based on the corresponding changes to the modphp recipe in meta-webserver. From the commit message for the modphp upgrade: * LIC_FILES_CHKSUM needed to change because the copyright year changed * Enabled mcrypt since upstream recommend this for acceptable performance * Disabled the opcache; this is a new feature in 5.5 and the configure check for it currently breaks when cross-compiling. Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
-rw-r--r--meta-oe/recipes-devtools/php/php_5.5.15.bb (renamed from meta-oe/recipes-devtools/php/php_5.4.33.bb)11
1 files changed, 6 insertions, 5 deletions
diff --git a/meta-oe/recipes-devtools/php/php_5.4.33.bb b/meta-oe/recipes-devtools/php/php_5.5.15.bb
index 6fdfe0f07a..ff81aee822 100644
--- a/meta-oe/recipes-devtools/php/php_5.4.33.bb
+++ b/meta-oe/recipes-devtools/php/php_5.5.15.bb
@@ -3,11 +3,11 @@ HOMEPAGE = "http://www.php.net"
SECTION = "console/network"
LICENSE = "PHP-3.0"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=cb564efdf78cce8ea6e4b5a4f7c05d97"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=52dd90569008fee5bcdbb22d945b1108"
BBCLASSEXTEND = "native"
DEPENDS = "zlib libxml2 virtual/libiconv php-native lemon-native \
- libc-client openssl"
+ libc-client openssl libmcrypt"
DEPENDS_virtclass-native = "zlib-native libxml2-native"
# The new PHP downloads server groups PHP releases by major version so find
@@ -30,8 +30,8 @@ SRC_URI_append_class-target += " \
file://php-fpm-apache.conf \
"
-SRC_URI[md5sum] = "c6878bb1cdb46bfc1e1a5cd67a024737"
-SRC_URI[sha256sum] = "1a75b2d0835e74b8886cd3980d9598a0e06691441bb7f91d19b74c2278e40bb5"
+SRC_URI[md5sum] = "5cb5f2ed9099299f8a4c952d59d93812"
+SRC_URI[sha256sum] = "00f24226b12fee27e332383b6304f1b9ed3f4d9173dd728a68c5c3f5a59b8ba7"
S = "${WORKDIR}/php-${PV}"
@@ -40,7 +40,7 @@ inherit autotools pkgconfig pythonnative gettext
SSTATE_SCAN_FILES += "build-defs.h"
# Common EXTRA_OECONF
-COMMON_EXTRA_OECONF = "--enable-sockets --enable-pcntl --enable-shared"
+COMMON_EXTRA_OECONF = "--enable-sockets --enable-pcntl --enable-shared --disable-opcache"
EXTRA_OECONF = "--enable-mbstring \
--enable-wddx \
--enable-fpm \
@@ -49,6 +49,7 @@ EXTRA_OECONF = "--enable-mbstring \
--with-imap-ssl=${STAGING_DIR_HOST} \
--with-zlib=${STAGING_LIBDIR}/.. \
--with-iconv=${STAGING_LIBDIR}/.. \
+ --with-mcrypt=${STAGING_DIR_TARGET}${exec_prefix} \
${COMMON_EXTRA_OECONF} \
"
EXTRA_OECONF_virtclass-native = " \