* Re: [meta-oe] [PATCH v4] add php 7.1.0
@ 2017-05-24 19:38 gmane
0 siblings, 0 replies; 2+ messages in thread
From: gmane @ 2017-05-24 19:38 UTC (permalink / raw)
To: openembedded-devel; +Cc: robert.berger
Hi,
On 2016-12-26 16:39, Huang Qiyu wrote:
> 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>
I took the latest and greatest php 7.1.0 from master
http://cgit.openembedded.org/meta-openembedded/tree/meta-oe/recipes-devtools/php
And added php (among other things) to a poky/pyro core-image-sato-sdk
and built an extensible SDK
bitbake core-image-sato-sdk -c populate_sdk_ext
When I try to install the SDK
./poky-glibc-x86_64-core-image-sato-sdk-armv7a-neon-toolchain-ext-2.3.sh
I get:
Extracting
SDK................................................................................................................................done
Setting it up...
Extracting buildtools...
Preparing build system...
Parsing recipes: 100%
|#########################################################################################################################|
Time: 0:00:41
Initialising tasks: 100%
|######################################################################################################################|
Time: 0:00:15
Checking sstate mirror object availability: 100%
|##############################################################################################|
Time: 0:00:00
WARNING: Logfile for failed setscene task is
/opt/ext-sdk/poky/2.3/tmp/work/x86_64-linux/php-native/7.1.0-r0/temp/log.do_populate_sysroot_setscene.24207
WARNING: Setscene task
(virtual:native:/opt/ext-sdk/poky/2.3/layers/multi-v7-ml/recipes-devtools/php.ori/php_7.1.0.bb:do_populate_sysroot_setscene)
failed with exit code '1' - real task will be run instead
ERROR: Task php-native.do_populate_sysroot_setscene failed
ERROR: SDK preparation failed: error log written to
/opt/ext-sdk/poky/2.3/preparing_build_system.log
I believe the problem is in:
php_sstate_postinst
In cooker mode I am able to see related warnings like this:
bitbake php-native -c clean && bitbake php-native
you might need to run it twize
NOTE: Executing SetScene Tasks
WARNING: Logfile for failed setscene task is
/tmp/yocto-autobuilder/yocto-autobuilder/yocto-worker/res-custom-pyro-multi-v7-core-image-minimal-sato-sdk-ext/build/build/tmp/work/x86_64-linux/php-native/7.1.0-r1/temp/log.do_populate_sysroot_setscene.6285
WARNING: Setscene task
(virtual:native:/tmp/yocto-autobuilder/yocto-autobuilder/yocto-worker/res-custom-pyro-multi-v7-core-image-minimal-sato-sdk-ext/build/meta-mainline/multi-v7-ml/recipes-devtools/php/php_7.1.0.bb:do_populate_sysroot_setscene)
failed with exit code '1' - real task will be run instead
NOTE: Executing RunQueue Tasks
Note that with -c cleansstate or -c cleanall you won't see the warning
I hacked this to make it compile without a warning - not sure it is
correct:
php_sstate_postinst() {
if [ "${BB_CURRENTTASK}" = "populate_sysroot_setscene" ]
then
head -n1 ${SYSROOT_DESTDIR}${sysconfdir}/pear.conf >
${SYSROOT_DESTDIR}${sysconfdir}/pear.tmp.conf
for p in `tail -n1 ${SYSROOT_DESTDIR}${sysconfdir}/pear.conf |
sed -s 's/;/ /g'`; do
echo $p | awk -F: 'BEGIN {OFS = ":"; ORS =
";"}{if(NF==3){print $1, length($3)-2*match($3, /^"/), $3} else {print
$0}}';
done >> ${SYSROOT_DESTDIR}${sysconfdir}/pear.tmp.conf
mv -f ${SYSROOT_DESTDIR}${sysconfdir}/pear.tmp.conf
${SYSROOT_DESTDIR}/${sysconfdir}/pear.conf
fi
}
Can you please have a look?
Regards,
Robert
^ permalink raw reply [flat|nested] 2+ messages in thread
* [meta-oe] [PATCH v4] add php 7.1.0
@ 2016-12-26 14:39 Huang Qiyu
0 siblings, 0 replies; 2+ messages in thread
From: Huang Qiyu @ 2016-12-26 14:39 UTC (permalink / raw)
To: openembedded-devel
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>
---
.../change-AC_TRY_RUN-to-AC_TRY_LINK.patch | 56 ++++++++++++++++++++++
meta-oe/recipes-devtools/php/php.inc | 1 -
meta-oe/recipes-devtools/php/php_5.5.38.bb | 6 ---
meta-oe/recipes-devtools/php/php_5.6.26.bb | 4 +-
meta-oe/recipes-devtools/php/php_7.1.0.bb | 14 ++++++
5 files changed, 73 insertions(+), 8 deletions(-)
create mode 100644 meta-oe/recipes-devtools/php/php-7.1.0/change-AC_TRY_RUN-to-AC_TRY_LINK.patch
delete mode 100644 meta-oe/recipes-devtools/php/php_5.5.38.bb
create mode 100644 meta-oe/recipes-devtools/php/php_7.1.0.bb
diff --git a/meta-oe/recipes-devtools/php/php-7.1.0/change-AC_TRY_RUN-to-AC_TRY_LINK.patch b/meta-oe/recipes-devtools/php/php-7.1.0/change-AC_TRY_RUN-to-AC_TRY_LINK.patch
new file mode 100644
index 0000000..39c334f
--- /dev/null
+++ b/meta-oe/recipes-devtools/php/php-7.1.0/change-AC_TRY_RUN-to-AC_TRY_LINK.patch
@@ -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
+
diff --git a/meta-oe/recipes-devtools/php/php.inc b/meta-oe/recipes-devtools/php/php.inc
index cd91940..c4fb1d9 100644
--- a/meta-oe/recipes-devtools/php/php.inc
+++ b/meta-oe/recipes-devtools/php/php.inc
@@ -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 \
"
diff --git a/meta-oe/recipes-devtools/php/php_5.5.38.bb b/meta-oe/recipes-devtools/php/php_5.5.38.bb
deleted file mode 100644
index 26f35b1..0000000
--- a/meta-oe/recipes-devtools/php/php_5.5.38.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require php.inc
-
-LIC_FILES_CHKSUM = "file://LICENSE;md5=464ca70af214d2407f6b7d4458158afd"
-
-SRC_URI[md5sum] = "312244a0eecad602a1555ed2434e223f"
-SRC_URI[sha256sum] = "473c81ebb2e48ca468caee031762266651843d7227c18a824add9b07b9393e38"
diff --git a/meta-oe/recipes-devtools/php/php_5.6.26.bb b/meta-oe/recipes-devtools/php/php_5.6.26.bb
index cbd0615..ddc7ce3 100644
--- a/meta-oe/recipes-devtools/php/php_5.6.26.bb
+++ b/meta-oe/recipes-devtools/php/php_5.6.26.bb
@@ -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"
diff --git a/meta-oe/recipes-devtools/php/php_7.1.0.bb b/meta-oe/recipes-devtools/php/php_7.1.0.bb
new file mode 100644
index 0000000..210d91f
--- /dev/null
+++ b/meta-oe/recipes-devtools/php/php_7.1.0.bb
@@ -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"
--
2.7.4
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2017-05-24 21:02 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-05-24 19:38 [meta-oe] [PATCH v4] add php 7.1.0 gmane
-- strict thread matches above, loose matches on Subject: below --
2016-12-26 14:39 Huang Qiyu
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.