php: Update from 7.1.12 to 7.2.1
This commit is contained in:
parent
1af8ba0988
commit
6c2bf01c2b
|
@ -1,18 +0,0 @@
|
||||||
Backport of:
|
|
||||||
|
|
||||||
https://github.com/php/php-src/commit/8c8679207ae5ada8751288e75b78c928a4d34d1d
|
|
||||||
|
|
||||||
diff -u -r ../php-7.1.7/Zend/zend_multiply.h ./Zend/zend_multiply.h
|
|
||||||
--- ../php-7.1.7/Zend/zend_multiply.h 2017-07-06 11:30:11.000000000 +0200
|
|
||||||
+++ ./Zend/zend_multiply.h 2017-07-10 00:54:43.550300703 +0200
|
|
||||||
@@ -53,8 +53,8 @@
|
|
||||||
__asm__("mul %0, %2, %3\n" \
|
|
||||||
"smulh %1, %2, %3\n" \
|
|
||||||
"sub %1, %1, %0, asr #63\n" \
|
|
||||||
- : "=X"(__tmpvar), "=X"(usedval) \
|
|
||||||
- : "X"(a), "X"(b)); \
|
|
||||||
+ : "=&r"(__tmpvar), "=&r"(usedval) \
|
|
||||||
+ : "r"(a), "r"(b)); \
|
|
||||||
if (usedval) (dval) = (double) (a) * (double) (b); \
|
|
||||||
else (lval) = __tmpvar; \
|
|
||||||
} while (0)
|
|
|
@ -1,8 +1,7 @@
|
||||||
TERMUX_PKG_HOMEPAGE=https://php.net
|
TERMUX_PKG_HOMEPAGE=https://php.net
|
||||||
TERMUX_PKG_DESCRIPTION="Server-side, HTML-embedded scripting language"
|
TERMUX_PKG_DESCRIPTION="Server-side, HTML-embedded scripting language"
|
||||||
TERMUX_PKG_VERSION=7.1.12
|
TERMUX_PKG_VERSION=7.2.1
|
||||||
TERMUX_PKG_REVISION=1
|
TERMUX_PKG_SHA256=6c6cf82fda6660ed963821eb0525214bb3547e8e29f447b9c15b2d8e6efd8822
|
||||||
TERMUX_PKG_SHA256=a0118850774571b1f2d4e30b4fe7a4b958ca66f07d07d65ebdc789c54ba6eeb3
|
|
||||||
TERMUX_PKG_SRCURL=http://www.php.net/distributions/php-${TERMUX_PKG_VERSION}.tar.xz
|
TERMUX_PKG_SRCURL=http://www.php.net/distributions/php-${TERMUX_PKG_VERSION}.tar.xz
|
||||||
# Build native php for phar to build (see pear-Makefile.frag.patch):
|
# Build native php for phar to build (see pear-Makefile.frag.patch):
|
||||||
TERMUX_PKG_HOSTBUILD=true
|
TERMUX_PKG_HOSTBUILD=true
|
||||||
|
|
|
@ -0,0 +1,12 @@
|
||||||
|
diff -u -r ../php-7.2.1/ext/sockets/sockets.c ./ext/sockets/sockets.c
|
||||||
|
--- ../php-7.2.1/ext/sockets/sockets.c 2018-01-02 23:36:00.000000000 +0100
|
||||||
|
+++ ./ext/sockets/sockets.c 2018-01-08 16:39:57.150438080 +0100
|
||||||
|
@@ -796,7 +796,7 @@
|
||||||
|
REGISTER_LONG_CONSTANT("AI_ALL", AI_ALL, CONST_CS | CONST_PERSISTENT);
|
||||||
|
#endif
|
||||||
|
REGISTER_LONG_CONSTANT("AI_ADDRCONFIG", AI_ADDRCONFIG, CONST_CS | CONST_PERSISTENT);
|
||||||
|
-#ifdef __USE_GNU
|
||||||
|
+#if defined(__USE_GNU) && !defined(__ANDROID__)
|
||||||
|
REGISTER_LONG_CONSTANT("AI_IDN", AI_IDN, CONST_CS | CONST_PERSISTENT);
|
||||||
|
REGISTER_LONG_CONSTANT("AI_CANONIDN", AI_CANONIDN, CONST_CS | CONST_PERSISTENT);
|
||||||
|
REGISTER_LONG_CONSTANT("AI_IDN_ALLOW_UNASSIGNED", AI_IDN_ALLOW_UNASSIGNED, CONST_CS | CONST_PERSISTENT);
|
Loading…
Reference in New Issue