From mboxrd@z Thu Jan 1 00:00:00 1970
Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org)
by finch.gentoo.org with esmtp (Exim 4.60)
(envelope-from <gentoo-commits+bounces-405352-garchives=archives.gentoo.org@lists.gentoo.org>)
id 1RXU4n-0003jJ-II
for garchives@archives.gentoo.org; Mon, 05 Dec 2011 08:39:05 +0000
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 9702421C039;
Mon, 5 Dec 2011 08:38:28 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
by pigeon.gentoo.org (Postfix) with ESMTP id 5713021C034
for <gentoo-commits@lists.gentoo.org>; Mon, 5 Dec 2011 08:38:28 +0000 (UTC)
Received: from pelican.gentoo.org (unknown [66.219.59.40])
(using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id C38DE1B4020
for <gentoo-commits@lists.gentoo.org>; Mon, 5 Dec 2011 08:38:27 +0000 (UTC)
Received: from localhost.localdomain (localhost [127.0.0.1])
by pelican.gentoo.org (Postfix) with ESMTP id 372A080056
for <gentoo-commits@lists.gentoo.org>; Mon, 5 Dec 2011 08:38:27 +0000 (UTC)
From: "Michał Górny" <mgorny@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Michał Górny" <mgorny@gentoo.org>
Message-ID: <9f6763ac34770f484a8bbe1ae868094876d7df6c.mgorny@gentoo>
Subject: [gentoo-commits] dev/mgorny:master commit in: eclass/
X-VCS-Repository: dev/mgorny
X-VCS-Files: eclass/autotools-utils.eclass
X-VCS-Directories: eclass/
X-VCS-Committer: mgorny
X-VCS-Committer-Name: Michał Górny
X-VCS-Revision: 9f6763ac34770f484a8bbe1ae868094876d7df6c
Date: Mon, 5 Dec 2011 08:38:27 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: quoted-printable
X-Archives-Salt: c0097b10-efc8-48d9-af02-037bd3888801
X-Archives-Hash: 3e675f9a3071477f470d666b1138577f
commit: 9f6763ac34770f484a8bbe1ae868094876d7df6c
Author: Micha=C5=82 G=C3=B3rny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 30 22:02:25 2011 +0000
Commit: Micha=C5=82 G=C3=B3rny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Nov 30 23:16:41 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=3Ddev/mgorny.git;a=3D=
commit;h=3D9f6763ac
Move autoreconf into separate func.
---
eclass/autotools-utils.eclass | 79 ++++++++++++++++++++++-------------=
------
1 files changed, 42 insertions(+), 37 deletions(-)
diff --git a/eclass/autotools-utils.eclass b/eclass/autotools-utils.eclas=
s
index 0f9cd26..035d1de 100644
--- a/eclass/autotools-utils.eclass
+++ b/eclass/autotools-utils.eclass
@@ -268,54 +268,59 @@ remove_libtool_files() {
fi
}
=20
-# @FUNCTION: autotools-utils_src_prepare
+# @FUNCTION: autotools-utils_autoreconf
# @DESCRIPTION:
-# The src_prepare function.
-#
-# Supporting PATCHES array and user patches. See base.eclass(5) for refe=
rence.
-autotools-utils_src_prepare() {
+# Reconfigure the sources (like gnome-doc-autogen.sh or eautoreconf).
+autotools-utils_autoreconf() {
debug-print-function ${FUNCNAME} "$@"
=20
- [[ ${PATCHES} ]] && epatch "${PATCHES[@]}"
- epatch_user
+ # Support running additional tools like gnome-autogen.sh.
+ # Note: you need to add additional depends to the ebuild.
=20
- local want_autoreconf=3D${AUTOTOOLS_AUTORECONF}
+ # aclocal is required to localize the macros
+ # XXX: do not call it twice...
+ eaclocal
=20
- base_src_prepare
- if [[ ${want_autoreconf} ]]; then
- # Support running additional tools like gnome-autogen.sh.
- # Note: you need to add additional depends to the ebuild.
+ # gettext
+ if [[ $(autotools_check_macro AM_GLIB_GNU_GETTEXT) ]]; then
+ echo 'no' | autotools_run_tool glib-gettextize --copy
+ elif [[ $(autotools_check_macro AM_GNU_GETTEXT) ]]; then
+ eautopoint
+ fi
=20
- # aclocal is required to localize the macros
- # XXX: do not call it twice...
- eaclocal
+ # intltool
+ if [[ $(autotools_check_macro AC_PROG_INTLTOOL IT_PROG_INTLTOOL) ]]; th=
en
+ autotools_run_tool intltoolize --copy --automake
+ fi
=20
- # gettext
- if [[ $(autotools_check_macro AM_GLIB_GNU_GETTEXT) ]]; then
- echo 'no' | autotools_run_tool glib-gettextize --copy
- elif [[ $(autotools_check_macro AM_GNU_GETTEXT) ]]; then
- eautopoint
- fi
+ # gtk-doc
+ if [[ $(autotools_check_macro GTK_DOC_CHECK) ]]; then
+ autotools_run_tool gtkdocize --copy
+ fi
=20
- # intltool
- if [[ $(autotools_check_macro AC_PROG_INTLTOOL IT_PROG_INTLTOOL) ]]; t=
hen
- autotools_run_tool intltoolize --copy --automake
- fi
+ # gnome-doc
+ if [[ $(autotools_check_macro GNOME_DOC_INIT) ]]; then
+ autotools_run_tool gnome-doc-prepare --copy
+ fi
=20
- # gtk-doc
- if [[ $(autotools_check_macro GTK_DOC_CHECK) ]]; then
- autotools_run_tool gtkdocize --copy
- fi
+ eautoreconf
+}
=20
- # gnome-doc
- if [[ $(autotools_check_macro GNOME_DOC_INIT) ]]; then
- autotools_run_tool gnome-doc-prepare --copy
- fi
+# @FUNCTION: autotools-utils_src_prepare
+# @DESCRIPTION:
+# The src_prepare function.
+#
+# Supporting PATCHES array and user patches. See base.eclass(5) for refe=
rence.
+autotools-utils_src_prepare() {
+ debug-print-function ${FUNCNAME} "$@"
=20
- eautoreconf
- else
- elibtoolize --patch-only
- fi
+ local want_autoreconf=3D${AUTOTOOLS_AUTORECONF}
+
+ [[ ${PATCHES} ]] && epatch "${PATCHES[@]}"
+ epatch_user
+
+ [[ ${want_autoreconf} ]] && autotools-utils_autoreconf
+ elibtoolize --patch-only
}
=20
# @FUNCTION: autotools-utils_src_configure