diff options
| author |   Gregory M. Tuner <gmt@be-evil.net> | 2014-06-05 02:21:16 -0700 |
|---|---|---|
| committer | Gregory M. Tuner <gmt@be-evil.net> | 2014-06-05 02:21:16 -0700 |
| commit | 781e60cd2cc47f8d86e3744b0dcbc21b2bb7fd8f (patch) | |
| tree | c96da40ba6853eb675343f34e64eac6bab6a3213 /eclass | |
| parent | eclass/multilib-build: correctly handle missing wrapped headers (diff) | |
| download | gmt-781e60cd2cc47f8d86e3744b0dcbc21b2bb7fd8f.tar.gz gmt-781e60cd2cc47f8d86e3744b0dcbc21b2bb7fd8f.tar.bz2 gmt-781e60cd2cc47f8d86e3744b0dcbc21b2bb7fd8f.zip | |
eclass/autotools: sync with upstream
Signed-off-by: Gregory M. Tuner <gmt@be-evil.net>
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/autotools.eclass | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/eclass/autotools.eclass b/eclass/autotools.eclass index 20bf159..235c22f 100644 --- a/eclass/autotools.eclass +++ b/eclass/autotools.eclass @@ -46,7 +46,7 @@ inherit ehooker libtool multiprocessing # Do NOT change this variable in your ebuilds! # If you want to force a newer minor version, you can specify the correct # WANT value by using a colon: <PV>:<WANT_AUTOMAKE> -_LATEST_AUTOMAKE=( 1.12:1.12 1.13:1.13 ) +_LATEST_AUTOMAKE=( 1.13:1.13 1.14:1.14 ) _automake_atom="sys-devel/automake" _autoconf_atom="sys-devel/autoconf" @@ -90,7 +90,12 @@ if [[ -n ${WANT_LIBTOOL} ]] ; then export WANT_LIBTOOL fi -AUTOTOOLS_DEPEND="${_automake_atom} ${_autoconf_atom} ${_libtool_atom}" +# Force people (nicely) to upgrade to a newer version of gettext as +# older ones are known to be crappy. #496454 +AUTOTOOLS_DEPEND="!<sys-devel/gettext-0.18.1.1-r3 + ${_automake_atom} + ${_autoconf_atom} + ${_libtool_atom}" RDEPEND="" # @ECLASS-VARIABLE: AUTOTOOLS_AUTO_DEPEND @@ -216,8 +221,8 @@ eautoreconf() { if [[ ${AT_NOELIBTOOLIZE} != "yes" ]] ; then # Call it here to prevent failures due to elibtoolize called _before_ - # eautoreconf. We set $S because elibtoolize runs on that #265319 - S=${PWD} elibtoolize --force + # eautoreconf. + elibtoolize --force "${PWD}" fi if [[ -n ${multitop} ]] ; then @@ -386,8 +391,8 @@ eautomake() { # Older versions of automake do not support --force-missing. But we want # to use this whenever possible to update random bundled files #133489. case $(_automake_version) in - 1.4|1.4[.-]*) ;; - *) extra_opts+=( --force-missing ) ;; + 1.4|1.4[.-]*) ;; + *) extra_opts+=( --force-missing ) ;; esac autotools_run_tool automake --add-missing --copy "${extra_opts[@]}" "$@" |