| 1 |
commit: d021621e343e8f247c92e48c00dc3f604299928d |
| 2 |
Author: Brian Evans <grknight <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Sep 17 17:40:33 2019 +0000 |
| 4 |
Commit: Brian Evans <grknight <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Sep 17 17:40:33 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d021621e |
| 7 |
|
| 8 |
dev-lang/php: Emulate PHP ./buildconf in PHP 7.4 |
| 9 |
|
| 10 |
Upstream has changed how macros are defined by the autoconf system |
| 11 |
This breaks eautoreconf with latest libtool. |
| 12 |
Previously we attempted to copy in new libtool, but this breaks external |
| 13 |
extensions. Instead, do what upstream expects using our own tools |
| 14 |
to ensure cross-compliation support. |
| 15 |
|
| 16 |
Package-Manager: Portage-2.3.76, Repoman-2.3.17 |
| 17 |
Signed-off-by: Brian Evans <grknight <AT> gentoo.org> |
| 18 |
|
| 19 |
dev-lang/php/php-7.4.0_rc1.ebuild | 8 +++++--- |
| 20 |
1 file changed, 5 insertions(+), 3 deletions(-) |
| 21 |
|
| 22 |
diff --git a/dev-lang/php/php-7.4.0_rc1.ebuild b/dev-lang/php/php-7.4.0_rc1.ebuild |
| 23 |
index 4c04d93e4d4..fafdcb64e83 100644 |
| 24 |
--- a/dev-lang/php/php-7.4.0_rc1.ebuild |
| 25 |
+++ b/dev-lang/php/php-7.4.0_rc1.ebuild |
| 26 |
@@ -218,9 +218,11 @@ src_prepare() { |
| 27 |
sapi/fpm/php-fpm.conf.in \ |
| 28 |
|| die 'failed to move the include directory in php-fpm.conf' |
| 29 |
|
| 30 |
- # Bug 669566 - necessary so that build tools are updated for commands like pecl |
| 31 |
- cp "${BROOT}/usr/share/aclocal/libtool.m4" build/ || die |
| 32 |
- eautoreconf |
| 33 |
+ # Emulate buildconf to support cross-compilation |
| 34 |
+ rm -fr aclocal.m4 autom4te.cache config.cache \ |
| 35 |
+ configure main/php_config.h.in || die |
| 36 |
+ eautoconf --force |
| 37 |
+ eautoheader |
| 38 |
} |
| 39 |
|
| 40 |
src_configure() { |
Archives