* [gentoo-commits] gentoo-x86 commit in eclass: autotools-utils.eclass ChangeLog
@ 2011-12-22 18:01 Michal Gorny (mgorny)
0 siblings, 0 replies; 19+ messages in thread
From: Michal Gorny (mgorny) @ 2011-12-22 18:01 UTC (permalink / raw
To: gentoo-commits
mgorny 11/12/22 18:01:12
Modified: autotools-utils.eclass ChangeLog
Log:
Add a note on AT_NOELIBTOOLIZE=yes in src_prepare(). Fixes #395649.
Revision Changes Path
1.31 eclass/autotools-utils.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools-utils.eclass?rev=1.31&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools-utils.eclass?rev=1.31&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools-utils.eclass?r1=1.30&r2=1.31
Index: autotools-utils.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/autotools-utils.eclass,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- autotools-utils.eclass 14 Dec 2011 14:55:03 -0000 1.30
+++ autotools-utils.eclass 22 Dec 2011 18:01:12 -0000 1.31
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/autotools-utils.eclass,v 1.30 2011/12/14 14:55:03 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/autotools-utils.eclass,v 1.31 2011/12/22 18:01:12 mgorny Exp $
# @ECLASS: autotools-utils.eclass
# @MAINTAINER:
@@ -255,6 +255,9 @@
# The src_prepare function.
#
# Supporting PATCHES array and user patches. See base.eclass(5) for reference.
+#
+# This function calls elibtoolize implicitly. If you need to call eautoreconf
+# afterwards, please use AT_NOELIBTOOLIZE=yes to avoid it being called twice.
autotools-utils_src_prepare() {
debug-print-function ${FUNCNAME} "$@"
1.53 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.53&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.53&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.52&r2=1.53
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- ChangeLog 21 Dec 2011 22:47:35 -0000 1.52
+++ ChangeLog 22 Dec 2011 18:01:12 -0000 1.53
@@ -1,6 +1,9 @@
# ChangeLog for eclass directory
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.52 2011/12/21 22:47:35 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.53 2011/12/22 18:01:12 mgorny Exp $
+
+ 22 Dec 2011; Michał Górny <mgorny@gentoo.org> autotools-utils.eclass:
+ Add a note on AT_NOELIBTOOLIZE=yes in src_prepare(). Fixes #395649.
21 Dec 2011; Davide Pesavento <pesa@gentoo.org> qt4-build.eclass:
Disable rpath for Qt 4.8 and later (bug #380415). Thanks to dilfridge for
^ permalink raw reply [flat|nested] 19+ messages in thread* [gentoo-commits] gentoo-x86 commit in eclass: autotools-utils.eclass ChangeLog
@ 2012-06-06 17:17 Michal Gorny (mgorny)
0 siblings, 0 replies; 19+ messages in thread
From: Michal Gorny (mgorny) @ 2012-06-06 17:17 UTC (permalink / raw
To: gentoo-commits
mgorny 12/06/06 17:17:30
Modified: autotools-utils.eclass ChangeLog
Log:
Reuse eautoreconf, deprecate autotools-utils_autoreconf.
Revision Changes Path
1.55 eclass/autotools-utils.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools-utils.eclass?rev=1.55&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools-utils.eclass?rev=1.55&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools-utils.eclass?r1=1.54&r2=1.55
Index: autotools-utils.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/autotools-utils.eclass,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- autotools-utils.eclass 6 Jun 2012 15:43:45 -0000 1.54
+++ autotools-utils.eclass 6 Jun 2012 17:17:30 -0000 1.55
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/autotools-utils.eclass,v 1.54 2012/06/06 15:43:45 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/autotools-utils.eclass,v 1.55 2012/06/06 17:17:30 mgorny Exp $
# @ECLASS: autotools-utils.eclass
# @MAINTAINER:
@@ -271,6 +271,10 @@
autotools-utils_autoreconf() {
debug-print-function ${FUNCNAME} "$@"
+ eqawarn "The autotools-utils_autoreconf() function was deprecated."
+ eqawarn "Please call autotools-utils_src_prepare()"
+ eqawarn "with AUTOTOOLS_AUTORECONF set instead."
+
# Override this func to not require unnecessary eaclocal calls.
autotools_check_macro() {
local x
@@ -367,7 +371,7 @@
fi
fi
- [[ ${want_autoreconf} ]] && autotools-utils_autoreconf
+ [[ ${want_autoreconf} ]] && eautoreconf
elibtoolize --patch-only
}
1.295 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.295&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.295&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.294&r2=1.295
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.294
retrieving revision 1.295
diff -u -r1.294 -r1.295
--- ChangeLog 6 Jun 2012 17:15:08 -0000 1.294
+++ ChangeLog 6 Jun 2012 17:17:30 -0000 1.295
@@ -1,6 +1,9 @@
# ChangeLog for eclass directory
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.294 2012/06/06 17:15:08 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.295 2012/06/06 17:17:30 mgorny Exp $
+
+ 06 Jun 2012; Michał Górny <mgorny@gentoo.org> autotools-utils.eclass:
+ Reuse eautoreconf, deprecate autotools-utils_autoreconf.
06 Jun 2012; Michał Górny <mgorny@gentoo.org> autotools.eclass:
Support other GNOME-related tools in eautoreconf: gtk-doc, gnome-doc &
^ permalink raw reply [flat|nested] 19+ messages in thread* [gentoo-commits] gentoo-x86 commit in eclass: autotools-utils.eclass ChangeLog
@ 2012-05-28 7:45 Michal Gorny (mgorny)
0 siblings, 0 replies; 19+ messages in thread
From: Michal Gorny (mgorny) @ 2012-05-28 7:45 UTC (permalink / raw
To: gentoo-commits
mgorny 12/05/28 07:45:19
Modified: autotools-utils.eclass ChangeLog
Log:
Fail whenever unable to change directory, wrt #391927.
Revision Changes Path
1.52 eclass/autotools-utils.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools-utils.eclass?rev=1.52&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools-utils.eclass?rev=1.52&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools-utils.eclass?r1=1.51&r2=1.52
Index: autotools-utils.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/autotools-utils.eclass,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- autotools-utils.eclass 28 May 2012 07:34:43 -0000 1.51
+++ autotools-utils.eclass 28 May 2012 07:45:19 -0000 1.52
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/autotools-utils.eclass,v 1.51 2012/05/28 07:34:43 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/autotools-utils.eclass,v 1.52 2012/05/28 07:45:19 mgorny Exp $
# @ECLASS: autotools-utils.eclass
# @MAINTAINER:
@@ -337,9 +337,9 @@
local x
for x in $(autotools_check_macro_val AC_CONFIG_SUBDIRS); do
if [[ -d ${x} ]] ; then
- pushd "${x}" >/dev/null
+ pushd "${x}" >/dev/null || die
autotools-utils_autoreconf
- popd >/dev/null
+ popd >/dev/null || die
fi
done
}
@@ -415,9 +415,9 @@
econfargs+=("${myeconfargs[@]}")
mkdir -p "${AUTOTOOLS_BUILD_DIR}" || die "mkdir '${AUTOTOOLS_BUILD_DIR}' failed"
- pushd "${AUTOTOOLS_BUILD_DIR}" > /dev/null
+ pushd "${AUTOTOOLS_BUILD_DIR}" > /dev/null || die
econf "${econfargs[@]}" "$@"
- popd > /dev/null
+ popd > /dev/null || die
}
# @FUNCTION: autotools-utils_src_compile
@@ -427,9 +427,9 @@
debug-print-function ${FUNCNAME} "$@"
_check_build_dir
- pushd "${AUTOTOOLS_BUILD_DIR}" > /dev/null
+ pushd "${AUTOTOOLS_BUILD_DIR}" > /dev/null || die
emake "$@" || die 'emake failed'
- popd > /dev/null
+ popd > /dev/null || die
}
# @FUNCTION: autotools-utils_src_install
@@ -444,9 +444,9 @@
debug-print-function ${FUNCNAME} "$@"
_check_build_dir
- pushd "${AUTOTOOLS_BUILD_DIR}" > /dev/null
+ pushd "${AUTOTOOLS_BUILD_DIR}" > /dev/null || die
emake DESTDIR="${D}" "$@" install || die "emake install failed"
- popd > /dev/null
+ popd > /dev/null || die
# Move docs installed by autotools (in EAPI < 4).
if [[ ${EAPI} == [23] ]] \
@@ -491,8 +491,8 @@
debug-print-function ${FUNCNAME} "$@"
_check_build_dir
- pushd "${AUTOTOOLS_BUILD_DIR}" > /dev/null
+ pushd "${AUTOTOOLS_BUILD_DIR}" > /dev/null || die
# Run default src_test as defined in ebuild.sh
default_src_test
- popd > /dev/null
+ popd > /dev/null || die
}
1.272 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.272&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.272&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.271&r2=1.272
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.271
retrieving revision 1.272
diff -u -r1.271 -r1.272
--- ChangeLog 28 May 2012 07:34:43 -0000 1.271
+++ ChangeLog 28 May 2012 07:45:19 -0000 1.272
@@ -1,6 +1,9 @@
# ChangeLog for eclass directory
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.271 2012/05/28 07:34:43 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.272 2012/05/28 07:45:19 mgorny Exp $
+
+ 28 May 2012; Michał Górny <mgorny@gentoo.org> autotools-utils.eclass:
+ Fail whenever unable to change directory, wrt #391927.
28 May 2012; Michał Górny <mgorny@gentoo.org> autotools-utils.eclass:
autotools.eclass no longer supports re-inheriting so we need to override
^ permalink raw reply [flat|nested] 19+ messages in thread* [gentoo-commits] gentoo-x86 commit in eclass: autotools-utils.eclass ChangeLog
@ 2012-05-28 7:34 Michal Gorny (mgorny)
0 siblings, 0 replies; 19+ messages in thread
From: Michal Gorny (mgorny) @ 2012-05-28 7:34 UTC (permalink / raw
To: gentoo-commits
mgorny 12/05/28 07:34:43
Modified: autotools-utils.eclass ChangeLog
Log:
autotools.eclass no longer supports re-inheriting so we need to override AUTOTOOLS_AUTO_DEPEND for good...
Revision Changes Path
1.51 eclass/autotools-utils.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools-utils.eclass?rev=1.51&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools-utils.eclass?rev=1.51&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools-utils.eclass?r1=1.50&r2=1.51
Index: autotools-utils.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/autotools-utils.eclass,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- autotools-utils.eclass 22 May 2012 14:29:06 -0000 1.50
+++ autotools-utils.eclass 28 May 2012 07:34:43 -0000 1.51
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/autotools-utils.eclass,v 1.50 2012/05/22 14:29:06 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/autotools-utils.eclass,v 1.51 2012/05/28 07:34:43 mgorny Exp $
# @ECLASS: autotools-utils.eclass
# @MAINTAINER:
@@ -111,15 +111,12 @@
# Note that dependencies are added for autoconf, automake and libtool only.
# If your package needs one of the external tools listed above, you need to add
# appropriate packages to DEPEND yourself.
-[[ ${AUTOTOOLS_AUTORECONF} ]] || _autotools_auto_dep=no
+[[ ${AUTOTOOLS_AUTORECONF} ]] || : ${AUTOTOOLS_AUTO_DEPEND:=no}
-AUTOTOOLS_AUTO_DEPEND=${_autotools_auto_dep} \
inherit autotools eutils libtool
EXPORT_FUNCTIONS src_prepare src_configure src_compile src_install src_test
-unset _autotools_auto_dep
-
# @ECLASS-VARIABLE: AUTOTOOLS_BUILD_DIR
# @DEFAULT_UNSET
# @DESCRIPTION:
1.271 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.271&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.271&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.270&r2=1.271
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.270
retrieving revision 1.271
diff -u -r1.270 -r1.271
--- ChangeLog 26 May 2012 14:25:02 -0000 1.270
+++ ChangeLog 28 May 2012 07:34:43 -0000 1.271
@@ -1,6 +1,10 @@
# ChangeLog for eclass directory
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.270 2012/05/26 14:25:02 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.271 2012/05/28 07:34:43 mgorny Exp $
+
+ 28 May 2012; Michał Górny <mgorny@gentoo.org> autotools-utils.eclass:
+ autotools.eclass no longer supports re-inheriting so we need to override
+ AUTOTOOLS_AUTO_DEPEND for good...
26 May 2012; <swift@gentoo.org> selinux-policy-2.eclass:
Introducing support for user-provided policies, fix loading logic to retry
^ permalink raw reply [flat|nested] 19+ messages in thread* [gentoo-commits] gentoo-x86 commit in eclass: autotools-utils.eclass ChangeLog
@ 2012-05-22 14:29 Michal Gorny (mgorny)
0 siblings, 0 replies; 19+ messages in thread
From: Michal Gorny (mgorny) @ 2012-05-22 14:29 UTC (permalink / raw
To: gentoo-commits
mgorny 12/05/22 14:29:06
Modified: autotools-utils.eclass ChangeLog
Log:
Call eaclocal unconditionally; _elibtoolize no longer does that.
Revision Changes Path
1.50 eclass/autotools-utils.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools-utils.eclass?rev=1.50&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools-utils.eclass?rev=1.50&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools-utils.eclass?r1=1.49&r2=1.50
Index: autotools-utils.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/autotools-utils.eclass,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- autotools-utils.eclass 21 May 2012 17:34:53 -0000 1.49
+++ autotools-utils.eclass 22 May 2012 14:29:06 -0000 1.50
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/autotools-utils.eclass,v 1.49 2012/05/21 17:34:53 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/autotools-utils.eclass,v 1.50 2012/05/22 14:29:06 mgorny Exp $
# @ECLASS: autotools-utils.eclass
# @MAINTAINER:
@@ -327,15 +327,12 @@
autotools_run_tool gnome-doc-prepare --copy --force
fi
- # We need to perform the check twice to know whether to run eaclocal.
- # (_elibtoolize does that itself)
if [[ $(autotools_check_macro AC_PROG_LIBTOOL AM_PROG_LIBTOOL LT_INIT) ]]
then
_elibtoolize --copy --force --install
- else
- eaclocal
fi
+ eaclocal
eautoconf
eautoheader
FROM_EAUTORECONF=sure eautomake
1.263 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.263&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.263&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.262&r2=1.263
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.262
retrieving revision 1.263
diff -u -r1.262 -r1.263
--- ChangeLog 22 May 2012 13:41:59 -0000 1.262
+++ ChangeLog 22 May 2012 14:29:06 -0000 1.263
@@ -1,6 +1,9 @@
# ChangeLog for eclass directory
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.262 2012/05/22 13:41:59 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.263 2012/05/22 14:29:06 mgorny Exp $
+
+ 22 May 2012; Michał Górny <mgorny@gentoo.org> autotools-utils.eclass:
+ Call eaclocal unconditionally; _elibtoolize no longer does that.
22 May 2012; Davide Pesavento <pesa@gentoo.org> qt4-build.eclass:
Update SRC_URI for Qt 4.8.1 and later.
^ permalink raw reply [flat|nested] 19+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: autotools-utils.eclass ChangeLog
@ 2012-05-21 17:34 Michal Gorny (mgorny)
0 siblings, 0 replies; 19+ messages in thread
From: Michal Gorny (mgorny) @ 2012-05-21 17:34 UTC (permalink / raw
To: gentoo-commits
mgorny 12/05/21 17:34:53
Modified: autotools-utils.eclass ChangeLog
Log:
Fix to match autotools.eclass API changes.
Revision Changes Path
1.49 eclass/autotools-utils.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools-utils.eclass?rev=1.49&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools-utils.eclass?rev=1.49&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools-utils.eclass?r1=1.48&r2=1.49
Index: autotools-utils.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/autotools-utils.eclass,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- autotools-utils.eclass 4 Feb 2012 09:26:16 -0000 1.48
+++ autotools-utils.eclass 21 May 2012 17:34:53 -0000 1.49
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/autotools-utils.eclass,v 1.48 2012/02/04 09:26:16 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/autotools-utils.eclass,v 1.49 2012/05/21 17:34:53 mgorny Exp $
# @ECLASS: autotools-utils.eclass
# @MAINTAINER:
@@ -341,7 +341,7 @@
FROM_EAUTORECONF=sure eautomake
local x
- for x in $(autotools_get_subdirs); do
+ for x in $(autotools_check_macro_val AC_CONFIG_SUBDIRS); do
if [[ -d ${x} ]] ; then
pushd "${x}" >/dev/null
autotools-utils_autoreconf
1.260 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.260&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.260&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.259&r2=1.260
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.259
retrieving revision 1.260
diff -u -r1.259 -r1.260
--- ChangeLog 21 May 2012 17:33:09 -0000 1.259
+++ ChangeLog 21 May 2012 17:34:53 -0000 1.260
@@ -1,6 +1,9 @@
# ChangeLog for eclass directory
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.259 2012/05/21 17:33:09 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.260 2012/05/21 17:34:53 mgorny Exp $
+
+ 21 May 2012; Michał Górny <mgorny@gentoo.org> autotools-utils.eclass:
+ Fix to match autotools.eclass API changes.
21 May 2012; Krzysztof Pawlik <nelchael@gentoo.org>
python-distutils-ng.eclass:
^ permalink raw reply [flat|nested] 19+ messages in thread* [gentoo-commits] gentoo-x86 commit in eclass: autotools-utils.eclass ChangeLog
@ 2012-01-21 20:44 Michal Gorny (mgorny)
0 siblings, 0 replies; 19+ messages in thread
From: Michal Gorny (mgorny) @ 2012-01-21 20:44 UTC (permalink / raw
To: gentoo-commits
mgorny 12/01/21 20:44:28
Modified: autotools-utils.eclass ChangeLog
Log:
Force autoreconf on user patches only.
Revision Changes Path
1.45 eclass/autotools-utils.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools-utils.eclass?rev=1.45&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools-utils.eclass?rev=1.45&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools-utils.eclass?r1=1.44&r2=1.45
Index: autotools-utils.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/autotools-utils.eclass,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- autotools-utils.eclass 19 Jan 2012 21:49:38 -0000 1.44
+++ autotools-utils.eclass 21 Jan 2012 20:44:28 -0000 1.45
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/autotools-utils.eclass,v 1.44 2012/01/19 21:49:38 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/autotools-utils.eclass,v 1.45 2012/01/21 20:44:28 mgorny Exp $
# @ECLASS: autotools-utils.eclass
# @MAINTAINER:
@@ -360,8 +360,9 @@
local want_autoreconf=${AUTOTOOLS_AUTORECONF}
- touch "${T}"/.autotools-utils.timestamp || die
[[ ${PATCHES} ]] && epatch "${PATCHES[@]}"
+
+ touch "${T}"/.autotools-utils.timestamp || die
epatch_user
if [[ ! ${want_autoreconf} ]]; then
if [[ $(find . -newer "${T}"/.autotools-utils.timestamp \
@@ -369,7 +370,7 @@
-o -name 'configure.ac' \
-o -name 'configure.in' ')' \
-print -quit) ]]; then
- einfo 'Will autoreconfigure due to patches applied.'
+ einfo 'Will autoreconfigure due to user patches applied.'
want_autoreconf=yep
fi
fi
1.101 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.101&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.101&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.100&r2=1.101
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -r1.100 -r1.101
--- ChangeLog 21 Jan 2012 19:48:20 -0000 1.100
+++ ChangeLog 21 Jan 2012 20:44:28 -0000 1.101
@@ -1,6 +1,9 @@
# ChangeLog for eclass directory
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.100 2012/01/21 19:48:20 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.101 2012/01/21 20:44:28 mgorny Exp $
+
+ 21 Jan 2012; Michał Górny <mgorny@gentoo.org> autotools-utils.eclass:
+ Force autoreconf on user patches only.
21 Jan 2012; Mike Gilbert <floppym@gentoo.org> python.eclass:
Copy python_clean_installation_image from Progress overlay. Thanks Arfrever.
^ permalink raw reply [flat|nested] 19+ messages in thread* [gentoo-commits] gentoo-x86 commit in eclass: autotools-utils.eclass ChangeLog
@ 2012-01-19 21:49 Michal Gorny (mgorny)
0 siblings, 0 replies; 19+ messages in thread
From: Michal Gorny (mgorny) @ 2012-01-19 21:49 UTC (permalink / raw
To: gentoo-commits
mgorny 12/01/19 21:49:38
Modified: autotools-utils.eclass ChangeLog
Log:
Add AM_CONFIG_HEADER check (for pixman autoreconf).
Revision Changes Path
1.44 eclass/autotools-utils.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools-utils.eclass?rev=1.44&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools-utils.eclass?rev=1.44&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools-utils.eclass?r1=1.43&r2=1.44
Index: autotools-utils.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/autotools-utils.eclass,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- autotools-utils.eclass 15 Jan 2012 20:03:50 -0000 1.43
+++ autotools-utils.eclass 19 Jan 2012 21:49:38 -0000 1.44
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/autotools-utils.eclass,v 1.43 2012/01/15 20:03:50 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/autotools-utils.eclass,v 1.44 2012/01/19 21:49:38 mgorny Exp $
# @ECLASS: autotools-utils.eclass
# @MAINTAINER:
@@ -284,7 +284,8 @@
local x
# Add a few additional variants as we don't get expansions.
- [[ ${1} = AC_CONFIG_HEADERS ]] && set -- "${@}" AC_CONFIG_HEADER
+ [[ ${1} = AC_CONFIG_HEADERS ]] && set -- "${@}" \
+ AC_CONFIG_HEADER AM_CONFIG_HEADER
for x; do
grep -h "^${x}" configure.{ac,in} 2>/dev/null
1.98 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.98&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.98&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.97&r2=1.98
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -r1.97 -r1.98
--- ChangeLog 19 Jan 2012 16:53:39 -0000 1.97
+++ ChangeLog 19 Jan 2012 21:49:38 -0000 1.98
@@ -1,6 +1,9 @@
# ChangeLog for eclass directory
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.97 2012/01/19 16:53:39 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.98 2012/01/19 21:49:38 mgorny Exp $
+
+ 19 Jan 2012; Michał Górny <mgorny@gentoo.org> autotools-utils.eclass:
+ Add AM_CONFIG_HEADER check (for pixman autoreconf).
19 Jan 2012; Michał Górny <mgorny@gentoo.org> git-2.eclass:
Strip .git from storedir; wrt bug #386845.
^ permalink raw reply [flat|nested] 19+ messages in thread* [gentoo-commits] gentoo-x86 commit in eclass: autotools-utils.eclass ChangeLog
@ 2012-01-15 20:03 Michal Gorny (mgorny)
0 siblings, 0 replies; 19+ messages in thread
From: Michal Gorny (mgorny) @ 2012-01-15 20:03 UTC (permalink / raw
To: gentoo-commits
mgorny 12/01/15 20:03:50
Modified: autotools-utils.eclass ChangeLog
Log:
Quiet grep output.
Revision Changes Path
1.43 eclass/autotools-utils.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools-utils.eclass?rev=1.43&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools-utils.eclass?rev=1.43&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools-utils.eclass?r1=1.42&r2=1.43
Index: autotools-utils.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/autotools-utils.eclass,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- autotools-utils.eclass 15 Jan 2012 16:40:12 -0000 1.42
+++ autotools-utils.eclass 15 Jan 2012 20:03:50 -0000 1.43
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/autotools-utils.eclass,v 1.42 2012/01/15 16:40:12 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/autotools-utils.eclass,v 1.43 2012/01/15 20:03:50 mgorny Exp $
# @ECLASS: autotools-utils.eclass
# @MAINTAINER:
@@ -398,7 +398,7 @@
local econfargs=()
_check_build_dir
- if "${ECONF_SOURCE}"/configure --help 2>&1 | grep '^ *--docdir='; then
+ if "${ECONF_SOURCE}"/configure --help 2>&1 | grep -q '^ *--docdir='; then
econfargs+=(
--docdir="${EPREFIX}"/usr/share/doc/${PF}
)
1.90 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.90&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.90&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.89&r2=1.90
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -r1.89 -r1.90
--- ChangeLog 15 Jan 2012 17:11:08 -0000 1.89
+++ ChangeLog 15 Jan 2012 20:03:50 -0000 1.90
@@ -1,6 +1,9 @@
# ChangeLog for eclass directory
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.89 2012/01/15 17:11:08 idl0r Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.90 2012/01/15 20:03:50 mgorny Exp $
+
+ 15 Jan 2012; Michał Górny <mgorny@gentoo.org> autotools-utils.eclass:
+ Quiet grep output.
15 Jan 2012; Christian Ruppert <idl0r@gentoo.org> vdr-plugin.eclass:
Add EAPI 4 support
^ permalink raw reply [flat|nested] 19+ messages in thread* [gentoo-commits] gentoo-x86 commit in eclass: autotools-utils.eclass ChangeLog
@ 2012-01-15 16:40 Michal Gorny (mgorny)
0 siblings, 0 replies; 19+ messages in thread
From: Michal Gorny (mgorny) @ 2012-01-15 16:40 UTC (permalink / raw
To: gentoo-commits
mgorny 12/01/15 16:40:12
Modified: autotools-utils.eclass ChangeLog
Log:
Improve the --docdir configure grep.
Revision Changes Path
1.42 eclass/autotools-utils.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools-utils.eclass?rev=1.42&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools-utils.eclass?rev=1.42&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools-utils.eclass?r1=1.41&r2=1.42
Index: autotools-utils.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/autotools-utils.eclass,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- autotools-utils.eclass 15 Jan 2012 14:05:14 -0000 1.41
+++ autotools-utils.eclass 15 Jan 2012 16:40:12 -0000 1.42
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/autotools-utils.eclass,v 1.41 2012/01/15 14:05:14 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/autotools-utils.eclass,v 1.42 2012/01/15 16:40:12 mgorny Exp $
# @ECLASS: autotools-utils.eclass
# @MAINTAINER:
@@ -398,7 +398,7 @@
local econfargs=()
_check_build_dir
- if "${ECONF_SOURCE}"/configure --help 2>&1 | grep docdir; then
+ if "${ECONF_SOURCE}"/configure --help 2>&1 | grep '^ *--docdir='; then
econfargs+=(
--docdir="${EPREFIX}"/usr/share/doc/${PF}
)
1.88 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.88&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.88&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.87&r2=1.88
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -r1.87 -r1.88
--- ChangeLog 15 Jan 2012 14:13:46 -0000 1.87
+++ ChangeLog 15 Jan 2012 16:40:12 -0000 1.88
@@ -1,6 +1,9 @@
# ChangeLog for eclass directory
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.87 2012/01/15 14:13:46 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.88 2012/01/15 16:40:12 mgorny Exp $
+
+ 15 Jan 2012; Michał Górny <mgorny@gentoo.org> autotools-utils.eclass:
+ Improve the --docdir configure grep.
15 Jan 2012; Ulrich Müller <ulm@gentoo.org> cdrom.eclass:
New variable CDROM_DISABLE_PROPERTIES. Set PROPERTIES only if this is unset.
^ permalink raw reply [flat|nested] 19+ messages in thread* [gentoo-commits] gentoo-x86 commit in eclass: autotools-utils.eclass ChangeLog
@ 2012-01-15 14:05 Michal Gorny (mgorny)
0 siblings, 0 replies; 19+ messages in thread
From: Michal Gorny (mgorny) @ 2012-01-15 14:05 UTC (permalink / raw
To: gentoo-commits
mgorny 12/01/15 14:05:14
Modified: autotools-utils.eclass ChangeLog
Log:
Pass --docdir to configure only when supported.
Revision Changes Path
1.41 eclass/autotools-utils.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools-utils.eclass?rev=1.41&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools-utils.eclass?rev=1.41&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools-utils.eclass?r1=1.40&r2=1.41
Index: autotools-utils.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/autotools-utils.eclass,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- autotools-utils.eclass 14 Jan 2012 18:53:56 -0000 1.40
+++ autotools-utils.eclass 15 Jan 2012 14:05:14 -0000 1.41
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/autotools-utils.eclass,v 1.40 2012/01/14 18:53:56 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/autotools-utils.eclass,v 1.41 2012/01/15 14:05:14 mgorny Exp $
# @ECLASS: autotools-utils.eclass
# @MAINTAINER:
@@ -395,9 +395,14 @@
[[ ${EAPI} == 2 ]] && ! use prefix && EPREFIX=
# Common args
- local econfargs=(
- --docdir="${EPREFIX}/usr/share/doc/${PF}"
- )
+ local econfargs=()
+
+ _check_build_dir
+ if "${ECONF_SOURCE}"/configure --help 2>&1 | grep docdir; then
+ econfargs+=(
+ --docdir="${EPREFIX}"/usr/share/doc/${PF}
+ )
+ fi
# Handle static-libs found in IUSE, disable them by default
if in_iuse static-libs; then
@@ -410,7 +415,6 @@
# Append user args
econfargs+=("${myeconfargs[@]}")
- _check_build_dir
mkdir -p "${AUTOTOOLS_BUILD_DIR}" || die "mkdir '${AUTOTOOLS_BUILD_DIR}' failed"
pushd "${AUTOTOOLS_BUILD_DIR}" > /dev/null
econf "${econfargs[@]}" "$@"
1.86 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.86&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.86&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.85&r2=1.86
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -r1.85 -r1.86
--- ChangeLog 14 Jan 2012 18:53:56 -0000 1.85
+++ ChangeLog 15 Jan 2012 14:05:14 -0000 1.86
@@ -1,6 +1,9 @@
# ChangeLog for eclass directory
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.85 2012/01/14 18:53:56 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.86 2012/01/15 14:05:14 mgorny Exp $
+
+ 15 Jan 2012; Michał Górny <mgorny@gentoo.org> autotools-utils.eclass:
+ Pass --docdir to configure only when supported.
14 Jan 2012; Michał Górny <mgorny@gentoo.org> autotools-utils.eclass:
Use path_exists() to ensure any file exists in docdir.
^ permalink raw reply [flat|nested] 19+ messages in thread* [gentoo-commits] gentoo-x86 commit in eclass: autotools-utils.eclass ChangeLog
@ 2012-01-14 18:53 Michal Gorny (mgorny)
0 siblings, 0 replies; 19+ messages in thread
From: Michal Gorny (mgorny) @ 2012-01-14 18:53 UTC (permalink / raw
To: gentoo-commits
mgorny 12/01/14 18:53:56
Modified: autotools-utils.eclass ChangeLog
Log:
Use path_exists() to ensure any file exists in docdir.
Revision Changes Path
1.40 eclass/autotools-utils.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools-utils.eclass?rev=1.40&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools-utils.eclass?rev=1.40&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools-utils.eclass?r1=1.39&r2=1.40
Index: autotools-utils.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/autotools-utils.eclass,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- autotools-utils.eclass 14 Jan 2012 18:14:39 -0000 1.39
+++ autotools-utils.eclass 14 Jan 2012 18:53:56 -0000 1.40
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/autotools-utils.eclass,v 1.39 2012/01/14 18:14:39 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/autotools-utils.eclass,v 1.40 2012/01/14 18:53:56 mgorny Exp $
# @ECLASS: autotools-utils.eclass
# @MAINTAINER:
@@ -446,7 +446,8 @@
popd > /dev/null
# Move docs installed by autotools (in EAPI < 4).
- if [[ ${EAPI} == [23] && -d ${D}${EPREFIX}/usr/share/doc/${PF} ]]; then
+ if [[ ${EAPI} == [23] ]] \
+ && path_exists "${D}${EPREFIX}"/usr/share/doc/${PF}/*; then
if [[ $(find "${D}${EPREFIX}"/usr/share/doc/${PF}/* -type d) ]]; then
eqawarn "autotools-utils: directories in docdir require at least EAPI 4"
else
1.85 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.85&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.85&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.84&r2=1.85
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -r1.84 -r1.85
--- ChangeLog 14 Jan 2012 18:14:39 -0000 1.84
+++ ChangeLog 14 Jan 2012 18:53:56 -0000 1.85
@@ -1,6 +1,9 @@
# ChangeLog for eclass directory
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.84 2012/01/14 18:14:39 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.85 2012/01/14 18:53:56 mgorny Exp $
+
+ 14 Jan 2012; Michał Górny <mgorny@gentoo.org> autotools-utils.eclass:
+ Use path_exists() to ensure any file exists in docdir.
14 Jan 2012; Michał Górny <mgorny@gentoo.org> autotools-utils.eclass:
Replace the docdir-directory error with a warning.
^ permalink raw reply [flat|nested] 19+ messages in thread* [gentoo-commits] gentoo-x86 commit in eclass: autotools-utils.eclass ChangeLog
@ 2012-01-14 14:58 Michal Gorny (mgorny)
0 siblings, 0 replies; 19+ messages in thread
From: Michal Gorny (mgorny) @ 2012-01-14 14:58 UTC (permalink / raw
To: gentoo-commits
mgorny 12/01/14 14:58:30
Modified: autotools-utils.eclass ChangeLog
Log:
Disallow eautomake from calling eautoreconf unnecessarily.
Revision Changes Path
1.36 eclass/autotools-utils.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools-utils.eclass?rev=1.36&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools-utils.eclass?rev=1.36&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools-utils.eclass?r1=1.35&r2=1.36
Index: autotools-utils.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/autotools-utils.eclass,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- autotools-utils.eclass 14 Jan 2012 14:50:05 -0000 1.35
+++ autotools-utils.eclass 14 Jan 2012 14:58:29 -0000 1.36
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/autotools-utils.eclass,v 1.35 2012/01/14 14:50:05 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/autotools-utils.eclass,v 1.36 2012/01/14 14:58:29 mgorny Exp $
# @ECLASS: autotools-utils.eclass
# @MAINTAINER:
@@ -332,7 +332,7 @@
eautoconf
eautoheader
- eautomake
+ FROM_EAUTORECONF=sure eautomake
local x
for x in $(autotools_get_subdirs); do
1.81 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.81&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.81&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.80&r2=1.81
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -r1.80 -r1.81
--- ChangeLog 14 Jan 2012 14:50:05 -0000 1.80
+++ ChangeLog 14 Jan 2012 14:58:29 -0000 1.81
@@ -1,6 +1,9 @@
# ChangeLog for eclass directory
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.80 2012/01/14 14:50:05 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.81 2012/01/14 14:58:29 mgorny Exp $
+
+ 14 Jan 2012; Michał Górny <mgorny@gentoo.org> autotools-utils.eclass:
+ Disallow eautomake from calling eautoreconf unnecessarily.
14 Jan 2012; Michał Górny <mgorny@gentoo.org> autotools-utils.eclass:
Pass --docdir to configure, and install docs from it; wrt bug #350423.
^ permalink raw reply [flat|nested] 19+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: autotools-utils.eclass ChangeLog
@ 2012-01-14 14:50 Michal Gorny (mgorny)
0 siblings, 0 replies; 19+ messages in thread
From: Michal Gorny (mgorny) @ 2012-01-14 14:50 UTC (permalink / raw
To: gentoo-commits
mgorny 12/01/14 14:50:05
Modified: autotools-utils.eclass ChangeLog
Log:
Pass --docdir to configure, and install docs from it; wrt bug #350423.
Revision Changes Path
1.35 eclass/autotools-utils.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools-utils.eclass?rev=1.35&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools-utils.eclass?rev=1.35&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools-utils.eclass?r1=1.34&r2=1.35
Index: autotools-utils.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/autotools-utils.eclass,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- autotools-utils.eclass 14 Jan 2012 14:41:10 -0000 1.34
+++ autotools-utils.eclass 14 Jan 2012 14:50:05 -0000 1.35
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/autotools-utils.eclass,v 1.34 2012/01/14 14:41:10 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/autotools-utils.eclass,v 1.35 2012/01/14 14:50:05 mgorny Exp $
# @ECLASS: autotools-utils.eclass
# @MAINTAINER:
@@ -376,8 +376,12 @@
[[ -z ${myeconfargs+1} || $(declare -p myeconfargs) == 'declare -a'* ]] \
|| die 'autotools-utils.eclass: myeconfargs has to be an array.'
+ [[ ${EAPI} == 2 ]] && ! use prefix && EPREFIX=
+
# Common args
- local econfargs=()
+ local econfargs=(
+ --docdir="${EPREFIX}/usr/share/doc/${PF}"
+ )
# Handle static-libs found in IUSE, disable them by default
if in_iuse static-libs; then
@@ -425,6 +429,22 @@
emake DESTDIR="${D}" "$@" install || die "emake install failed"
popd > /dev/null
+ # Move docs installed by autotools (in EAPI < 4).
+ if [[ ${EAPI} == [23] && -d ${D}${EPREFIX}/usr/share/doc/${PF} ]]; then
+ mkdir "${T}"/temp-docdir
+ mv "${D}${EPREFIX}"/usr/share/doc/${PF}/* "${T}"/temp-docdir/ \
+ || die "moving docs to tempdir failed"
+
+ local f
+ for f in "${T}"/temp-docdir/*; do
+ [[ -d ${f} ]] \
+ && die "directories in docdir require at least EAPI 4"
+ done
+
+ dodoc "${T}"/temp-docdir/* || die "docdir dodoc failed"
+ rm -r "${T}"/temp-docdir || die
+ fi
+
# XXX: support installing them from builddir as well?
if [[ ${DOCS} ]]; then
dodoc "${DOCS[@]}" || die "dodoc failed"
1.80 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.80&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.80&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.79&r2=1.80
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -r1.79 -r1.80
--- ChangeLog 14 Jan 2012 14:41:10 -0000 1.79
+++ ChangeLog 14 Jan 2012 14:50:05 -0000 1.80
@@ -1,6 +1,9 @@
# ChangeLog for eclass directory
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.79 2012/01/14 14:41:10 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.80 2012/01/14 14:50:05 mgorny Exp $
+
+ 14 Jan 2012; Michał Górny <mgorny@gentoo.org> autotools-utils.eclass:
+ Pass --docdir to configure, and install docs from it; wrt bug #350423.
14 Jan 2012; Michał Górny <mgorny@gentoo.org> autotools-utils.eclass:
Support installing default docs, similarly to EAPI4; wrt bug #397659.
^ permalink raw reply [flat|nested] 19+ messages in thread* [gentoo-commits] gentoo-x86 commit in eclass: autotools-utils.eclass ChangeLog
@ 2012-01-14 14:41 Michal Gorny (mgorny)
0 siblings, 0 replies; 19+ messages in thread
From: Michal Gorny (mgorny) @ 2012-01-14 14:41 UTC (permalink / raw
To: gentoo-commits
mgorny 12/01/14 14:41:10
Modified: autotools-utils.eclass ChangeLog
Log:
Support installing default docs, similarly to EAPI4; wrt bug #397659.
Revision Changes Path
1.34 eclass/autotools-utils.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools-utils.eclass?rev=1.34&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools-utils.eclass?rev=1.34&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools-utils.eclass?r1=1.33&r2=1.34
Index: autotools-utils.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/autotools-utils.eclass,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- autotools-utils.eclass 9 Jan 2012 10:16:25 -0000 1.33
+++ autotools-utils.eclass 14 Jan 2012 14:41:10 -0000 1.34
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/autotools-utils.eclass,v 1.33 2012/01/09 10:16:25 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/autotools-utils.eclass,v 1.34 2012/01/14 14:41:10 mgorny Exp $
# @ECLASS: autotools-utils.eclass
# @MAINTAINER:
@@ -428,6 +428,15 @@
# XXX: support installing them from builddir as well?
if [[ ${DOCS} ]]; then
dodoc "${DOCS[@]}" || die "dodoc failed"
+ else
+ local f
+ # same list as in PMS
+ for f in README* ChangeLog AUTHORS NEWS TODO CHANGES \
+ THANKS BUGS FAQ CREDITS CHANGELOG; do
+ if [[ -s ${f} ]]; then
+ dodoc "${f}" || die "(default) dodoc ${f} failed"
+ fi
+ done
fi
if [[ ${HTML_DOCS} ]]; then
dohtml -r "${HTML_DOCS[@]}" || die "dohtml failed"
1.79 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.79&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.79&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.78&r2=1.79
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -r1.78 -r1.79
--- ChangeLog 13 Jan 2012 23:25:40 -0000 1.78
+++ ChangeLog 14 Jan 2012 14:41:10 -0000 1.79
@@ -1,6 +1,9 @@
# ChangeLog for eclass directory
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.78 2012/01/13 23:25:40 mabi Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.79 2012/01/14 14:41:10 mgorny Exp $
+
+ 14 Jan 2012; Michał Górny <mgorny@gentoo.org> autotools-utils.eclass:
+ Support installing default docs, similarly to EAPI4; wrt bug #397659.
13 Jan 2012; Matti Bickel <mabi@gentoo.org> php-ext-source-r2.eclass:
Uncomment DEPEND for php-ext-source-r2.eclass, but w/o the SELFDEPEND that
^ permalink raw reply [flat|nested] 19+ messages in thread* [gentoo-commits] gentoo-x86 commit in eclass: autotools-utils.eclass ChangeLog
@ 2011-12-14 14:55 Michal Gorny (mgorny)
0 siblings, 0 replies; 19+ messages in thread
From: Michal Gorny (mgorny) @ 2011-12-14 14:55 UTC (permalink / raw
To: gentoo-commits
mgorny 11/12/14 14:55:03
Modified: autotools-utils.eclass ChangeLog
Log:
autotools-utils: drop base.eclass inherit and thus src_unpack() export.
Importing base.eclass causes us to export src_unpack() phase function
which is entirely useless in EAPIs 2+ (which we only support), and
causes trouble importing autotools-utils e.g. after VCS eclasses.
Fixes: https://bugs.gentoo.org/show_bug.cgi?id=392651
Revision Changes Path
1.30 eclass/autotools-utils.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools-utils.eclass?rev=1.30&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools-utils.eclass?rev=1.30&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools-utils.eclass?r1=1.29&r2=1.30
Index: autotools-utils.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/autotools-utils.eclass,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- autotools-utils.eclass 27 Nov 2011 09:57:20 -0000 1.29
+++ autotools-utils.eclass 14 Dec 2011 14:55:03 -0000 1.30
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/autotools-utils.eclass,v 1.29 2011/11/27 09:57:20 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/autotools-utils.eclass,v 1.30 2011/12/14 14:55:03 mgorny Exp $
# @ECLASS: autotools-utils.eclass
# @MAINTAINER:
@@ -93,24 +93,28 @@
*) die "EAPI=${EAPI} is not supported" ;;
esac
-inherit autotools base eutils libtool
+inherit autotools eutils libtool
EXPORT_FUNCTIONS src_prepare src_configure src_compile src_install src_test
# @ECLASS-VARIABLE: AUTOTOOLS_BUILD_DIR
+# @DEFAULT_UNSET
# @DESCRIPTION:
# Build directory, location where all autotools generated files should be
# placed. For out of source builds it defaults to ${WORKDIR}/${P}_build.
# @ECLASS-VARIABLE: AUTOTOOLS_IN_SOURCE_BUILD
+# @DEFAULT_UNSET
# @DESCRIPTION:
# Set to enable in-source build.
# @ECLASS-VARIABLE: ECONF_SOURCE
+# @DEFAULT_UNSET
# @DESCRIPTION:
# Specify location of autotools' configure script. By default it uses ${S}.
# @ECLASS-VARIABLE: myeconfargs
+# @DEFAULT_UNSET
# @DESCRIPTION:
# Optional econf arguments as Bash array. Should be defined before calling src_configure.
# @CODE
@@ -125,6 +129,36 @@
# }
# @CODE
+# @ECLASS-VARIABLE: DOCS
+# @DEFAULT_UNSET
+# @DESCRIPTION:
+# Array containing documents passed to dodoc command.
+#
+# Example:
+# @CODE
+# DOCS=( NEWS README )
+# @CODE
+
+# @ECLASS-VARIABLE: HTML_DOCS
+# @DEFAULT_UNSET
+# @DESCRIPTION:
+# Array containing documents passed to dohtml command.
+#
+# Example:
+# @CODE
+# HTML_DOCS=( doc/html/ )
+# @CODE
+
+# @ECLASS-VARIABLE: PATCHES
+# @DEFAULT_UNSET
+# @DESCRIPTION:
+# PATCHES array variable containing all various patches to be applied.
+#
+# Example:
+# @CODE
+# PATCHES=( "${FILESDIR}"/${P}-mypatch.patch )
+# @CODE
+
# Determine using IN or OUT source build
_check_build_dir() {
: ${ECONF_SOURCE:=${S}}
@@ -224,7 +258,9 @@
autotools-utils_src_prepare() {
debug-print-function ${FUNCNAME} "$@"
- base_src_prepare
+ [[ ${PATCHES} ]] && epatch "${PATCHES[@]}"
+ epatch_user
+
elibtoolize --patch-only
}
@@ -260,7 +296,7 @@
_check_build_dir
mkdir -p "${AUTOTOOLS_BUILD_DIR}" || die "mkdir '${AUTOTOOLS_BUILD_DIR}' failed"
pushd "${AUTOTOOLS_BUILD_DIR}" > /dev/null
- base_src_configure "${econfargs[@]}" "$@"
+ econf "${econfargs[@]}" "$@"
popd > /dev/null
}
@@ -272,7 +308,7 @@
_check_build_dir
pushd "${AUTOTOOLS_BUILD_DIR}" > /dev/null
- base_src_compile "$@"
+ emake "$@" || die 'emake failed'
popd > /dev/null
}
@@ -289,9 +325,17 @@
_check_build_dir
pushd "${AUTOTOOLS_BUILD_DIR}" > /dev/null
- base_src_install "$@"
+ emake DESTDIR="${D}" "$@" install || die "emake install failed"
popd > /dev/null
+ # XXX: support installing them from builddir as well?
+ if [[ ${DOCS} ]]; then
+ dodoc "${DOCS[@]}" || die "dodoc failed"
+ fi
+ if [[ ${HTML_DOCS} ]]; then
+ dohtml -r "${HTML_DOCS[@]}" || die "dohtml failed"
+ fi
+
# Remove libtool files and unnecessary static libs
remove_libtool_files
}
1.40 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.40&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.40&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.39&r2=1.40
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- ChangeLog 13 Dec 2011 14:42:39 -0000 1.39
+++ ChangeLog 14 Dec 2011 14:55:03 -0000 1.40
@@ -1,6 +1,9 @@
# ChangeLog for eclass directory
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.39 2011/12/13 14:42:39 sera Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.40 2011/12/14 14:55:03 mgorny Exp $
+
+ 14 Dec 2011; Michał Górny <mgorny@gentoo.org> autotools-utils.eclass:
+ Drop base.eclass inherit and thus src_unpack() export.
13 Dec 2011; Ralph Sennhauser <sera@gentoo.org> java-utils-2.eclass:
No longer require JDK for installing java binpkg. #206024
^ permalink raw reply [flat|nested] 19+ messages in thread* [gentoo-commits] gentoo-x86 commit in eclass: autotools-utils.eclass ChangeLog
@ 2011-11-27 9:57 Michal Gorny (mgorny)
0 siblings, 0 replies; 19+ messages in thread
From: Michal Gorny (mgorny) @ 2011-11-27 9:57 UTC (permalink / raw
To: gentoo-commits
mgorny 11/11/27 09:57:20
Modified: autotools-utils.eclass ChangeLog
Log:
Revert making pushd/popd fatal due to humongous breakage. Add a warning message instead.
Revision Changes Path
1.29 eclass/autotools-utils.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools-utils.eclass?rev=1.29&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools-utils.eclass?rev=1.29&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools-utils.eclass?r1=1.28&r2=1.29
Index: autotools-utils.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/autotools-utils.eclass,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- autotools-utils.eclass 27 Nov 2011 09:17:35 -0000 1.28
+++ autotools-utils.eclass 27 Nov 2011 09:57:20 -0000 1.29
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/autotools-utils.eclass,v 1.28 2011/11/27 09:17:35 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/autotools-utils.eclass,v 1.29 2011/11/27 09:57:20 mgorny Exp $
# @ECLASS: autotools-utils.eclass
# @MAINTAINER:
@@ -205,6 +205,15 @@
rm -f "${f}" || die
fi
done
+
+ # check for invalid eclass use
+ # this is the most commonly used function, so do it here
+ _check_build_dir
+ if [[ ! -d "${AUTOTOOLS_BUILD_DIR}" ]]; then
+ eqawarn "autotools-utils used but autotools-utils_src_configure was never called."
+ eqawarn "This is not supported and never was. Please report a bug against"
+ eqawarn "the offending ebuild. This will become a fatal error in a near future."
+ fi
}
# @FUNCTION: autotools-utils_src_prepare
@@ -250,9 +259,9 @@
_check_build_dir
mkdir -p "${AUTOTOOLS_BUILD_DIR}" || die "mkdir '${AUTOTOOLS_BUILD_DIR}' failed"
- pushd "${AUTOTOOLS_BUILD_DIR}" > /dev/null || die
+ pushd "${AUTOTOOLS_BUILD_DIR}" > /dev/null
base_src_configure "${econfargs[@]}" "$@"
- popd > /dev/null || die
+ popd > /dev/null
}
# @FUNCTION: autotools-utils_src_compile
@@ -262,9 +271,9 @@
debug-print-function ${FUNCNAME} "$@"
_check_build_dir
- pushd "${AUTOTOOLS_BUILD_DIR}" > /dev/null || die
+ pushd "${AUTOTOOLS_BUILD_DIR}" > /dev/null
base_src_compile "$@"
- popd > /dev/null || die
+ popd > /dev/null
}
# @FUNCTION: autotools-utils_src_install
@@ -279,9 +288,9 @@
debug-print-function ${FUNCNAME} "$@"
_check_build_dir
- pushd "${AUTOTOOLS_BUILD_DIR}" > /dev/null || die
+ pushd "${AUTOTOOLS_BUILD_DIR}" > /dev/null
base_src_install "$@"
- popd > /dev/null || die
+ popd > /dev/null
# Remove libtool files and unnecessary static libs
remove_libtool_files
@@ -294,8 +303,8 @@
debug-print-function ${FUNCNAME} "$@"
_check_build_dir
- pushd "${AUTOTOOLS_BUILD_DIR}" > /dev/null || die
+ pushd "${AUTOTOOLS_BUILD_DIR}" > /dev/null
# Run default src_test as defined in ebuild.sh
default_src_test
- popd > /dev/null || die
+ popd > /dev/null
}
1.30 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.30&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.30&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.29&r2=1.30
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- ChangeLog 27 Nov 2011 09:17:35 -0000 1.29
+++ ChangeLog 27 Nov 2011 09:57:20 -0000 1.30
@@ -1,6 +1,10 @@
# ChangeLog for eclass directory
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.29 2011/11/27 09:17:35 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.30 2011/11/27 09:57:20 mgorny Exp $
+
+ 27 Nov 2011; Michał Górny <mgorny@gentoo.org> autotools-utils.eclass:
+ Revert making pushd/popd fatal due to humongous breakage. Add a warning
+ message instead.
27 Nov 2011; Michał Górny <mgorny@gentoo.org> autotools-utils.eclass:
Denote that autotools-utils must not be mixed with econf/emake.
^ permalink raw reply [flat|nested] 19+ messages in thread* [gentoo-commits] gentoo-x86 commit in eclass: autotools-utils.eclass ChangeLog
@ 2011-11-26 20:43 Michal Gorny (mgorny)
0 siblings, 0 replies; 19+ messages in thread
From: Michal Gorny (mgorny) @ 2011-11-26 20:43 UTC (permalink / raw
To: gentoo-commits
mgorny 11/11/26 20:43:55
Modified: autotools-utils.eclass ChangeLog
Log:
Remove implicit IUSE=debug deprecation warning.
Revision Changes Path
1.27 eclass/autotools-utils.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools-utils.eclass?rev=1.27&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools-utils.eclass?rev=1.27&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools-utils.eclass?r1=1.26&r2=1.27
Index: autotools-utils.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/autotools-utils.eclass,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- autotools-utils.eclass 26 Nov 2011 20:42:02 -0000 1.26
+++ autotools-utils.eclass 26 Nov 2011 20:43:55 -0000 1.27
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/autotools-utils.eclass,v 1.26 2011/11/26 20:42:02 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/autotools-utils.eclass,v 1.27 2011/11/26 20:43:55 mgorny Exp $
# @ECLASS: autotools-utils.eclass
# @MAINTAINER:
@@ -233,16 +233,6 @@
# Common args
local econfargs=()
- # Handle debug found in IUSE
- if in_iuse debug; then
- local debugarg=$(use_enable debug)
- if ! has "${debugarg}" "${myeconfargs[@]}"; then
- eqawarn 'Implicit $(use_enable debug) for IUSE="debug" is no longer supported.'
- eqawarn 'Please add the necessary arg to myeconfargs if requested.'
- eqawarn 'The autotools-utils eclass will stop warning about it on Oct 15th.'
- fi
- fi
-
# Handle static-libs found in IUSE, disable them by default
if in_iuse static-libs; then
econfargs+=(
1.28 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.28&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.28&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.27&r2=1.28
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- ChangeLog 26 Nov 2011 20:42:02 -0000 1.27
+++ ChangeLog 26 Nov 2011 20:43:55 -0000 1.28
@@ -1,6 +1,9 @@
# ChangeLog for eclass directory
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.27 2011/11/26 20:42:02 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.28 2011/11/26 20:43:55 mgorny Exp $
+
+ 26 Nov 2011; Michał Górny <mgorny@gentoo.org> autotools-utils.eclass:
+ Remove implicit IUSE=debug deprecation warning.
26 Nov 2011; Michał Górny <mgorny@gentoo.org> autotools-utils.eclass:
Add failure handling for pushd/popd calls.
^ permalink raw reply [flat|nested] 19+ messages in thread* [gentoo-commits] gentoo-x86 commit in eclass: autotools-utils.eclass ChangeLog
@ 2011-11-26 20:42 Michal Gorny (mgorny)
0 siblings, 0 replies; 19+ messages in thread
From: Michal Gorny (mgorny) @ 2011-11-26 20:42 UTC (permalink / raw
To: gentoo-commits
mgorny 11/11/26 20:42:02
Modified: autotools-utils.eclass ChangeLog
Log:
Add failure handling for pushd/popd calls.
Revision Changes Path
1.26 eclass/autotools-utils.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools-utils.eclass?rev=1.26&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools-utils.eclass?rev=1.26&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools-utils.eclass?r1=1.25&r2=1.26
Index: autotools-utils.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/autotools-utils.eclass,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- autotools-utils.eclass 14 Oct 2011 20:28:29 -0000 1.25
+++ autotools-utils.eclass 26 Nov 2011 20:42:02 -0000 1.26
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/autotools-utils.eclass,v 1.25 2011/10/14 20:28:29 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/autotools-utils.eclass,v 1.26 2011/11/26 20:42:02 mgorny Exp $
# @ECLASS: autotools-utils.eclass
# @MAINTAINER:
@@ -256,9 +256,9 @@
_check_build_dir
mkdir -p "${AUTOTOOLS_BUILD_DIR}" || die "mkdir '${AUTOTOOLS_BUILD_DIR}' failed"
- pushd "${AUTOTOOLS_BUILD_DIR}" > /dev/null
+ pushd "${AUTOTOOLS_BUILD_DIR}" > /dev/null || die
base_src_configure "${econfargs[@]}" "$@"
- popd > /dev/null
+ popd > /dev/null || die
}
# @FUNCTION: autotools-utils_src_compile
@@ -268,9 +268,9 @@
debug-print-function ${FUNCNAME} "$@"
_check_build_dir
- pushd "${AUTOTOOLS_BUILD_DIR}" > /dev/null
+ pushd "${AUTOTOOLS_BUILD_DIR}" > /dev/null || die
base_src_compile "$@"
- popd > /dev/null
+ popd > /dev/null || die
}
# @FUNCTION: autotools-utils_src_install
@@ -285,9 +285,9 @@
debug-print-function ${FUNCNAME} "$@"
_check_build_dir
- pushd "${AUTOTOOLS_BUILD_DIR}" > /dev/null
+ pushd "${AUTOTOOLS_BUILD_DIR}" > /dev/null || die
base_src_install "$@"
- popd > /dev/null
+ popd > /dev/null || die
# Remove libtool files and unnecessary static libs
remove_libtool_files
@@ -300,8 +300,8 @@
debug-print-function ${FUNCNAME} "$@"
_check_build_dir
- pushd "${AUTOTOOLS_BUILD_DIR}" > /dev/null
+ pushd "${AUTOTOOLS_BUILD_DIR}" > /dev/null || die
# Run default src_test as defined in ebuild.sh
default_src_test
- popd > /dev/null
+ popd > /dev/null || die
}
1.27 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.27&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.27&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.26&r2=1.27
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- ChangeLog 24 Nov 2011 20:05:01 -0000 1.26
+++ ChangeLog 26 Nov 2011 20:42:02 -0000 1.27
@@ -1,6 +1,9 @@
# ChangeLog for eclass directory
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.26 2011/11/24 20:05:01 sera Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.27 2011/11/26 20:42:02 mgorny Exp $
+
+ 26 Nov 2011; Michał Górny <mgorny@gentoo.org> autotools-utils.eclass:
+ Add failure handling for pushd/popd calls.
24 Nov 2011; Ralph Sennhauser <sera@gentoo.org> java-vm-2.eclass:
set_java_env(): Substitute @SLOT@ in vm env files
^ permalink raw reply [flat|nested] 19+ messages in thread
end of thread, other threads:[~2012-06-06 17:17 UTC | newest]
Thread overview: 19+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-12-22 18:01 [gentoo-commits] gentoo-x86 commit in eclass: autotools-utils.eclass ChangeLog Michal Gorny (mgorny)
-- strict thread matches above, loose matches on Subject: below --
2012-06-06 17:17 Michal Gorny (mgorny)
2012-05-28 7:45 Michal Gorny (mgorny)
2012-05-28 7:34 Michal Gorny (mgorny)
2012-05-22 14:29 Michal Gorny (mgorny)
2012-05-21 17:34 Michal Gorny (mgorny)
2012-01-21 20:44 Michal Gorny (mgorny)
2012-01-19 21:49 Michal Gorny (mgorny)
2012-01-15 20:03 Michal Gorny (mgorny)
2012-01-15 16:40 Michal Gorny (mgorny)
2012-01-15 14:05 Michal Gorny (mgorny)
2012-01-14 18:53 Michal Gorny (mgorny)
2012-01-14 14:58 Michal Gorny (mgorny)
2012-01-14 14:50 Michal Gorny (mgorny)
2012-01-14 14:41 Michal Gorny (mgorny)
2011-12-14 14:55 Michal Gorny (mgorny)
2011-11-27 9:57 Michal Gorny (mgorny)
2011-11-26 20:43 Michal Gorny (mgorny)
2011-11-26 20:42 Michal Gorny (mgorny)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox