diff options
| author |   Pacho Ramos <pacho@gentoo.org> | 2017-01-15 17:27:05 +0100 |
|---|---|---|
| committer | Pacho Ramos <pacho@gentoo.org> | 2017-01-15 17:44:33 +0100 |
| commit | 55e47da74f04b8f6dcafbc735e68f2066d7bfd25 (patch) | |
| tree | 2149360df7d8a2927a4717e7301b7f8536fca441 /eclass | |
| parent | gnome-base/nautilus: Version bump (diff) | |
| download | gentoo-55e47da74f04b8f6dcafbc735e68f2066d7bfd25.tar.gz gentoo-55e47da74f04b8f6dcafbc735e68f2066d7bfd25.tar.bz2 gentoo-55e47da74f04b8f6dcafbc735e68f2066d7bfd25.zip | |
gnome2.eclass: Allow to decide more easily if we can run eautoreconf OR only elibtoolize, this will prevent elibtoolize from being run two times and also allow the honoring of eapply_user patches (#591584), apart of also allowing us to use PATCHES array in more situations.
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/gnome2.eclass | 22 |
1 files changed, 19 insertions, 3 deletions
diff --git a/eclass/gnome2.eclass b/eclass/gnome2.eclass index de7a636173fe..d64b31b73c6b 100644 --- a/eclass/gnome2.eclass +++ b/eclass/gnome2.eclass @@ -10,7 +10,19 @@ # Exports portage base functions used by ebuilds written for packages using the # GNOME framework. For additional functions, see gnome2-utils.eclass. -inherit eutils libtool gnome.org gnome2-utils xdg +# @ECLASS-VARIABLE: GNOME2_EAUTORECONF +# @DEFAULT_UNSET +# @DESCRIPTION: +# Run eautoreconf instead of only elibtoolize +GNOME2_EAUTORECONF=${GNOME2_EAUTORECONF:-""} + +if [[ ${GNOME2_EAUTORECONF} == 'yes' ]] ; then + AUTOTOOLS_AUTO_DEPEND=yes +else + : ${AUTOTOOLS_AUTO_DEPEND:=no} +fi + +inherit autotools eutils libtool gnome.org gnome2-utils xdg case "${EAPI:-0}" in 4|5) @@ -113,9 +125,13 @@ gnome2_src_prepare() { # Disable all deprecation warnings gnome2_disable_deprecation_warning - # Run libtoolize + # Run libtoolize or eautoreconf, bug #591584 # https://bugzilla.gnome.org/show_bug.cgi?id=655517 - elibtoolize ${ELTCONF} + if [[ ${GNOME2_EAUTORECONF} == 'yes' ]]; then + eautoreconf + else + elibtoolize ${ELTCONF} + fi } # @FUNCTION: gnome2_src_configure |