| 1 |
commit: 0e50178a73252a9d0b4445fe82b25ddb663799e2 |
| 2 |
Author: Michael Orlitzky <mjo <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Sep 2 18:31:58 2015 +0000 |
| 4 |
Commit: Michael Orlitzky <mjo <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Sep 2 19:34:30 2015 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0e50178a |
| 7 |
|
| 8 |
php-ext-source-r2.eclass: fix WANT_AUTO{CONF,MAKE} warnings. |
| 9 |
|
| 10 |
This is a real fix for the warnings like, |
| 11 |
|
| 12 |
ac-wrapper: warning: invalid WANT_AUTOCONF 'latest'; ignoring. |
| 13 |
|
| 14 |
reported in bugs #329071 and #549268. In the first of the two, vapier |
| 15 |
suggested running $PHPIZE through the autotools_run_tool wrapper, but |
| 16 |
this caused builds to fail. In bug #329071, that's where the story |
| 17 |
ends. |
| 18 |
|
| 19 |
It turns out, the build failures were due to $PHPIZE containing an |
| 20 |
absolute path. Vapier fixed the path handling in autotools.eclass |
| 21 |
(commit ecd9954), so now we are able to fix this properly in |
| 22 |
php-ext-source-r2.eclass. |
| 23 |
|
| 24 |
Bug: 329071 |
| 25 |
Bug: 549268 |
| 26 |
|
| 27 |
eclass/php-ext-source-r2.eclass | 8 ++++---- |
| 28 |
1 file changed, 4 insertions(+), 4 deletions(-) |
| 29 |
|
| 30 |
diff --git a/eclass/php-ext-source-r2.eclass b/eclass/php-ext-source-r2.eclass |
| 31 |
index ad82fee..de04661 100644 |
| 32 |
--- a/eclass/php-ext-source-r2.eclass |
| 33 |
+++ b/eclass/php-ext-source-r2.eclass |
| 34 |
@@ -129,10 +129,10 @@ php-ext-source-r2_src_prepare() { |
| 35 |
# Runs phpize and autotools in addition to the standard src_unpack |
| 36 |
php-ext-source-r2_phpize() { |
| 37 |
if [[ "${PHP_EXT_SKIP_PHPIZE}" != 'yes' ]] ; then |
| 38 |
- # Create configure out of config.m4 |
| 39 |
- # I wish I could run this to solve #329071, but I cannot |
| 40 |
- #autotools_run_tool ${PHPIZE} |
| 41 |
- ${PHPIZE} |
| 42 |
+ # Create configure out of config.m4. We use autotools_run_tool |
| 43 |
+ # to avoid some warnings about WANT_AUTOCONF and |
| 44 |
+ # WANT_AUTOMAKE (see bugs #329071 and #549268). |
| 45 |
+ autotools_run_tool ${PHPIZE} |
| 46 |
# force run of libtoolize and regeneration of related autotools |
| 47 |
# files (bug 220519) |
| 48 |
rm aclocal.m4 |
Archives