[meta-oe] php: Update to 8.1.2

Message ID 20220126023854.2187653-1-raj.khem@gmail.com
State New
Headers show
Series [meta-oe] php: Update to 8.1.2 | expand

Commit Message

Khem Raj Jan. 26, 2022, 2:38 a.m. UTC
- Add fibers support for RISCV64

- Disable build on RISCV32 musl since getcontext/setcontext APIs do not
  exist on musl which are needed for fibers

- Detailed changes are here [1]

[1] https://www.php.net/ChangeLog-8.php#PHP_8_1

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 .../recipes-core/packagegroups/packagegroup-meta-oe.bb    | 1 +
 .../recipes-devtools/php/{php_8.1.0.bb => php_8.1.2.bb}   | 8 ++++++--
 2 files changed, 7 insertions(+), 2 deletions(-)
 rename meta-oe/recipes-devtools/php/{php_8.1.0.bb => php_8.1.2.bb} (97%)

Patch

diff --git a/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb b/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb
index 62ada76f93..3cf33c6943 100644
--- a/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb
+++ b/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb
@@ -327,6 +327,7 @@  RDEPENDS:packagegroup-meta-oe-devtools:remove:powerpc64 = "android-tools breakpa
 RDEPENDS:packagegroup-meta-oe-devtools:remove:powerpc64le = "android-tools breakpad lshw luajit ply uftrace"
 RDEPENDS:packagegroup-meta-oe-devtools:remove:riscv64 = "breakpad concurrencykit heaptrack lshw ltrace luajit nodejs ply uftrace"
 RDEPENDS:packagegroup-meta-oe-devtools:remove:riscv32 = "breakpad concurrencykit heaptrack lshw ltrace luajit nodejs ply uftrace"
+RDEPENDS:packagegroup-meta-oe-devtools:remove:libc-musl:riscv32 = "php"
 RDEPENDS:packagegroup-meta-oe-devtools:remove:aarch64 = "concurrencykit"
 RDEPENDS:packagegroup-meta-oe-devtools:remove:x86 = "ply"
 
diff --git a/meta-oe/recipes-devtools/php/php_8.1.0.bb b/meta-oe/recipes-devtools/php/php_8.1.2.bb
similarity index 97%
rename from meta-oe/recipes-devtools/php/php_8.1.0.bb
rename to meta-oe/recipes-devtools/php/php_8.1.2.bb
index 43e86fe55b..038d79783b 100644
--- a/meta-oe/recipes-devtools/php/php_8.1.0.bb
+++ b/meta-oe/recipes-devtools/php/php_8.1.2.bb
@@ -32,8 +32,7 @@  SRC_URI:append:class-target = " \
           "
 
 S = "${WORKDIR}/php-${PV}"
-SRC_URI[sha256sum] = "0725ed2baea125496a898455d501a77460218b2a0cfad773fa9322f491b82b61"
-
+SRC_URI[sha256sum] = "913dc7dd4388427fa33ea4ac89834e856ff5394f4218eace260a3a279f5b53a9"
 
 inherit autotools pkgconfig python3native gettext
 
@@ -273,3 +272,8 @@  do_install:append:class-native() {
 # | {standard input}:3797: Error: unshifted register required -- `sub r2,r2,r0,asr#31'
 # | make: *** [ext/standard/math.lo] Error 1
 ARM_INSTRUCTION_SET = "arm"
+
+# Needs fibers assembly implemented for rv32
+# for example rv64 implementation is below
+# see https://github.com/php/php-src/commit/70b02d75f2abe3a292d49c4a4e9e4f850c2fee68
+COMPATIBLE_HOST:libc-musl:riscv32 = "null"