sergiotarxz
/
termux-packages
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

php: update to 8.1

This commit is contained in:
Arun 2021-11-26 12:27:52 +05:30 committed by Henrik Grimler
parent 37617c6261
commit 578ea03970
5 changed files with 28 additions and 92 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
packages/php/build.sh
View File

@ -3,10 +3,9 @@ TERMUX_PKG_DESCRIPTION="Server-side, HTML-embedded scripting language"
TERMUX_PKG_LICENSE="PHP-3.01"
TERMUX_PKG_LICENSE_FILE=LICENSE
TERMUX_PKG_MAINTAINER="@termux"
TERMUX_PKG_VERSION=8.0.13
TERMUX_PKG_REVISION=2
TERMUX_PKG_VERSION=8.1.0
TERMUX_PKG_SRCURL=https://github.com/php/php-src/archive/php-${TERMUX_PKG_VERSION}.tar.gz
TERMUX_PKG_SHA256=ee1369199b26fc088ce6f51c111be0fbb42d1b10b107437c782a4701c0ea673f
TERMUX_PKG_SHA256=b5aecb953f8938fb7435709d620cd9946df7cd53459a4abc27ef4e64a1fa7eb9
# Build native php for phar to build (see pear-Makefile.frag.patch):
TERMUX_PKG_HOSTBUILD=true
# Build the native php without xml support as we only need phar:

28
packages/php/ext-opcache-config.m4.patch
View File

@ -1,24 +1,12 @@
diff -uNr php-8.0.0.orig/ext/opcache/config.m4 php-8.0.0/ext/opcache/config.m4
--- php-8.0.0.orig/ext/opcache/config.m4 2020-11-24 22:34:03.000000000 +0530
+++ php-8.0.0/ext/opcache/config.m4 2020-12-06 21:26:14.225669677 +0530
@@ -219,7 +219,9 @@
}
]])],[dnl
AC_DEFINE(HAVE_SHM_MMAP_ANON, 1, [Define if you have mmap(MAP_ANON) SHM support])
- have_shm_mmap_anon=yes],[have_shm_mmap_anon=no],[have_shm_mmap_anon=no])
+ have_shm_mmap_anon=yes],[have_shm_mmap_anon=no],
+ AC_DEFINE(HAVE_SHM_MMAP_ANON, 1, [Define if you have mmap(MAP_ANON) SHM support])
+ have_shm_mmap_anon=yes)
AC_MSG_RESULT([$have_shm_mmap_anon])
PHP_CHECK_FUNC_LIB(shm_open, rt, root)
@@ -336,6 +338,9 @@
diff -uNr php-8.1.0/ext/opcache/config.m4 php-8.1.0.mod/ext/opcache/config.m4
--- php-8.1.0/ext/opcache/config.m4 2021-11-24 00:26:11.000000000 +0530
+++ php-8.1.0.mod/ext/opcache/config.m4 2021-11-26 11:37:50.343462890 +0530
@@ -328,6 +328,8 @@
shared_alloc_posix.c \
$ZEND_JIT_SRC,
shared,,-DZEND_ENABLE_STATIC_TSRMLS_CACHE=1,,yes)
shared,,"-Wno-implicit-fallthrough -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1",,yes)
+ OPCACHE_SHARED_LIBADD=-lpcre2-8
+ PHP_SUBST(OPCACHE_SHARED_LIBADD)
+ OPCACHE_SHARED_LIBADD=-lpcre2-8
+ PHP_SUBST(OPCACHE_SHARED_LIBADD)
+
PHP_ADD_BUILD_DIR([$ext_builddir/Optimizer], 1)
PHP_ADD_EXTENSION_DEP(opcache, pcre)

15
packages/php/ext-opcache-jit-Makefile.frag.patch
View File

