diff options
-rw-r--r-- | testing/php7/APKBUILD | 21 | ||||
-rw-r--r-- | testing/php7/fix-x86-build-bug_571658.patch | 51 |
2 files changed, 63 insertions, 9 deletions
diff --git a/testing/php7/APKBUILD b/testing/php7/APKBUILD index f5cfc82d8c..77b5de651f 100644 --- a/testing/php7/APKBUILD +++ b/testing/php7/APKBUILD @@ -8,7 +8,7 @@ pkgdesc="The PHP language runtime engine - 7th branch" url="http://www.php.net/" arch="all" license="PHP-3" -options="textrels" +options="" depends="$pkgname-common" depends_dom="$pkgname-xml" depends_mysqlnd="$pkgname-mysqli" @@ -19,11 +19,11 @@ depends_xmlreader="$pkgname-dom" depends_xmlrpc="$pkgname-xml" depends_xsl="$pkgname-dom" makedepends="autoconf bison re2c apache2-dev libxml2-dev libxslt-dev libzip-dev bzip2-dev zlib-dev - xmlrpc-epi-dev aspell-dev enchant-dev expat-dev pcre-dev curl-dev gmp-dev icu-dev imap-dev + aspell-dev enchant-dev expat-dev pcre-dev curl-dev gmp-dev icu-dev imap-dev libical-dev openssl-dev openldap-dev net-snmp-dev db-dev krb5-dev gdbm-dev sqlite-dev freetds-dev mariadb-dev postgresql-dev unixodbc-dev freetype-dev tidyhtml-dev libxpm-dev - libpng-dev libwebp-dev libjpeg-turbo-dev libmcrypt-dev libmbfl-dev gsoap-dev recode-dev - readline-dev mhash-dev paxmark gettext-dev + libpng-dev libwebp-dev libjpeg-turbo-dev libmcrypt-dev gsoap-dev recode-dev + readline-dev paxmark gettext-dev " source="http://php.net/distributions/$_pkgreal-$pkgver.tar.bz2 $pkgname-fpm.initd @@ -33,6 +33,7 @@ source="http://php.net/distributions/$_pkgreal-$pkgver.tar.bz2 tidy-buffio.patch includedir.patch pid_log.patch + fix-x86-build-bug_571658.patch " builddir="$srcdir/$_pkgreal-$pkgver" @@ -102,14 +103,13 @@ _build() { --with-freetype-dir=shared --enable-gd-native-ttf --enable-gd-jis-conv \ --with-gettext=shared \ --with-gmp=shared \ - --with-mhash=shared \ --with-iconv=shared \ --with-imap=shared --with-imap-ssl \ --enable-intl=shared --with-icu-dir=/usr \ --enable-json=shared \ --enable-libxml=shared --with-libxml-dir=shared --with-libexpat-dir=shared \ --with-ldap=shared --with-ldap-sasl \ - --enable-mbstring=shared --enable-mbregex --with-libmbfl \ + --enable-mbstring=shared --enable-mbregex \ --with-mcrypt=shared \ --with-sqlite3=shared,/usr --with-pdo-sqlite=shared,/usr \ --with-pdo-dblib=shared \ @@ -348,7 +348,8 @@ a340f27e83ed4482d2fbb98658ef71cb php7-fpm.initd 483bc0a85c50a9a9aedbe14a19ed4526 install-pear.patch 66f0037a029f9eed2b31d2e1d50f1860 tidy-buffio.patch d872e633c9b33c3c9f629dd2edd2e5c5 includedir.patch -6ba762ab7a105163b8e5b3913deae109 pid_log.patch" +6ba762ab7a105163b8e5b3913deae109 pid_log.patch +0c066f4c7f6cbc2e26379ce565197d26 fix-x86-build-bug_571658.patch" sha256sums="8055bbe5a736986931c0c6a08b765d6d778271ec7d2d56c50a1ad259ec09f6de php-7.0.10.tar.bz2 eca59e8b0498c1c93b35f9a5109ae56d0cda9d94822727d689371ccad31b3615 php7-fpm.initd 6e4406f21b69085714cdb9d9a67c08e27a1c737ab353f9813cb2fc268352d2c6 php7-fpm.logrotate @@ -356,7 +357,8 @@ eca59e8b0498c1c93b35f9a5109ae56d0cda9d94822727d689371ccad31b3615 php7-fpm.initd f739ca427a1dd53a388bad0823565299c5d4a5796b1171b892884e4d7d099bab install-pear.patch 5dc8f32e5e2b1cd6317ada5a5adb9b5f0802ed6e0dbe065d7bfcc0f55d47e0d5 tidy-buffio.patch ea74966a23b1b54548ee35e9ccc2fc8d2b7c2285c385c44d6b23d9e2f25ea1a7 includedir.patch -0cca8729c64682387a8c44ed74f0966da697f2817152d8d05bb25bedc7eaafec pid_log.patch" +0cca8729c64682387a8c44ed74f0966da697f2817152d8d05bb25bedc7eaafec pid_log.patch +64480b65408caaa98af045270337dc074274a8b98b6a1a853df5d21af426d61e fix-x86-build-bug_571658.patch" sha512sums="521ba5f57c1dbd8c8b7c0c2839e7054cce192f6688fd0f6f98bb30802a3bf2990ea3843fd366a18d20960797bd8ff410819847cae5717ec605674fb8a910e0e9 php-7.0.10.tar.bz2 89076ab8e170a8f886b88bb30aa3e6a6b4463155a18ea53485cc9e3898c81afa3d01fb8403d28a45dc1680f09c645c2d81d8272bc8b9c7ced41e59b0ba226216 php7-fpm.initd cacce7bf789467ff40647b7319e3760c6c587218720538516e8d400baa75651f72165c4e28056cd0c1dc89efecb4d00d0d7823bed80b29136262c825ce816691 php7-fpm.logrotate @@ -364,4 +366,5 @@ fbf9a1572d37370ec0d126502e1d066e045a992484d8fc4f1e2ede330134c1a15f4029f29fa4daeb f1177cbf6b1f44402f421c3d317aab1a2a40d0b1209c11519c1158df337c8945f3a313d689c939768584f3e4edbe52e8bd6103fb6777462326a9d94e8ab1f505 install-pear.patch 6894c9cba7752a3406e774d9efc0e058c37433493c1c20101e9563bf247c112157a67e306b06b9517b0422eca521f543d637a6cbd2cea7639e43f13d773b3d2b tidy-buffio.patch 199aecdbd3b4035aabf5379c215f82412d3c98b79a1ee186944e7fe1f0ed6f40789ea30e2355149491de6be34fc66c5e486e2a79a7e41ab2ae18706ef3ffe79b includedir.patch -82231c7b27b4d044272857dc713674884715ed8e36e54be06faa5d2a949ba4bca597628958a9c5683ec51c36e05a00f6be811c7e95112b0314c98528f584a8d6 pid_log.patch" +82231c7b27b4d044272857dc713674884715ed8e36e54be06faa5d2a949ba4bca597628958a9c5683ec51c36e05a00f6be811c7e95112b0314c98528f584a8d6 pid_log.patch +644c12a5f6d63351b71d18033e2cfeeb78f59427fb0a68fced29e1417b4d46b9044ca0c524a89e9bb315b702bc1c2e76eca57a7b4f97626fa39c9537dcd32fc7 fix-x86-build-bug_571658.patch" diff --git a/testing/php7/fix-x86-build-bug_571658.patch b/testing/php7/fix-x86-build-bug_571658.patch new file mode 100644 index 0000000000..46f68b6865 --- /dev/null +++ b/testing/php7/fix-x86-build-bug_571658.patch @@ -0,0 +1,51 @@ +From 2fcc388d9bf238673ed84b8f38d7753279aea48c Mon Sep 17 00:00:00 2001 +From: Michael Orlitzky <michael@orlitzky.com> +Date: Thu, 4 Aug 2016 11:42:56 -0400 +Subject: [PATCH 1/1] Zend/zend_operators.h: disable x86 assembly on all newer + GCC-4.x. + +In bug 69896, a fix was committed to work around a build error: 'asm' +operand has impossible constraints, in zend_operators.h, on x86. At +the time, the problem was only visible with gcc-4.8, and the fix was +to disable that chunk of assembly for gcc-4.8. With gcc-4.9, the +problem persists, so we now need to check for gcc-4.9 (at least) in +addition to gcc-4.8. + +This commit modifies the earlier conditional that checks for +gcc-4.8. The existing check was for equality on the minor component of +the gcc version, namely 8. The == operator that performs the +comparison has been changed to <=, so that it catches any gcc-4.x with +x >= 8. This has been tested and fixes the build on x86 hardware with +gcc-4.9. + +PHP-Bug: 69896 +Gentoo-Bug: 571658 +--- + Zend/zend_operators.h | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/Zend/zend_operators.h b/Zend/zend_operators.h +index 3705022..dd7c354 100644 +--- a/Zend/zend_operators.h ++++ b/Zend/zend_operators.h +@@ -520,7 +520,7 @@ static zend_always_inline void fast_long_decrement_function(zval *op1) + + static zend_always_inline void fast_long_add_function(zval *result, zval *op1, zval *op2) + { +-#if defined(__GNUC__) && defined(__i386__) && !(4 == __GNUC__ && 8 == __GNUC_MINOR__) ++#if defined(__GNUC__) && defined(__i386__) && !(4 == __GNUC__ && 8 <= __GNUC_MINOR__) + __asm__( + "movl (%1), %%eax\n\t" + "addl (%2), %%eax\n\t" +@@ -606,7 +606,7 @@ static zend_always_inline int fast_add_function(zval *result, zval *op1, zval *o + + static zend_always_inline void fast_long_sub_function(zval *result, zval *op1, zval *op2) + { +-#if defined(__GNUC__) && defined(__i386__) && !(4 == __GNUC__ && 8 == __GNUC_MINOR__) ++#if defined(__GNUC__) && defined(__i386__) && !(4 == __GNUC__ && 8 <= __GNUC_MINOR__) + __asm__( + "movl (%1), %%eax\n\t" + "subl (%2), %%eax\n\t" +-- +2.7.3 + |