summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrian Evans <grknight@gentoo.org>2019-09-20 09:01:49 -0400
committerBrian Evans <grknight@gentoo.org>2019-09-20 09:01:49 -0400
commit807c50548fe64456d6b7373cb1091675faaa0501 (patch)
tree6ed28607ca10fa138aebd075f39bcc5824d80855 /eclass/php-ext-source-r3.eclass
parentnet-irc/unrealircd: x86 stable wrt bug #694950 (diff)
downloadgentoo-807c50548fe64456d6b7373cb1091675faaa0501.tar.gz
gentoo-807c50548fe64456d6b7373cb1091675faaa0501.tar.bz2
gentoo-807c50548fe64456d6b7373cb1091675faaa0501.zip
eclass: php-ext-source-r3 - Add support for building with PHP 7.4+
Signed-off-by: Brian Evans <grknight@gentoo.org>
Diffstat (limited to 'eclass/php-ext-source-r3.eclass')
-rw-r--r--eclass/php-ext-source-r3.eclass19
1 files changed, 14 insertions, 5 deletions
diff --git a/eclass/php-ext-source-r3.eclass b/eclass/php-ext-source-r3.eclass
index 5ef879a2be23..385bdb9dae0b 100644
--- a/eclass/php-ext-source-r3.eclass
+++ b/eclass/php-ext-source-r3.eclass
@@ -15,7 +15,8 @@ inherit autotools
EXPORT_FUNCTIONS src_prepare src_configure src_compile src_install src_test
case ${EAPI:-0} in
- 6|7) ;;
+ 6) inherit eapi7-ver ;;
+ 7) ;;
*)
die "${ECLASS} is not compatible with EAPI=${EAPI}"
esac
@@ -183,10 +184,18 @@ php-ext-source-r3_phpize() {
# WANT_AUTOMAKE (see bugs #329071 and #549268).
autotools_run_tool "${PHPIZE}"
- # Force libtoolize to run and regenerate autotools files (bug
- # #220519).
- rm aclocal.m4 || die "failed to remove aclocal.m4"
- eautoreconf
+ # PHP >=7.4 no longer works with eautoreconf
+ if ver_test $PHP_CURRENTSLOT -ge 7.4 ; then
+ rm -fr aclocal.m4 autom4te.cache config.cache \
+ configure main/php_config.h.in || die
+ eautoconf --force
+ eautoheader
+ else
+ # Force libtoolize to run and regenerate autotools files (bug
+ # #220519).
+ rm aclocal.m4 || die "failed to remove aclocal.m4"
+ eautoreconf
+ fi
fi
}