diff options
| author | Thomas Petazzoni <thomas.petazzoni@bootlin.com> | 2018-04-05 21:50:37 +0200 |
|---|---|---|
| committer | Thomas Petazzoni <thomas.petazzoni@bootlin.com> | 2018-04-15 22:05:46 +0200 |
| commit | 56f39e81ac0e00a0004cdbebe0ca0e2501bbdfd9 (patch) | |
| tree | 630fffb59f7adff8bc1334051361b3bf163eb800 | |
| parent | 33946320e57c1f79bb2fa7d33bc10f25006efdc0 (diff) | |
| download | buildroot-56f39e81ac0e00a0004cdbebe0ca0e2501bbdfd9.tar.gz buildroot-56f39e81ac0e00a0004cdbebe0ca0e2501bbdfd9.zip | |
php: remove Blackfin patch
And renumber remaining patches.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
| -rw-r--r-- | package/php/0006-Call-apxs-with-correct-prefix.patch (renamed from package/php/0007-Call-apxs-with-correct-prefix.patch) | 0 | ||||
| -rw-r--r-- | package/php/0006-avoid-bfin-gcc-segfault.patch | 17 | ||||
| -rw-r--r-- | package/php/0007-main-php_ini.c-build-empty-php_load_zend_extension_c.patch (renamed from package/php/0008-main-php_ini.c-build-empty-php_load_zend_extension_c.patch) | 0 |
3 files changed, 0 insertions, 17 deletions
diff --git a/package/php/0007-Call-apxs-with-correct-prefix.patch b/package/php/0006-Call-apxs-with-correct-prefix.patch index c81711d2a0..c81711d2a0 100644 --- a/package/php/0007-Call-apxs-with-correct-prefix.patch +++ b/package/php/0006-Call-apxs-with-correct-prefix.patch diff --git a/package/php/0006-avoid-bfin-gcc-segfault.patch b/package/php/0006-avoid-bfin-gcc-segfault.patch deleted file mode 100644 index 7f8cb24e7a..0000000000 --- a/package/php/0006-avoid-bfin-gcc-segfault.patch +++ /dev/null @@ -1,17 +0,0 @@ -Avoid gcc segmentation fault - -Signed-off-by: Waldemar Brodkorb <wbx@openadk.org> -Signed-off-by: Adam Duskett <aduskett@gmail.com> -[aduskett@gmail.com: Update for 7.2.2] -diff -Nur php-7.0.12.orig/Zend/zend_portability.h php-7.0.12/Zend/zend_portability.h ---- php-7.0.12.orig/Zend/zend_portability.h 2016-10-13 16:04:17.000000000 +0200 -+++ php-7.0.12/Zend/zend_portability.h 2016-11-08 02:49:39.118388999 +0100 -@@ -95,7 +95,7 @@ - - #if defined(ZEND_WIN32) && !defined(__clang__) - # define ZEND_ASSUME(c) __assume(c) --#elif ((defined(__GNUC__) && ZEND_GCC_VERSION >= 4005) || __has_builtin(__builtin_unreachable)) && PHP_HAVE_BUILTIN_EXPECT -+#elif ((defined(__GNUC__) && ZEND_GCC_VERSION >= 4005) || __has_builtin(__builtin_unreachable)) && PHP_HAVE_BUILTIN_EXPECT && !defined(__bfin__) - # define ZEND_ASSUME(c) do { \ - if (__builtin_expect(!(c), 0)) __builtin_unreachable(); \ - } while (0) diff --git a/package/php/0008-main-php_ini.c-build-empty-php_load_zend_extension_c.patch b/package/php/0007-main-php_ini.c-build-empty-php_load_zend_extension_c.patch index bc5149d1d6..bc5149d1d6 100644 --- a/package/php/0008-main-php_ini.c-build-empty-php_load_zend_extension_c.patch +++ b/package/php/0007-main-php_ini.c-build-empty-php_load_zend_extension_c.patch |
