Gentoo Archives: gentoo-dev

From: Mike Frysinger <vapier@g.o>
To: gentoo-dev@l.g.o
Cc: Alexandre Rostovtsev <tetromino@g.o>
Subject: Re: [gentoo-dev] autotools.eclass:eautoreconf now runs autopoint for you
Date: Mon, 21 May 2012 15:36:19
Message-Id: 201205211136.02084.vapier@gentoo.org
In Reply to: Re: [gentoo-dev] autotools.eclass:eautoreconf now runs autopoint for you by Alexandre Rostovtsev
On Monday 21 May 2012 02:41:18 Alexandre Rostovtsev wrote:
> On Sun, 2012-05-20 at 06:32 -0400, Mike Frysinger wrote: > > i've extended eautoreconf to automatically call autopoint when the > > package uses gettext. the configure check might seem naïve, but this is > > how autoreconf itself does it. this hopefully shouldn't break any > > packages (at least, none that weren't already broken), but if you guys > > start seeing eautoreconf failures where there were none before, feel > > free to cc base-system. -mike > > > > --- autotools.eclass > > +++ autotools.eclass > > @@ -162,6 +162,9 @@ eautoreconf() { > > > > einfo "Running eautoreconf in '${PWD}' ..." > > [[ -n ${auxdir}${macdir} ]] && mkdir -p ${auxdir} ${macdir} > > eaclocal > > > > + if grep -q '^AM_GNU_GETTEXT_VERSION' configure.?? ; then > > + eautopoint --force > > + fi > > > > [[ ${CHOST} == *-darwin* ]] && g=g > > if ${LIBTOOLIZE:-${g}libtoolize} -n --install >& /dev/null ; then > > > > _elibtoolize --copy --force --install > > This change broke many gnome-related packages, see bug #416789. You > cannot assume that every package that uses AM_GNU_GETTEXT_VERSION wants > (just) autopoint;
two things: - eautoreconf acts like autoreconf which means it can assume that use of AM_GNU_GETTEXT_VERSION implies use of `autopoint` - it doesn't assume *just* autopoint -- nothing is stopping you from running any other random tools you like (such as intltool)
> there are also packages that use intltool (to be run > after autopoint) or glib-gettext (in which case autopoint should not be > used at all).
so attempting to run `autoreconf` in those packages fails ?
> +# @ECLASS-VARIABLE: WANT_INTLTOOL > +# @DESCRIPTION: > +# Do you want intltool? Valid values here are "latest" and "none". > +: ${WANT_INTLTOOL:=latest} > ... > +_intltool_atom="dev-util/intltool" > +if [[ -n ${WANT_INTLTOOL} ]] ; then > + case ${WANT_INTLTOOL} in > + none) _intltool_atom="" ;; > + latest) ;; > + *) die "Invalid WANT_INTLTOOL value '${WANT_INTLTOOL}'" ;; > + esac > + export WANT_LIBTOOL > +fi > ... > -AUTOTOOLS_DEPEND="${_automake_atom} ${_autoconf_atom} ${_libtool_atom}" > +AUTOTOOLS_DEPEND="${_automake_atom} ${_autoconf_atom} ${_intltool_atom}
no. this adds intltool as a dependency to every package inherting this eclass. -mike

Attachments

File name MIME type
signature.asc application/pgp-signature

Replies

Subject Author
Re: [gentoo-dev] autotools.eclass:eautoreconf now runs autopoint for you Alexandre Rostovtsev <tetromino@g.o>