aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndy Postnikov <apostnikov@gmail.com>2021-10-15 10:00:53 +0300
committerAndy Postnikov <apostnikov@gmail.com>2021-10-15 10:06:02 +0300
commit08a408826645f38eebe855b2c29d8693e7e6390d (patch)
tree72cc23c5053b9d22a129c35534b2245a4445c4dd
parent2e5daf210b5344ca506ecbf8e4061d4cca8e3ea5 (diff)
downloadaports-08a408826645f38eebe855b2c29d8693e7e6390d.tar.gz
aports-08a408826645f38eebe855b2c29d8693e7e6390d.tar.bz2
aports-08a408826645f38eebe855b2c29d8693e7e6390d.tar.xz
testing/php8-pecl-swoole: renamed from php8-pecl-openswoole
-rw-r--r--testing/php8-pecl-openswoole/fix-rv64.patch258
-rw-r--r--testing/php8-pecl-swoole/APKBUILD (renamed from testing/php8-pecl-openswoole/APKBUILD)19
2 files changed, 8 insertions, 269 deletions
diff --git a/testing/php8-pecl-openswoole/fix-rv64.patch b/testing/php8-pecl-openswoole/fix-rv64.patch
deleted file mode 100644
index 5b262ecfe6..0000000000
--- a/testing/php8-pecl-openswoole/fix-rv64.patch
+++ /dev/null
@@ -1,258 +0,0 @@
-Patch-Source: https://github.com/swoole/swoole-src/pull/4375
-
-diff --git a/thirdparty/boost/asm/jump_riscv64_sysv_elf_gas.S b/thirdparty/boost/asm/jump_riscv64_sysv_elf_gas.S
-new file mode 100644
-index 0000000000..e134bae637
---- /dev/null
-+++ b/thirdparty/boost/asm/jump_riscv64_sysv_elf_gas.S
-@@ -0,0 +1,153 @@
-+/*
-+ Distributed under the Boost Software License, Version 1.0.
-+ (See accompanying file LICENSE_1_0.txt or copy at
-+ http://www.boost.org/LICENSE_1_0.txt)
-+*/
-+/*******************************************************
-+ * *
-+ * ------------------------------------------------- *
-+ * | 0 | 1 | 2 | 3 | 4 | 5 | 6 | 7 | *
-+ * ------------------------------------------------- *
-+ * | 0x0 | 0x4 | 0x8 | 0xc | 0x10| 0x14| 0x18| 0x1c| *
-+ * ------------------------------------------------- *
-+ * | fs0 | fs1 | fs2 | fs3 | *
-+ * ------------------------------------------------- *
-+ * ------------------------------------------------- *
-+ * | 8 | 9 | 10 | 11 | 12 | 13 | 14 | 15 | *
-+ * ------------------------------------------------- *
-+ * | 0x20| 0x24| 0x28| 0x2c| 0x30| 0x34| 0x38| 0x3c| *
-+ * ------------------------------------------------- *
-+ * | fs4 | fs5 | fs6 | fs7 | *
-+ * ------------------------------------------------- *
-+ * ------------------------------------------------- *
-+ * | 16 | 17 | 18 | 19 | 20 | 21 | 22 | 23 | *
-+ * ------------------------------------------------- *
-+ * | 0x40| 0x44| 0x48| 0x4c| 0x50| 0x54| 0x58| 0x5c| *
-+ * ------------------------------------------------- *
-+ * | fs8 | fs9 | fs10 | fs11 | *
-+ * ------------------------------------------------- *
-+ * ------------------------------------------------- *
-+ * | 24 | 25 | 26 | 27 | 28 | 29 | 30 | 31 | *
-+ * ------------------------------------------------- *
-+ * | 0x60| 0x64| 0x68| 0x6c| 0x70| 0x74| 0x78| 0x7c| *
-+ * ------------------------------------------------- *
-+ * | s0 | s1 | s2 | s3 | *
-+ * ------------------------------------------------- *
-+ * ------------------------------------------------- *
-+ * | 32 | 33 | 34 | 35 | 36 | 37 | 38 | 39 | *
-+ * ------------------------------------------------- *
-+ * | 0x80| 0x84| 0x88| 0x8c| 0x90| 0x94| 0x98| 0x9c| *
-+ * ------------------------------------------------- *
-+ * | s4 | s5 | s6 | s7 | *
-+ * ------------------------------------------------- *
-+ * ------------------------------------------------- *
-+ * | 40 | 41 | 42 | 43 | 44 | 45 | 46 | 47 | *
-+ * ------------------------------------------------- *
-+ * | 0xa0| 0xa4| 0xa8| 0xac| 0xb0| 0xb4| 0xb8| 0xbc| *
-+ * ------------------------------------------------- *
-+ * | s8 | s9 | s10 | s11 | *
-+ * ------------------------------------------------- *
-+ * ------------------------------------------------- *
-+ * | 48 | 49 | 50 | 51 | | | | | *
-+ * ------------------------------------------------- *
-+ * | 0xc0| 0xc4| 0xc8| 0xcc| | | | | *
-+ * ------------------------------------------------- *
-+ * | ra | pc | | | *
-+ * ------------------------------------------------- *
-+ * *
-+ *******************************************************/
-+
-+.file "jump_riscv64_sysv_elf_gas.S"
-+.text
-+.align 1
-+.global jump_fcontext
-+.type jump_fcontext, %function
-+jump_fcontext:
-+ # prepare stack for GP + FPU
-+ addi sp, sp, -0xd0
-+
-+ beqz a3, .L1
-+
-+ # save fs0 - fs11
-+ fsd fs0, 0x00(sp)
-+ fsd fs1, 0x08(sp)
-+ fsd fs2, 0x10(sp)
-+ fsd fs3, 0x18(sp)
-+ fsd fs4, 0x20(sp)
-+ fsd fs5, 0x28(sp)
-+ fsd fs6, 0x30(sp)
-+ fsd fs7, 0x38(sp)
-+ fsd fs8, 0x40(sp)
-+ fsd fs9, 0x48(sp)
-+ fsd fs10, 0x50(sp)
-+ fsd fs11, 0x58(sp)
-+.L1:
-+
-+ # save s0-s11, ra
-+ sd s0, 0x60(sp)
-+ sd s1, 0x68(sp)
-+ sd s2, 0x70(sp)
-+ sd s3, 0x78(sp)
-+ sd s4, 0x80(sp)
-+ sd s5, 0x88(sp)
-+ sd s6, 0x90(sp)
-+ sd s7, 0x98(sp)
-+ sd s8, 0xa0(sp)
-+ sd s9, 0xa8(sp)
-+ sd s10, 0xb0(sp)
-+ sd s11, 0xb8(sp)
-+ sd ra, 0xc0(sp)
-+
-+ # save RA as PC
-+ sd ra, 0xc8(sp)
-+
-+ # store SP (pointing to context-data) in A0
-+ sd sp, (a0)
-+
-+ # restore SP (pointing to context-data) from A1
-+ mv sp, a1
-+
-+ beqz a3, .L2
-+ # load fs0 - fs11
-+ fld fs0, 0x00(sp)
-+ fld fs1, 0x08(sp)
-+ fld fs2, 0x10(sp)
-+ fld fs3, 0x18(sp)
-+ fld fs4, 0x20(sp)
-+ fld fs5, 0x28(sp)
-+ fld fs6, 0x30(sp)
-+ fld fs7, 0x38(sp)
-+ fld fs8, 0x40(sp)
-+ fld fs9, 0x48(sp)
-+ fld fs10, 0x50(sp)
-+ fld fs11, 0x58(sp)
-+.L2:
-+
-+ # load s0-s11,ra
-+ ld s0, 0x60(sp)
-+ ld s1, 0x68(sp)
-+ ld s2, 0x70(sp)
-+ ld s3, 0x78(sp)
-+ ld s4, 0x80(sp)
-+ ld s5, 0x88(sp)
-+ ld s6, 0x90(sp)
-+ ld s7, 0x98(sp)
-+ ld s8, 0xa0(sp)
-+ ld s9, 0xa8(sp)
-+ ld s10, 0xb0(sp)
-+ ld s11, 0xb8(sp)
-+ ld ra, 0xc0(sp)
-+
-+ # use A2 as return value
-+ mv a0, a2
-+
-+ # load pc
-+ ld a2, 0xc8(sp)
-+
-+ # restore stack from GP + FPU
-+ addi sp, sp, 0xd0
-+
-+ jr a2
-+.size jump_fcontext,.-jump_fcontext
-+# Mark that we don't need executable stack.
-+.section .note.GNU-stack,"",%progbits
-diff --git a/thirdparty/boost/asm/make_riscv64_sysv_elf_gas.S b/thirdparty/boost/asm/make_riscv64_sysv_elf_gas.S
-new file mode 100644
-index 0000000000..5322e0fdbd
---- /dev/null
-+++ b/thirdparty/boost/asm/make_riscv64_sysv_elf_gas.S
-@@ -0,0 +1,91 @@
-+/*
-+ Distributed under the Boost Software License, Version 1.0.
-+ (See accompanying file LICENSE_1_0.txt or copy at
-+ http://www.boost.org/LICENSE_1_0.txt)
-+*/
-+/*******************************************************
-+ * *
-+ * ------------------------------------------------- *
-+ * | 0 | 1 | 2 | 3 | 4 | 5 | 6 | 7 | *
-+ * ------------------------------------------------- *
-+ * | 0x0 | 0x4 | 0x8 | 0xc | 0x10| 0x14| 0x18| 0x1c| *
-+ * ------------------------------------------------- *
-+ * | fs0 | fs1 | fs2 | fs3 | *
-+ * ------------------------------------------------- *
-+ * ------------------------------------------------- *
-+ * | 8 | 9 | 10 | 11 | 12 | 13 | 14 | 15 | *
-+ * ------------------------------------------------- *
-+ * | 0x20| 0x24| 0x28| 0x2c| 0x30| 0x34| 0x38| 0x3c| *
-+ * ------------------------------------------------- *
-+ * | fs4 | fs5 | fs6 | fs7 | *
-+ * ------------------------------------------------- *
-+ * ------------------------------------------------- *
-+ * | 16 | 17 | 18 | 19 | 20 | 21 | 22 | 23 | *
-+ * ------------------------------------------------- *
-+ * | 0x40| 0x44| 0x48| 0x4c| 0x50| 0x54| 0x58| 0x5c| *
-+ * ------------------------------------------------- *
-+ * | fs8 | fs9 | fs10 | fs11 | *
-+ * ------------------------------------------------- *
-+ * ------------------------------------------------- *
-+ * | 24 | 25 | 26 | 27 | 28 | 29 | 30 | 31 | *
-+ * ------------------------------------------------- *
-+ * | 0x60| 0x64| 0x68| 0x6c| 0x70| 0x74| 0x78| 0x7c| *
-+ * ------------------------------------------------- *
-+ * | s0 | s1 | s2 | s3 | *
-+ * ------------------------------------------------- *
-+ * ------------------------------------------------- *
-+ * | 32 | 33 | 34 | 35 | 36 | 37 | 38 | 39 | *
-+ * ------------------------------------------------- *
-+ * | 0x80| 0x84| 0x88| 0x8c| 0x90| 0x94| 0x98| 0x9c| *
-+ * ------------------------------------------------- *
-+ * | s4 | s5 | s6 | s7 | *
-+ * ------------------------------------------------- *
-+ * ------------------------------------------------- *
-+ * | 40 | 41 | 42 | 43 | 44 | 45 | 46 | 47 | *
-+ * ------------------------------------------------- *
-+ * | 0xa0| 0xa4| 0xa8| 0xac| 0xb0| 0xb4| 0xb8| 0xbc| *
-+ * ------------------------------------------------- *
-+ * | s8 | s9 | s10 | s11 | *
-+ * ------------------------------------------------- *
-+ * ------------------------------------------------- *
-+ * | 48 | 49 | 50 | 51 | | | | | *
-+ * ------------------------------------------------- *
-+ * | 0xc0| 0xc4| 0xc8| 0xcc| | | | | *
-+ * ------------------------------------------------- *
-+ * | ra | pc | | | *
-+ * ------------------------------------------------- *
-+ * *
-+ *******************************************************/
-+
-+.file "make_riscv64_sysv_elf_gas.S"
-+.text
-+.align 1
-+.global make_fcontext
-+.type make_fcontext, %function
-+make_fcontext:
-+ # shift address in a0 (allocated stack) to lower 16 byte boundary
-+ andi a0, a0, ~0xF
-+
-+ # reserve space for context-data on context-stack
-+ addi a0, a0, -0xd0
-+
-+ # third arg of make_fcontext() == address of context-function
-+ # store address as a PC to jump in
-+ sd a2, 0xc8(a0)
-+
-+ # save address of finish as return-address for context-function
-+ # will be entered after context-function returns (RA register)
-+ lla a4, finish
-+ sd a4, 0xc0(a0)
-+
-+ ret // return pointer to context-data (a0)
-+
-+finish:
-+ # exit code is zero
-+ li a0, 0
-+ # exit application
-+ tail _exit@plt
-+
-+.size make_fcontext,.-make_fcontext
-+# Mark that we don't need executable stack.
-+.section .note.GNU-stack,"",%progbits
diff --git a/testing/php8-pecl-openswoole/APKBUILD b/testing/php8-pecl-swoole/APKBUILD
index 6f215db58b..8b4171ce82 100644
--- a/testing/php8-pecl-openswoole/APKBUILD
+++ b/testing/php8-pecl-swoole/APKBUILD
@@ -1,20 +1,18 @@
# Maintainer: Andy Postnikov <apostnikov@gmail.com>
-pkgname=php8-pecl-openswoole
-_extname=openswoole
-pkgver=4.7.1
-pkgrel=2
+pkgname=php8-pecl-swoole
+_extname=swoole
+pkgver=4.8.0
+pkgrel=0
pkgdesc="Event-driven asynchronous and concurrent networking engine with high performance for PHP 8.0 - PECL"
-url="https://pecl.php.net/package/openswoole"
+url="https://pecl.php.net/package/swoole"
arch="all"
license="Apache-2.0"
depends="php8-curl php8-mysqlnd php8-openssl php8-sockets"
makedepends="php8-dev openssl1.1-compat-dev nghttp2-dev c-ares-dev curl-dev"
-source="php-pecl-$_extname-$pkgver.tgz::https://pecl.php.net/get/$_extname-$pkgver.tgz
- fix-rv64.patch
- "
+source="php-pecl-$_extname-$pkgver.tgz::https://pecl.php.net/get/$_extname-$pkgver.tgz"
builddir="$srcdir"/$_extname-$pkgver
subpackages="$pkgname-dev"
-replaces="php8-pecl-swoole"
+replaces="php8-pecl-openswoole"
case "$CARCH" in
ppc64le|s390x) makedepends="$makedepends libucontext-dev" ;;
@@ -50,6 +48,5 @@ package() {
}
sha512sums="
-062ebf64da8301e48f06d08af96c461b9754a0cacdca057fcc09cf99677d7f80148f1ff1238885cf8f01d6182fd6509c7f6811ce8b4f50a115eb1075270d000d php-pecl-openswoole-4.7.1.tgz
-c888407be8d0cb7a4f3b622081d3a1c8659bf291a2d2340753d97ea57c1fdb2323e9e4abe6a31f75012f08dafa35f69c49fc32b07df1121d64070d09f23e7110 fix-rv64.patch
+15a9bac3715f6e21fe9f8416bebee0170bf8760b67774a4d92b0ff0a146ce79c91bc88e26b9f52125798962cd1f3ff3c8d5b5dfe775f1c7f2c04e64a75307320 php-pecl-swoole-4.8.0.tgz
"