| 1 |
commit: d700bd2e4b7ab2dd6874044ce2e60495dc1f1075 |
| 2 |
Author: Brian Evans <grknight <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Oct 25 15:03:27 2018 +0000 |
| 4 |
Commit: Brian Evans <grknight <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Oct 25 15:03:27 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d700bd2e |
| 7 |
|
| 8 |
dev-lang/php: Always call elibtoolize |
| 9 |
|
| 10 |
Certain functions of external commands, like pecl, may use an older |
| 11 |
libtool which is included with PHP. |
| 12 |
|
| 13 |
Now we always have an updated ltmain.sh by calling elibtoolize |
| 14 |
|
| 15 |
Bug: https://bugs.gentoo.org/669566 |
| 16 |
Signed-off-by: Brian Evans <grknight <AT> gentoo.org> |
| 17 |
Package-Manager: Portage-2.3.51, Repoman-2.3.11 |
| 18 |
|
| 19 |
dev-lang/php/php-7.1.23.ebuild | 7 ++++++- |
| 20 |
dev-lang/php/php-7.2.11.ebuild | 7 ++++++- |
| 21 |
dev-lang/php/php-7.3.0_rc3.ebuild | 7 ++++++- |
| 22 |
3 files changed, 18 insertions(+), 3 deletions(-) |
| 23 |
|
| 24 |
diff --git a/dev-lang/php/php-7.1.23.ebuild b/dev-lang/php/php-7.1.23.ebuild |
| 25 |
index 4f54e9a7a85..b5d12b4aed6 100644 |
| 26 |
--- a/dev-lang/php/php-7.1.23.ebuild |
| 27 |
+++ b/dev-lang/php/php-7.1.23.ebuild |
| 28 |
@@ -3,7 +3,7 @@ |
| 29 |
|
| 30 |
EAPI=6 |
| 31 |
|
| 32 |
-inherit flag-o-matic eapi7-ver systemd |
| 33 |
+inherit flag-o-matic eapi7-ver systemd autotools |
| 34 |
|
| 35 |
DESCRIPTION="The PHP language runtime engine" |
| 36 |
HOMEPAGE="https://secure.php.net/" |
| 37 |
@@ -219,6 +219,11 @@ src_prepare() { |
| 38 |
sed -i "s~^include=.*$~include=${PHP_INI_DIR}/fpm.d/*.conf~" \ |
| 39 |
sapi/fpm/php-fpm.conf.in \ |
| 40 |
|| die 'failed to move the include directory in php-fpm.conf' |
| 41 |
+ |
| 42 |
+ # Bug 669566 - necessary so that build tools are updated for commands like pecl |
| 43 |
+ # Force rebuilding aclocal.m4 |
| 44 |
+ rm -f aclocal.m4 || die "failed to remove aclocal.m4 in src_prepare" |
| 45 |
+ eautoreconf |
| 46 |
} |
| 47 |
|
| 48 |
src_configure() { |
| 49 |
|
| 50 |
diff --git a/dev-lang/php/php-7.2.11.ebuild b/dev-lang/php/php-7.2.11.ebuild |
| 51 |
index 761d9460704..818e210d1a5 100644 |
| 52 |
--- a/dev-lang/php/php-7.2.11.ebuild |
| 53 |
+++ b/dev-lang/php/php-7.2.11.ebuild |
| 54 |
@@ -3,7 +3,7 @@ |
| 55 |
|
| 56 |
EAPI=6 |
| 57 |
|
| 58 |
-inherit flag-o-matic eapi7-ver systemd |
| 59 |
+inherit flag-o-matic eapi7-ver systemd autotools |
| 60 |
|
| 61 |
DESCRIPTION="The PHP language runtime engine" |
| 62 |
HOMEPAGE="https://secure.php.net/" |
| 63 |
@@ -224,6 +224,11 @@ src_prepare() { |
| 64 |
sed -i "s~^include=.*$~include=${PHP_INI_DIR}/fpm.d/*.conf~" \ |
| 65 |
sapi/fpm/php-fpm.conf.in \ |
| 66 |
|| die 'failed to move the include directory in php-fpm.conf' |
| 67 |
+ |
| 68 |
+ # Bug 669566 - necessary so that build tools are updated for commands like pecl |
| 69 |
+ # Force rebuilding aclocal.m4 |
| 70 |
+ rm -f aclocal.m4 || die "failed to remove aclocal.m4 in src_prepare" |
| 71 |
+ eautoreconf |
| 72 |
} |
| 73 |
|
| 74 |
src_configure() { |
| 75 |
|
| 76 |
diff --git a/dev-lang/php/php-7.3.0_rc3.ebuild b/dev-lang/php/php-7.3.0_rc3.ebuild |
| 77 |
index 38dbc82aca6..865dac62201 100644 |
| 78 |
--- a/dev-lang/php/php-7.3.0_rc3.ebuild |
| 79 |
+++ b/dev-lang/php/php-7.3.0_rc3.ebuild |
| 80 |
@@ -3,7 +3,7 @@ |
| 81 |
|
| 82 |
EAPI=6 |
| 83 |
|
| 84 |
-inherit flag-o-matic eapi7-ver systemd |
| 85 |
+inherit flag-o-matic eapi7-ver systemd autotools |
| 86 |
|
| 87 |
MY_PV=${PV/_rc/RC} |
| 88 |
DESCRIPTION="The PHP language runtime engine" |
| 89 |
@@ -226,6 +226,11 @@ src_prepare() { |
| 90 |
sed -i "s~^include=.*$~include=${PHP_INI_DIR}/fpm.d/*.conf~" \ |
| 91 |
sapi/fpm/php-fpm.conf.in \ |
| 92 |
|| die 'failed to move the include directory in php-fpm.conf' |
| 93 |
+ |
| 94 |
+ # Bug 669566 - necessary so that build tools are updated for commands like pecl |
| 95 |
+ # Force rebuilding aclocal.m4 |
| 96 |
+ rm -f aclocal.m4 || die "failed to remove aclocal.m4 in src_prepare" |
| 97 |
+ eautoreconf |
| 98 |
} |
| 99 |
|
| 100 |
src_configure() { |
Archives