* [meta-oe][PATCH 1/3] php: update version to 7.1.9
@ 2017-09-20 15:11 Derek Straka
2017-09-20 15:11 ` [meta-oe][PATCH 2/3] php: update stable version to 5.6.31 Derek Straka
2017-09-20 15:11 ` [meta-oe][PATCH 3/3] php: add libgcc to the runtime depends Derek Straka
0 siblings, 2 replies; 6+ messages in thread
From: Derek Straka @ 2017-09-20 15:11 UTC (permalink / raw)
To: openembedded-devel
Signed-off-by: Derek Straka <derek@asterius.io>
---
.../php/{php-7.1.8 => php-7.1.9}/0001-Specify-tag-with-libtool.patch | 0
.../{php-7.1.8 => php-7.1.9}/change-AC_TRY_RUN-to-AC_TRY_LINK.patch | 0
meta-oe/recipes-devtools/php/{php_7.1.8.bb => php_7.1.9.bb} | 4 ++--
3 files changed, 2 insertions(+), 2 deletions(-)
rename meta-oe/recipes-devtools/php/{php-7.1.8 => php-7.1.9}/0001-Specify-tag-with-libtool.patch (100%)
rename meta-oe/recipes-devtools/php/{php-7.1.8 => php-7.1.9}/change-AC_TRY_RUN-to-AC_TRY_LINK.patch (100%)
rename meta-oe/recipes-devtools/php/{php_7.1.8.bb => php_7.1.9.bb} (79%)
diff --git a/meta-oe/recipes-devtools/php/php-7.1.8/0001-Specify-tag-with-libtool.patch b/meta-oe/recipes-devtools/php/php-7.1.9/0001-Specify-tag-with-libtool.patch
similarity index 100%
rename from meta-oe/recipes-devtools/php/php-7.1.8/0001-Specify-tag-with-libtool.patch
rename to meta-oe/recipes-devtools/php/php-7.1.9/0001-Specify-tag-with-libtool.patch
diff --git a/meta-oe/recipes-devtools/php/php-7.1.8/change-AC_TRY_RUN-to-AC_TRY_LINK.patch b/meta-oe/recipes-devtools/php/php-7.1.9/change-AC_TRY_RUN-to-AC_TRY_LINK.patch
similarity index 100%
rename from meta-oe/recipes-devtools/php/php-7.1.8/change-AC_TRY_RUN-to-AC_TRY_LINK.patch
rename to meta-oe/recipes-devtools/php/php-7.1.9/change-AC_TRY_RUN-to-AC_TRY_LINK.patch
diff --git a/meta-oe/recipes-devtools/php/php_7.1.8.bb b/meta-oe/recipes-devtools/php/php_7.1.9.bb
similarity index 79%
rename from meta-oe/recipes-devtools/php/php_7.1.8.bb
rename to meta-oe/recipes-devtools/php/php_7.1.9.bb
index a66bcf8..157369e 100644
--- a/meta-oe/recipes-devtools/php/php_7.1.8.bb
+++ b/meta-oe/recipes-devtools/php/php_7.1.9.bb
@@ -5,8 +5,8 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=c0af599f66d0461c5837c695fcbc5c1e"
SRC_URI += "file://change-AC_TRY_RUN-to-AC_TRY_LINK.patch \
file://0001-Specify-tag-with-libtool.patch \
"
-SRC_URI[md5sum] = "d22451dc20bbdf4b8bb656dc787c2a36"
-SRC_URI[sha256sum] = "7064a00a9450565190890c7a4be04e646e0be73b2e0f8c46ae34419f343ca2f8"
+SRC_URI[md5sum] = "2397be54f3281cdf30c7ef076b28f7d0"
+SRC_URI[sha256sum] = "314dcc10dfdd7c4443edb4fe1e133a44f2b2a8351be8c9eb6ab9222d45fd9bae"
PACKAGECONFIG[mysql] = "--with-mysqli=${STAGING_BINDIR_CROSS}/mysql_config \
--with-pdo-mysql=${STAGING_BINDIR_CROSS}/mysql_config \
--
2.7.4
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [meta-oe][PATCH 2/3] php: update stable version to 5.6.31
2017-09-20 15:11 [meta-oe][PATCH 1/3] php: update version to 7.1.9 Derek Straka
@ 2017-09-20 15:11 ` Derek Straka
2017-09-20 15:11 ` [meta-oe][PATCH 3/3] php: add libgcc to the runtime depends Derek Straka
1 sibling, 0 replies; 6+ messages in thread
From: Derek Straka @ 2017-09-20 15:11 UTC (permalink / raw)
To: openembedded-devel
Signed-off-by: Derek Straka <derek@asterius.io>
---
.../0001-Add-lpthread-to-link.patch | 0
.../change-AC_TRY_RUN-to-AC_TRY_LINK.patch | 0
meta-oe/recipes-devtools/php/php_5.6.26.bb | 19 -------------------
meta-oe/recipes-devtools/php/php_5.6.31.bb | 10 ++++++++++
4 files changed, 10 insertions(+), 19 deletions(-)
rename meta-oe/recipes-devtools/php/{php-5.6.26 => php-5.6.31}/0001-Add-lpthread-to-link.patch (100%)
rename meta-oe/recipes-devtools/php/{php-5.6.26 => php-5.6.31}/change-AC_TRY_RUN-to-AC_TRY_LINK.patch (100%)
delete mode 100644 meta-oe/recipes-devtools/php/php_5.6.26.bb
create mode 100644 meta-oe/recipes-devtools/php/php_5.6.31.bb
diff --git a/meta-oe/recipes-devtools/php/php-5.6.26/0001-Add-lpthread-to-link.patch b/meta-oe/recipes-devtools/php/php-5.6.31/0001-Add-lpthread-to-link.patch
similarity index 100%
rename from meta-oe/recipes-devtools/php/php-5.6.26/0001-Add-lpthread-to-link.patch
rename to meta-oe/recipes-devtools/php/php-5.6.31/0001-Add-lpthread-to-link.patch
diff --git a/meta-oe/recipes-devtools/php/php-5.6.26/change-AC_TRY_RUN-to-AC_TRY_LINK.patch b/meta-oe/recipes-devtools/php/php-5.6.31/change-AC_TRY_RUN-to-AC_TRY_LINK.patch
similarity index 100%
rename from meta-oe/recipes-devtools/php/php-5.6.26/change-AC_TRY_RUN-to-AC_TRY_LINK.patch
rename to meta-oe/recipes-devtools/php/php-5.6.31/change-AC_TRY_RUN-to-AC_TRY_LINK.patch
diff --git a/meta-oe/recipes-devtools/php/php_5.6.26.bb b/meta-oe/recipes-devtools/php/php_5.6.26.bb
deleted file mode 100644
index 7e566b1..0000000
--- a/meta-oe/recipes-devtools/php/php_5.6.26.bb
+++ /dev/null
@@ -1,19 +0,0 @@
-require php.inc
-
-LIC_FILES_CHKSUM = "file://LICENSE;md5=b602636d46a61c0ac0432bbf5c078fe4"
-
-SRC_URI += "file://change-AC_TRY_RUN-to-AC_TRY_LINK.patch \
- file://pthread-check-threads-m4.patch \
- file://0001-Add-lpthread-to-link.patch \
- "
-SRC_URI[md5sum] = "cb424b705cfb715fc04f499f8a8cf52e"
-SRC_URI[sha256sum] = "d47aab8083a4284b905777e1b45dd7735adc53be827b29f896684750ac8b6236"
-
-python () {
- ver = d.getVar('PV')
- if not d.getVar('php_'+ver+'_OK'):
- msg = "%s disables itself because of many outstanding CVEs!" % (ver)
- msg = msg + " Define php_%s_OK = '1' to build it." % (ver)
- raise bb.parse.SkipPackage(msg)
-}
-
diff --git a/meta-oe/recipes-devtools/php/php_5.6.31.bb b/meta-oe/recipes-devtools/php/php_5.6.31.bb
new file mode 100644
index 0000000..dd8047b
--- /dev/null
+++ b/meta-oe/recipes-devtools/php/php_5.6.31.bb
@@ -0,0 +1,10 @@
+require php.inc
+
+LIC_FILES_CHKSUM = "file://LICENSE;md5=b602636d46a61c0ac0432bbf5c078fe4"
+
+SRC_URI += "file://change-AC_TRY_RUN-to-AC_TRY_LINK.patch \
+ file://pthread-check-threads-m4.patch \
+ file://0001-Add-lpthread-to-link.patch \
+ "
+SRC_URI[md5sum] = "620abe25e0d6cd5f041a360a30ce5783"
+SRC_URI[sha256sum] = "8f397169cb65f0539f3bcb04060f97770d73e19074a37bd2c58b98ebf6ecb10f"
--
2.7.4
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [meta-oe][PATCH 3/3] php: add libgcc to the runtime depends
2017-09-20 15:11 [meta-oe][PATCH 1/3] php: update version to 7.1.9 Derek Straka
2017-09-20 15:11 ` [meta-oe][PATCH 2/3] php: update stable version to 5.6.31 Derek Straka
@ 2017-09-20 15:11 ` Derek Straka
2017-09-20 15:32 ` Khem Raj
2017-10-31 1:31 ` Andre McCurdy
1 sibling, 2 replies; 6+ messages in thread
From: Derek Straka @ 2017-09-20 15:11 UTC (permalink / raw)
To: openembedded-devel
Avoids issues with 'libgcc_s.so.1 must be installed for pthread_cancel to work'
Signed-off-by: Derek Straka <derek@asterius.io>
---
meta-oe/recipes-devtools/php/php.inc | 1 +
1 file changed, 1 insertion(+)
diff --git a/meta-oe/recipes-devtools/php/php.inc b/meta-oe/recipes-devtools/php/php.inc
index 0e55020..283d630 100644
--- a/meta-oe/recipes-devtools/php/php.inc
+++ b/meta-oe/recipes-devtools/php/php.inc
@@ -203,6 +203,7 @@ MODPHP_PACKAGE = "${@bb.utils.contains('PACKAGECONFIG', 'apache2', '${PN}-modphp
PACKAGES = "${PN}-dbg ${PN}-cli ${PN}-cgi ${PN}-fpm ${PN}-fpm-apache2 ${PN}-pear ${PN}-phar ${MODPHP_PACKAGE} ${PN}-dev ${PN}-staticdev ${PN}-doc ${PN}"
+RDEPENDS_${PN} += "libgcc"
RDEPENDS_${PN}-pear = "${PN}"
RDEPENDS_${PN}-phar = "${PN}-cli"
RDEPENDS_${PN}-cli = "${PN}"
--
2.7.4
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [meta-oe][PATCH 3/3] php: add libgcc to the runtime depends
2017-09-20 15:11 ` [meta-oe][PATCH 3/3] php: add libgcc to the runtime depends Derek Straka
@ 2017-09-20 15:32 ` Khem Raj
2017-10-31 1:31 ` Andre McCurdy
1 sibling, 0 replies; 6+ messages in thread
From: Khem Raj @ 2017-09-20 15:32 UTC (permalink / raw)
To: Derek Straka; +Cc: openembeded-devel
On Wed, Sep 20, 2017 at 8:11 AM, Derek Straka <derek@asterius.io> wrote:
> Avoids issues with 'libgcc_s.so.1 must be installed for pthread_cancel to work'
>
> Signed-off-by: Derek Straka <derek@asterius.io>
> ---
> meta-oe/recipes-devtools/php/php.inc | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/meta-oe/recipes-devtools/php/php.inc b/meta-oe/recipes-devtools/php/php.inc
> index 0e55020..283d630 100644
> --- a/meta-oe/recipes-devtools/php/php.inc
> +++ b/meta-oe/recipes-devtools/php/php.inc
> @@ -203,6 +203,7 @@ MODPHP_PACKAGE = "${@bb.utils.contains('PACKAGECONFIG', 'apache2', '${PN}-modphp
>
> PACKAGES = "${PN}-dbg ${PN}-cli ${PN}-cgi ${PN}-fpm ${PN}-fpm-apache2 ${PN}-pear ${PN}-phar ${MODPHP_PACKAGE} ${PN}-dev ${PN}-staticdev ${PN}-doc ${PN}"
>
> +RDEPENDS_${PN} += "libgcc"
this reminds that we need to make libgcc provide something like
compiler/runtime which then can be depended upon by packages
since clang also has a compiler runtime and we might have to make
way to choose it at distro level rather
> RDEPENDS_${PN}-pear = "${PN}"
> RDEPENDS_${PN}-phar = "${PN}-cli"
> RDEPENDS_${PN}-cli = "${PN}"
> --
> 2.7.4
>
> --
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [meta-oe][PATCH 3/3] php: add libgcc to the runtime depends
2017-09-20 15:11 ` [meta-oe][PATCH 3/3] php: add libgcc to the runtime depends Derek Straka
2017-09-20 15:32 ` Khem Raj
@ 2017-10-31 1:31 ` Andre McCurdy
2017-11-09 20:34 ` Andre McCurdy
1 sibling, 1 reply; 6+ messages in thread
From: Andre McCurdy @ 2017-10-31 1:31 UTC (permalink / raw)
To: Derek Straka; +Cc: openembeded-devel
On Wed, Sep 20, 2017 at 8:11 AM, Derek Straka <derek@asterius.io> wrote:
> Avoids issues with 'libgcc_s.so.1 must be installed for pthread_cancel to work'
Does passing the "--enable-libgcc" php configure option fix that too?
If so, maybe it's a better fix?
> Signed-off-by: Derek Straka <derek@asterius.io>
> ---
> meta-oe/recipes-devtools/php/php.inc | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/meta-oe/recipes-devtools/php/php.inc b/meta-oe/recipes-devtools/php/php.inc
> index 0e55020..283d630 100644
> --- a/meta-oe/recipes-devtools/php/php.inc
> +++ b/meta-oe/recipes-devtools/php/php.inc
> @@ -203,6 +203,7 @@ MODPHP_PACKAGE = "${@bb.utils.contains('PACKAGECONFIG', 'apache2', '${PN}-modphp
>
> PACKAGES = "${PN}-dbg ${PN}-cli ${PN}-cgi ${PN}-fpm ${PN}-fpm-apache2 ${PN}-pear ${PN}-phar ${MODPHP_PACKAGE} ${PN}-dev ${PN}-staticdev ${PN}-doc ${PN}"
>
> +RDEPENDS_${PN} += "libgcc"
> RDEPENDS_${PN}-pear = "${PN}"
> RDEPENDS_${PN}-phar = "${PN}-cli"
> RDEPENDS_${PN}-cli = "${PN}"
> --
> 2.7.4
>
> --
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [meta-oe][PATCH 3/3] php: add libgcc to the runtime depends
2017-10-31 1:31 ` Andre McCurdy
@ 2017-11-09 20:34 ` Andre McCurdy
0 siblings, 0 replies; 6+ messages in thread
From: Andre McCurdy @ 2017-11-09 20:34 UTC (permalink / raw)
To: Derek Straka; +Cc: openembeded-devel
On Mon, Oct 30, 2017 at 6:31 PM, Andre McCurdy <armccurdy@gmail.com> wrote:
> On Wed, Sep 20, 2017 at 8:11 AM, Derek Straka <derek@asterius.io> wrote:
>> Avoids issues with 'libgcc_s.so.1 must be installed for pthread_cancel to work'
>
> Does passing the "--enable-libgcc" php configure option fix that too?
> If so, maybe it's a better fix?
To answer my own question, configuring with --enable-libgcc doesn't work.
The php configure script detects the path to libgcc by running "gcc
--print-libgcc-file-name" which doesn't work when cross compiling (or
when building natively if ${CC} is set to something other than gcc).
>> Signed-off-by: Derek Straka <derek@asterius.io>
>> ---
>> meta-oe/recipes-devtools/php/php.inc | 1 +
>> 1 file changed, 1 insertion(+)
>>
>> diff --git a/meta-oe/recipes-devtools/php/php.inc b/meta-oe/recipes-devtools/php/php.inc
>> index 0e55020..283d630 100644
>> --- a/meta-oe/recipes-devtools/php/php.inc
>> +++ b/meta-oe/recipes-devtools/php/php.inc
>> @@ -203,6 +203,7 @@ MODPHP_PACKAGE = "${@bb.utils.contains('PACKAGECONFIG', 'apache2', '${PN}-modphp
>>
>> PACKAGES = "${PN}-dbg ${PN}-cli ${PN}-cgi ${PN}-fpm ${PN}-fpm-apache2 ${PN}-pear ${PN}-phar ${MODPHP_PACKAGE} ${PN}-dev ${PN}-staticdev ${PN}-doc ${PN}"
>>
>> +RDEPENDS_${PN} += "libgcc"
>> RDEPENDS_${PN}-pear = "${PN}"
>> RDEPENDS_${PN}-phar = "${PN}-cli"
>> RDEPENDS_${PN}-cli = "${PN}"
>> --
>> 2.7.4
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2017-11-09 20:34 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-09-20 15:11 [meta-oe][PATCH 1/3] php: update version to 7.1.9 Derek Straka
2017-09-20 15:11 ` [meta-oe][PATCH 2/3] php: update stable version to 5.6.31 Derek Straka
2017-09-20 15:11 ` [meta-oe][PATCH 3/3] php: add libgcc to the runtime depends Derek Straka
2017-09-20 15:32 ` Khem Raj
2017-10-31 1:31 ` Andre McCurdy
2017-11-09 20:34 ` Andre McCurdy
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox