helium-3rd-party/meta-openembedded
1
0
Fork 0
mirror of git://git.openembedded.org/meta-openembedded synced 2026-05-18 22:30:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

php: Add 7.1.0

Browse Source 
1)Add php_7.1.0.bb
2)Delete php_5.5.38.bb,since it is replaced by php_5.6.26.bb.
3)Move pthread-check-threads-m4.patch out of 7.1.0, since it is integrated upstream.

Signed-off-by: Huang Qiyu <huangqy.fnst@cn.fujitsu.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
This commit is contained in:
Huang Qiyu 2016-12-26 22:39:08 +08:00 committed by Martin Jansa
parent cae9cafb9c
commit c1ad61096e
5 changed files with 73 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
meta-oe/recipes-devtools/php/php-7.1.0/change-AC_TRY_RUN-to-AC_TRY_LINK.patch Normal file
View File

@ -0,0 +1,56 @@
[PATCH] config.m4: change AC_TRY_RUN to AC_TRY_LINK
Upstream-Status: Pending
AC_TRY_RUN is not suitable for cross-compile
Signed-off-by: Roy Li <rongqing.li@windriver.com>
---
ext/fileinfo/config.m4 | 31 ++++++-------------------------
1 file changed, 6 insertions(+), 25 deletions(-)
diff --git a/ext/fileinfo/config.m4 b/ext/fileinfo/config.m4
index 7e98d62..8a8ea0e 100644
--- a/ext/fileinfo/config.m4
+++ b/ext/fileinfo/config.m4
@@ -14,31 +14,12 @@ if test "$PHP_FILEINFO" != "no"; then
libmagic/readcdf.c libmagic/softmagic.c"
AC_MSG_CHECKING([for strcasestr])
- AC_TRY_RUN([
-#include <string.h>
-#include <strings.h>
-#include <stdlib.h>
-
-int main(void)
-{
- char *s0, *s1, *ret;
-
- s0 = (char *) malloc(42);
- s1 = (char *) malloc(8);
-
- memset(s0, 'X', 42);
- s0[24] = 'Y';
- s0[26] = 'Z';
- s0[41] = '\0';
- memset(s1, 'x', 8);
- s1[0] = 'y';
- s1[2] = 'Z';
- s1[7] = '\0';
-
- ret = strcasestr(s0, s1);
-
- return !(NULL != ret);
-}
+ AC_TRY_COMPILE([
+ #include <string.h>
+ #include <strings.h>
+ #include <stdlib.h>
+ ],[
+ strcasestr(NULL, NULL);
],[
dnl using the platform implementation
AC_MSG_RESULT(yes)
--
1.9.1

1
meta-oe/recipes-devtools/php/php.inc
View File

@ -24,7 +24,6 @@ SRC_URI_append_class-target = " \
file://php-fpm.conf \
file://php-fpm-apache.conf \
file://configure.patch \
file://pthread-check-threads-m4.patch \
file://70_mod_php5.conf \
file://php-fpm.service \
"

6
meta-oe/recipes-devtools/php/php_5.5.38.bb
View File

@ -1,6 +0,0 @@
require php.inc
LIC_FILES_CHKSUM = "file://LICENSE;md5=464ca70af214d2407f6b7d4458158afd"
SRC_URI[md5sum] = "312244a0eecad602a1555ed2434e223f"
SRC_URI[sha256sum] = "473c81ebb2e48ca468caee031762266651843d7227c18a824add9b07b9393e38"

4
meta-oe/recipes-devtools/php/php_5.6.26.bb
View File

@ -2,6 +2,8 @@ require php.inc
LIC_FILES_CHKSUM = "file://LICENSE;md5=b602636d46a61c0ac0432bbf5c078fe4"
SRC_URI += "file://change-AC_TRY_RUN-to-AC_TRY_LINK.patch"
SRC_URI += "file://change-AC_TRY_RUN-to-AC_TRY_LINK.patch \
file://pthread-check-threads-m4.patch \
"
SRC_URI[md5sum] = "cb424b705cfb715fc04f499f8a8cf52e"
SRC_URI[sha256sum] = "d47aab8083a4284b905777e1b45dd7735adc53be827b29f896684750ac8b6236"

14
meta-oe/recipes-devtools/php/php_7.1.0.bb Normal file
View File

@ -0,0 +1,14 @@
require php.inc
LIC_FILES_CHKSUM = "file://LICENSE;md5=b602636d46a61c0ac0432bbf5c078fe4"
SRC_URI += "file://change-AC_TRY_RUN-to-AC_TRY_LINK.patch"
SRC_URI[md5sum] = "54e364b60a88db77adb96aacb10f10a4"
SRC_URI[sha256sum] = "68bcfd7deed5b3474d81dec9f74d122058327e2bed0ac25bbc9ec70995228e61"
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"