@ -1,11 +1,12 @@
--- ./ext/opcache/jit/Makefile.frag 2021-10-19 16:01:52.000000000 +0530
+++ ./ext/opcache/jit/Makefile.frag.mod 2021-11-04 21:30:56.583161008 +0530
diff -uNr php-8.1.0/ext/opcache/jit/Makefile.frag php-8.1.0.mod/ext/opcache/jit/Makefile.frag
--- php-8.1.0/ext/opcache/jit/Makefile.frag 2021-11-24 00:26:11.000000000 +0530
+++ php-8.1.0.mod/ext/opcache/jit/Makefile.frag 2021-11-26 11:15:42.403462811 +0530
@@ -3,7 +3,7 @@
$(CC) $(srcdir)/jit/dynasm/minilua.c -lm -o $@
$(BUILD_CC) $(srcdir)/jit/dynasm/minilua.c -lm -o $@
$(builddir)/jit/zend_jit_x86.c: $(srcdir)/jit/zend_jit_x86.dasc $(srcdir)/jit/dynasm/*.lua $(builddir)/minilua
- $(builddir)/minilua $(srcdir)/jit/dynasm/dynasm.lua $(DASM_FLAGS) -o $@ $(srcdir)/jit/zend_jit_x86.dasc
+ $(NATIVE_MINILUA_EXECUTABLE) $(srcdir)/jit/dynasm/dynasm.lua $(DASM_FLAGS) -o $@ $(srcdir)/jit/zend_jit_x86.dasc
$(builddir)/jit/zend_jit_$(DASM_ARCH).c: $(srcdir)/jit/zend_jit_$(DASM_ARCH).dasc $(srcdir)/jit/dynasm/*.lua $(builddir)/minilua
- $(builddir)/minilua $(srcdir)/jit/dynasm/dynasm.lua $(DASM_FLAGS) -o $@ $(srcdir)/jit/zend_jit_$(DASM_ARCH).dasc
+ $(NATIVE_MINILUA_EXECUTABLE) $(srcdir)/jit/dynasm/dynasm.lua $(DASM_FLAGS) -o $@ $(srcdir)/jit/zend_jit_$(DASM_ARCH).dasc
$(builddir)/jit/zend_jit.lo: \
$(builddir)/jit/zend_jit_x86.c \
$(builddir)/jit/zend_jit_$(DASM_ARCH).c \

19
packages/php/ext-standard-proc_open.c.patch
View File

@ -1,14 +1,15 @@
--- ext/standard/proc_open.c.orig 2019-12-28 22:27:36.923774794 +0000
+++ ./ext/standard/proc_open.c 2019-12-28 22:28:31.914719970 +0000
@@ -1048,9 +1048,9 @@
execvp(command, argv);
diff -uNr php-8.1.0/ext/standard/proc_open.c php-8.1.0.mod/ext/standard/proc_open.c
--- php-8.1.0/ext/standard/proc_open.c 2021-11-23 19:56:11.000000000 +0100
+++ php-8.1.0.mod/ext/standard/proc_open.c 2021-11-26 05:56:50.783986679 +0100
@@ -1208,9 +1208,9 @@
execvp(ZSTR_VAL(command_str), argv);
} else {
if (env.envarray) {
- execle("/bin/sh", "sh", "-c", command, NULL, env.envarray);
+ execle("@TERMUX_PREFIX@/bin/sh", "sh", "-c", command, NULL, env.envarray);
- execle("/bin/sh", "sh", "-c", ZSTR_VAL(command_str), NULL, env.envarray);
+ execle("@TERMUX_PREFIX@/bin/sh", "sh", "-c", ZSTR_VAL(command_str), NULL, env.envarray);
} else {
- execl("/bin/sh", "sh", "-c", command, NULL);
+ execl("@TERMUX_PREFIX@/bin/sh", "sh", "-c", command, NULL);
- execl("/bin/sh", "sh", "-c", ZSTR_VAL(command_str), NULL);
+ execl("@TERMUX_PREFIX@/bin/sh", "sh", "-c", ZSTR_VAL(command_str), NULL);
}
}
_exit(127);

53
packages/php/fix-gd-constants.patch
View File

@ -1,53 +0,0 @@
Source https://github.com/php/php-src/pull/7490
diff --git a/ext/gd/gd.c b/ext/gd/gd.c
index 287cb2f712f8..880d6dddc7d7 100644
--- a/ext/gd/gd.c
+++ b/ext/gd/gd.c
@@ -88,10 +88,10 @@
#define M_PI 3.14159265358979323846
#endif
-/* workaround typo in system libgd 2.3.0 */
-#if defined(GD_FLIP_HORINZONTAL) && !defined(GD_FLIP_HORIZONTAL)
-#define GD_FLIP_HORIZONTAL GD_FLIP_HORINZONTAL
-#endif
+/* don't used libgd constants, not used, so going to be removed */
+#define PHP_GD_FLIP_HORIZONTAL 1
+#define PHP_GD_FLIP_VERTICAL 2
+#define PHP_GD_FLIP_BOTH 3
#ifdef HAVE_GD_FREETYPE
static void php_imagettftext_common(INTERNAL_FUNCTION_PARAMETERS, int);
@@ -400,9 +400,9 @@ PHP_MINIT_FUNCTION(gd)
/* GD2 image format types */
REGISTER_LONG_CONSTANT("IMG_GD2_RAW", GD2_FMT_RAW, CONST_CS | CONST_PERSISTENT);
REGISTER_LONG_CONSTANT("IMG_GD2_COMPRESSED", GD2_FMT_COMPRESSED, CONST_CS | CONST_PERSISTENT);
- REGISTER_LONG_CONSTANT("IMG_FLIP_HORIZONTAL", GD_FLIP_HORIZONTAL, CONST_CS | CONST_PERSISTENT);
- REGISTER_LONG_CONSTANT("IMG_FLIP_VERTICAL", GD_FLIP_VERTICAL, CONST_CS | CONST_PERSISTENT);
- REGISTER_LONG_CONSTANT("IMG_FLIP_BOTH", GD_FLIP_BOTH, CONST_CS | CONST_PERSISTENT);
+ REGISTER_LONG_CONSTANT("IMG_FLIP_HORIZONTAL", PHP_GD_FLIP_HORIZONTAL, CONST_CS | CONST_PERSISTENT);
+ REGISTER_LONG_CONSTANT("IMG_FLIP_VERTICAL", PHP_GD_FLIP_VERTICAL, CONST_CS | CONST_PERSISTENT);
+ REGISTER_LONG_CONSTANT("IMG_FLIP_BOTH", PHP_GD_FLIP_BOTH, CONST_CS | CONST_PERSISTENT);
REGISTER_LONG_CONSTANT("IMG_EFFECT_REPLACE", gdEffectReplace, CONST_CS | CONST_PERSISTENT);
REGISTER_LONG_CONSTANT("IMG_EFFECT_ALPHABLEND", gdEffectAlphaBlend, CONST_CS | CONST_PERSISTENT);
REGISTER_LONG_CONSTANT("IMG_EFFECT_NORMAL", gdEffectNormal, CONST_CS | CONST_PERSISTENT);
@@ -3599,15 +3599,15 @@ PHP_FUNCTION(imageflip)
im = php_gd_libgdimageptr_from_zval_p(IM);
switch (mode) {
- case GD_FLIP_VERTICAL:
+ case PHP_GD_FLIP_VERTICAL:
gdImageFlipVertical(im);
break;
- case GD_FLIP_HORIZONTAL:
+ case PHP_GD_FLIP_HORIZONTAL:
gdImageFlipHorizontal(im);
break;
- case GD_FLIP_BOTH:
+ case PHP_GD_FLIP_BOTH:
gdImageFlipBoth(im);
break;