Browse Source

php: Update from 7.1.6 to 7.1.7, fix aarch64 issue

Backport 8c8679207a
which fixes https://github.com/termux/termux-packages/issues/890 (and
possibly other issues).
android-5
Fredrik Fornwall 8 years ago
parent
commit
e907179689
  1. 18
      packages/php/Zend-zend_multiply.h.patch
  2. 8
      packages/php/build.sh

18
packages/php/Zend-zend_multiply.h.patch

@ -0,0 +1,18 @@
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)

8
packages/php/build.sh

@ -1,18 +1,14 @@
TERMUX_PKG_HOMEPAGE=https://php.net
TERMUX_PKG_DESCRIPTION="Server-side, HTML-embedded scripting language"
TERMUX_PKG_VERSION=7.1.6
TERMUX_PKG_REVISION=1
TERMUX_PKG_VERSION=7.1.7
TERMUX_PKG_SRCURL=http://www.php.net/distributions/php-${TERMUX_PKG_VERSION}.tar.xz
TERMUX_PKG_SHA256=01584dc521ab7ec84b502b61952f573652fe6aa00c18d6d844fb9209f14b245b
TERMUX_PKG_SHA256=0d42089729be7b2bb0308cbe189c2782f9cb4b07078c8a235495be5874fff729
# 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:
TERMUX_PKG_EXTRA_HOSTBUILD_CONFIGURE_ARGS="--disable-libxml --disable-dom --disable-simplexml --disable-xml --disable-xmlreader --disable-xmlwriter --without-pear"
TERMUX_PKG_DEPENDS="libandroid-glob, libxml2, liblzma, openssl, pcre, libbz2, libcrypt, libcurl, libgd, readline, freetype"
TERMUX_PKG_RM_AFTER_INSTALL="php/php/fpm"
# Building with clang causes gettype(-1) to return "double" instead of "integer".
# See https://github.com/termux/termux-packages/issues/890
TERMUX_PKG_CLANG=no
TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
ac_cv_func_res_nsearch=no

Loading…
Cancel
Save