Re: [meta-oe] [PATCH] add php 7.1.0

[Martin Jansa <martin.jansa@gmail.com>]

[-- Attachment #1: Type: text/plain, Size: 7779 bytes --]

On Fri, Dec 16, 2016 at 01:50:38AM +0000, Huang, Qiyu wrote:
> ping

pong & resend tested version

http://logs.nslu2-linux.org/buildlogs/oe/world/pyro/log.dependencies.qemuarm.20161218_140914.log//2_max/failed/php.log

this patch added 7.0.1 recipe, not 7.1.0 as subject says (and
because of that change-AC_TRY_RUN-to-AC_TRY_LINK.patch also
isn't found and do_fetch fails.

> 
> > -----Original Message-----
> > From: Huang, Qiyu 
> > Sent: Tuesday, December 13, 2016 9:28 PM
> > To: openembedded-devel@lists.openembedded.org
> > Cc: Huang, Qiyu <huangqy.fnst@cn.fujitsu.com>
> > Subject: [oe] [meta-oe] [PATCH] add php 7.1.0
> > 
> > Signed-off-by: Huang Qiyu <huangqy.fnst@cn.fujitsu.com>
> > 
> > 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)Delete pthread-check-threads-m4.patch, since it is integrated upstream.
> > ---
> >  .../change-AC_TRY_RUN-to-AC_TRY_LINK.patch         | 56
> > ++++++++++++++++++++++
> >  meta-oe/recipes-devtools/php/php.inc               |  3 +-
> >  .../php/php/pthread-check-threads-m4.patch         | 30 ------------
> >  meta-oe/recipes-devtools/php/php_5.5.38.bb         |  6 ---
> >  meta-oe/recipes-devtools/php/php_7.0.1.bb          |  8 ++++
> >  5 files changed, 65 insertions(+), 38 deletions(-)  create mode 100644
> > meta-oe/recipes-devtools/php/php-7.1.0/change-AC_TRY_RUN-to-AC_TRY_LI
> > NK.patch
> >  delete mode 100644
> > meta-oe/recipes-devtools/php/php/pthread-check-threads-m4.patch
> >  delete mode 100644 meta-oe/recipes-devtools/php/php_5.5.38.bb
> >  create mode 100644 meta-oe/recipes-devtools/php/php_7.0.1.bb
> > 
> > diff --git
> > a/meta-oe/recipes-devtools/php/php-7.1.0/change-AC_TRY_RUN-to-AC_TRY_L
> > INK.patch
> > b/meta-oe/recipes-devtools/php/php-7.1.0/change-AC_TRY_RUN-to-AC_TRY_L
> > INK.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..191005f 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 \
> >            "
> > @@ -218,7 +217,7 @@ FILES_${PN}-doc += "${PHP_LIBDIR}/php/doc"
> >  FILES_${PN}-cli = "${bindir}/php"
> >  FILES_${PN}-phar = "${bindir}/phar*"
> >  FILES_${PN}-cgi = "${bindir}/php-cgi"
> > -FILES_${PN}-fpm = "${sbindir}/php-fpm ${sysconfdir}/php-fpm.conf
> > ${datadir}/fpm ${sysconfdir}/init.d/php-fpm
> > ${systemd_unitdir}/system/php-fpm.service"
> > +FILES_${PN}-fpm = "${sbindir}/php-fpm ${sysconfdir}/php-fpm.conf
> > ${datadir}/fpm ${sysconfdir}/init.d/php-fpm
> > ${systemd_unitdir}/system/php-fpm.service /etc/*"
> >  FILES_${PN}-fpm-apache2 = "${sysconfdir}/apache2/conf.d/php-fpm.conf"
> >  CONFFILES_${PN}-fpm = "${sysconfdir}/php-fpm.conf"
> >  CONFFILES_${PN}-fpm-apache2 =
> > "${sysconfdir}/apache2/conf.d/php-fpm.conf"
> > diff --git a/meta-oe/recipes-devtools/php/php/pthread-check-threads-m4.patch
> > b/meta-oe/recipes-devtools/php/php/pthread-check-threads-m4.patch
> > deleted file mode 100644
> > index 0c564cd..0000000
> > --- a/meta-oe/recipes-devtools/php/php/pthread-check-threads-m4.patch
> > +++ /dev/null
> > @@ -1,30 +0,0 @@
> > -From d8067ceacbf54e79c9c6b68675332c09eaa0b55d Mon Sep 17 00:00:00
> > 2001
> > -From: Jackie Huang <jackie.huang@windriver.com>
> > -Date: Mon, 8 Apr 2013 14:29:51 +0800
> > -Subject: [PATCH] pthread-check
> > -
> > -Enable pthreads support when cross-compiling
> > -
> > -Upstream-Status: Inapproprate [config]
> > -
> > -Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
> > ----
> > - TSRM/threads.m4 |    2 +-
> > - 1 files changed, 1 insertions(+), 1 deletions(-)
> > -
> > -diff --git a/TSRM/threads.m4 b/TSRM/threads.m4 -index 38494ce..15d9454
> > 100644
> > ---- a/TSRM/threads.m4
> > -+++ b/TSRM/threads.m4
> > -@@ -86,7 +86,7 @@ int main() {
> > -   pthreads_working=no
> > -   ], [
> > -   dnl For cross compiling running this test is of no use. NetWare supports
> > pthreads
> > --  pthreads_working=no
> > -+  pthreads_working=yes
> > -   case $host_alias in
> > -   *netware*)
> > -     pthreads_working=yes
> > ---
> > -1.7.4.1
> > -
> > 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] =
> > "473c81ebb2e48ca468caee031762266651843d7227c18a824add9b07b9393e3
> > 8"
> > diff --git a/meta-oe/recipes-devtools/php/php_7.0.1.bb
> > b/meta-oe/recipes-devtools/php/php_7.0.1.bb
> > new file mode 100644
> > index 0000000..899acf9
> > --- /dev/null
> > +++ b/meta-oe/recipes-devtools/php/php_7.0.1.bb
> > @@ -0,0 +1,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[md5sum] = "54e364b60a88db77adb96aacb10f10a4"
> > +SRC_URI[sha256sum] =
> > "68bcfd7deed5b3474d81dec9f74d122058327e2bed0ac25bbc9ec70995228e61"
> > +
> > --
> > 2.7.4
> 
> 
> 
> -- 
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel

-- 
Martin 'JaMa' Jansa     jabber: Martin.Jansa@gmail.com

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 201 bytes --]