summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2022-01-25 18:20:26 -0800
committerKhem Raj <raj.khem@gmail.com>2022-01-25 21:03:16 -0800
commit61e1697e92854cda1fc50dcdfacd21b1c74801f8 (patch)
treefb4973bd917a447c815215d46cdcbc2000f534cf
parent5a697355149f0a82915d70dc69acd5dbbc2c640c (diff)
downloadmeta-openembedded-61e1697e92854cda1fc50dcdfacd21b1c74801f8.tar.gz
php: Update to 8.1.2
- 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>
-rw-r--r--meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb1
-rw-r--r--meta-oe/recipes-devtools/php/php_8.1.2.bb (renamed from meta-oe/recipes-devtools/php/php_8.1.0.bb)8
2 files changed, 7 insertions, 2 deletions
diff --git a/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb b/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb
index 62ada76f9..3cf33c694 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
327RDEPENDS:packagegroup-meta-oe-devtools:remove:powerpc64le = "android-tools breakpad lshw luajit ply uftrace" 327RDEPENDS:packagegroup-meta-oe-devtools:remove:powerpc64le = "android-tools breakpad lshw luajit ply uftrace"
328RDEPENDS:packagegroup-meta-oe-devtools:remove:riscv64 = "breakpad concurrencykit heaptrack lshw ltrace luajit nodejs ply uftrace" 328RDEPENDS:packagegroup-meta-oe-devtools:remove:riscv64 = "breakpad concurrencykit heaptrack lshw ltrace luajit nodejs ply uftrace"
329RDEPENDS:packagegroup-meta-oe-devtools:remove:riscv32 = "breakpad concurrencykit heaptrack lshw ltrace luajit nodejs ply uftrace" 329RDEPENDS:packagegroup-meta-oe-devtools:remove:riscv32 = "breakpad concurrencykit heaptrack lshw ltrace luajit nodejs ply uftrace"
330RDEPENDS:packagegroup-meta-oe-devtools:remove:libc-musl:riscv32 = "php"
330RDEPENDS:packagegroup-meta-oe-devtools:remove:aarch64 = "concurrencykit" 331RDEPENDS:packagegroup-meta-oe-devtools:remove:aarch64 = "concurrencykit"
331RDEPENDS:packagegroup-meta-oe-devtools:remove:x86 = "ply" 332RDEPENDS:packagegroup-meta-oe-devtools:remove:x86 = "ply"
332 333
diff --git a/meta-oe/recipes-devtools/php/php_8.1.0.bb b/meta-oe/recipes-devtools/php/php_8.1.2.bb
index 43e86fe55..038d79783 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 = " \
32 " 32 "
33 33
34S = "${WORKDIR}/php-${PV}" 34S = "${WORKDIR}/php-${PV}"
35SRC_URI[sha256sum] = "0725ed2baea125496a898455d501a77460218b2a0cfad773fa9322f491b82b61" 35SRC_URI[sha256sum] = "913dc7dd4388427fa33ea4ac89834e856ff5394f4218eace260a3a279f5b53a9"
36
37 36
38inherit autotools pkgconfig python3native gettext 37inherit autotools pkgconfig python3native gettext
39 38
@@ -273,3 +272,8 @@ do_install:append:class-native() {
273# | {standard input}:3797: Error: unshifted register required -- `sub r2,r2,r0,asr#31' 272# | {standard input}:3797: Error: unshifted register required -- `sub r2,r2,r0,asr#31'
274# | make: *** [ext/standard/math.lo] Error 1 273# | make: *** [ext/standard/math.lo] Error 1
275ARM_INSTRUCTION_SET = "arm" 274ARM_INSTRUCTION_SET = "arm"
275
276# Needs fibers assembly implemented for rv32
277# for example rv64 implementation is below
278# see https://github.com/php/php-src/commit/70b02d75f2abe3a292d49c4a4e9e4f850c2fee68
279COMPATIBLE_HOST:libc-musl:riscv32 = "null"