diff options
author | Paul Eggleton <paul.eggleton@linux.intel.com> | 2013-08-19 14:46:59 +0100 |
---|---|---|
committer | Paul Eggleton <paul.eggleton@linux.intel.com> | 2013-08-27 16:39:31 +0100 |
commit | 128283fee4a3bf82c5116cf7371312e1461d1fcf (patch) | |
tree | ea92e30604a656268d59db364ba0a429541fd4f4 /meta-webserver/recipes-php | |
parent | e25a025f9ed15f37c114e84484df3d77d392c09a (diff) | |
download | meta-openembedded-128283fee4a3bf82c5116cf7371312e1461d1fcf.tar.gz |
modphp: update to 5.5.2
* LIC_FILES_CHKSUM needed to change because the copyright year changed
* Enabled mcrypt since upstream recommend this for acceptable
performance (and we now have a libmcrypt recipe in meta-oe)
* 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>
Diffstat (limited to 'meta-webserver/recipes-php')
-rw-r--r-- | meta-webserver/recipes-php/modphp/modphp5.inc | 5 | ||||
-rw-r--r-- | meta-webserver/recipes-php/modphp/modphp_5.4.15.bb | 4 | ||||
-rw-r--r-- | meta-webserver/recipes-php/modphp/modphp_5.5.2.bb | 7 |
3 files changed, 10 insertions, 6 deletions
diff --git a/meta-webserver/recipes-php/modphp/modphp5.inc b/meta-webserver/recipes-php/modphp/modphp5.inc index 192abd799..19f1be9cd 100644 --- a/meta-webserver/recipes-php/modphp/modphp5.inc +++ b/meta-webserver/recipes-php/modphp/modphp5.inc | |||
@@ -1,8 +1,8 @@ | |||
1 | SECTION = "console/network" | 1 | SECTION = "console/network" |
2 | DESCRIPTION = "A server-side, HTML-embedded scripting language. This package provides the apache php module." | 2 | DESCRIPTION = "A server-side, HTML-embedded scripting language. This package provides the apache php module." |
3 | LICENSE = "PHP-3.0" | 3 | LICENSE = "PHP-3.0" |
4 | DEPENDS = "apache2-native apache2 zlib bzip2" | ||
5 | INC_PR = "r1" | 4 | INC_PR = "r1" |
5 | DEPENDS = "apache2-native apache2 zlib bzip2 libmcrypt" | ||
6 | 6 | ||
7 | SRC_URI = "http://www.php.net/distributions/php-${PV}.tar.bz2 \ | 7 | SRC_URI = "http://www.php.net/distributions/php-${PV}.tar.bz2 \ |
8 | file://configure.patch \ | 8 | file://configure.patch \ |
@@ -12,7 +12,7 @@ SRC_URI = "http://www.php.net/distributions/php-${PV}.tar.bz2 \ | |||
12 | 12 | ||
13 | S = "${WORKDIR}/php-${PV}" | 13 | S = "${WORKDIR}/php-${PV}" |
14 | 14 | ||
15 | LIC_FILES_CHKSUM = "file://LICENSE;md5=cb564efdf78cce8ea6e4b5a4f7c05d97" | 15 | LIC_FILES_CHKSUM = "file://LICENSE;md5=5bb09683f8f09b15b7076f4b4c31d61f" |
16 | 16 | ||
17 | inherit autotools | 17 | inherit autotools |
18 | 18 | ||
@@ -39,6 +39,7 @@ EXTRA_OECONF = "--with-apxs2=${STAGING_BINDIR_CROSS}/apxs \ | |||
39 | --libdir=${libdir}/php5 \ | 39 | --libdir=${libdir}/php5 \ |
40 | --with-zlib --with-zlib-dir=${STAGING_DIR_TARGET}${exec_prefix} \ | 40 | --with-zlib --with-zlib-dir=${STAGING_DIR_TARGET}${exec_prefix} \ |
41 | --with-bz2=${STAGING_DIR_TARGET}${exec_prefix} \ | 41 | --with-bz2=${STAGING_DIR_TARGET}${exec_prefix} \ |
42 | --with-mcrypt=${STAGING_DIR_TARGET}${exec_prefix} \ | ||
42 | --enable-zip \ | 43 | --enable-zip \ |
43 | --enable-mbstring \ | 44 | --enable-mbstring \ |
44 | --with-config-file-path=${sysconfdir}/php/apache2-php5" | 45 | --with-config-file-path=${sysconfdir}/php/apache2-php5" |
diff --git a/meta-webserver/recipes-php/modphp/modphp_5.4.15.bb b/meta-webserver/recipes-php/modphp/modphp_5.4.15.bb deleted file mode 100644 index 7d90dc893..000000000 --- a/meta-webserver/recipes-php/modphp/modphp_5.4.15.bb +++ /dev/null | |||
@@ -1,4 +0,0 @@ | |||
1 | include modphp5.inc | ||
2 | |||
3 | SRC_URI[md5sum] = "145ea5e845e910443ff1eddb3dbcf56a" | ||
4 | SRC_URI[sha256sum] = "2d2285da48ccd2db311b2608fdfafd18b363a9f7e3796d53dd53e5b6752a0136" | ||
diff --git a/meta-webserver/recipes-php/modphp/modphp_5.5.2.bb b/meta-webserver/recipes-php/modphp/modphp_5.5.2.bb new file mode 100644 index 000000000..3c2324279 --- /dev/null +++ b/meta-webserver/recipes-php/modphp/modphp_5.5.2.bb | |||
@@ -0,0 +1,7 @@ | |||
1 | include modphp5.inc | ||
2 | |||
3 | EXTRA_OECONF += "--disable-opcache" | ||
4 | |||
5 | SRC_URI[md5sum] = "caf7f4d86514a568fb3c8021b096a9f0" | ||
6 | SRC_URI[sha256sum] = "e72aaf1fa96eac0bff127bfc74c174d1de50cd3f66d7e0e1ee919674ab463bb7" | ||
7 | |||