[gentoo-commits] gentoo-x86 commit in eclass: autotools.eclass

[gentoo-commits] gentoo-x86 commit in eclass: autotools.eclass

[Mike Frysinger (vapier)]

vapier      07/09/17 23:15:51

  Modified:             autotools.eclass
  Log:
  add support for WANT_AUTOCONF=none #192863 and catch invalid WANT_AUTOCONF settings

Revision  Changes    Path
1.67                 eclass/autotools.eclass

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/autotools.eclass?rev=1.67&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/autotools.eclass?rev=1.67&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/autotools.eclass?r1=1.66&r2=1.67

Index: autotools.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -r1.66 -r1.67
--- autotools.eclass	30 May 2007 15:45:01 -0000	1.66
+++ autotools.eclass	17 Sep 2007 23:15:51 -0000	1.67
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v 1.66 2007/05/30 15:45:01 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v 1.67 2007/09/17 23:15:51 vapier Exp $
 #
 # Maintainer: base-system@gentoo.org
 #
@@ -18,10 +18,9 @@
 _autoconf_atom="sys-devel/autoconf"
 if [[ -n ${WANT_AUTOMAKE} ]]; then
 	case ${WANT_AUTOMAKE} in
-		# workaround while we have different versions of automake in arch and ~arch
-		none) _automake_atom="" ;; # some packages don't require automake at all
+		none)   _automake_atom="" ;; # some packages don't require automake at all
 		latest) _automake_atom="=sys-devel/automake-1.10*" ;;
-		*) _automake_atom="=sys-devel/automake-${WANT_AUTOMAKE}*" ;;
+		*)      _automake_atom="=sys-devel/automake-${WANT_AUTOMAKE}*" ;;
 	esac
 	[[ ${WANT_AUTOMAKE} == "latest" ]] && WANT_AUTOMAKE="1.10"
 	export WANT_AUTOMAKE
@@ -29,8 +28,10 @@
 
 if [[ -n ${WANT_AUTOCONF} ]] ; then
 	case ${WANT_AUTOCONF} in
-		2.1) _autoconf_atom="=sys-devel/autoconf-${WANT_AUTOCONF}*" ;;
-		latest | 2.5) _autoconf_atom=">=sys-devel/autoconf-2.59" ;;
+		none)       _autoconf_atom="" ;; # some packages don't require autoconf at all
+		2.1)        _autoconf_atom="=sys-devel/autoconf-${WANT_AUTOCONF}*" ;;
+		latest|2.5) _autoconf_atom=">=sys-devel/autoconf-2.61" ;;
+		*)          _autoconf_atom=">=sys-devel/autoconf-FAIL" ;;
 	esac
 	[[ ${WANT_AUTOCONF} == "latest" ]] && WANT_AUTOCONF="2.5"
 	export WANT_AUTOCONF



-- 
gentoo-commits@gentoo.org mailing list

[gentoo-commits] gentoo-x86 commit in eclass: autotools.eclass

[Mike Frysinger (vapier)]

vapier      07/09/18 13:25:39

  Modified:             autotools.eclass
  Log:
  change invalid dep atom to a message people can clearly grok #192892

Revision  Changes    Path
1.68                 eclass/autotools.eclass

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/autotools.eclass?rev=1.68&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/autotools.eclass?rev=1.68&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/autotools.eclass?r1=1.67&r2=1.68

Index: autotools.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -r1.67 -r1.68
--- autotools.eclass	17 Sep 2007 23:15:51 -0000	1.67
+++ autotools.eclass	18 Sep 2007 13:25:38 -0000	1.68
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v 1.67 2007/09/17 23:15:51 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v 1.68 2007/09/18 13:25:38 vapier Exp $
 #
 # Maintainer: base-system@gentoo.org
 #
@@ -31,7 +31,7 @@
 		none)       _autoconf_atom="" ;; # some packages don't require autoconf at all
 		2.1)        _autoconf_atom="=sys-devel/autoconf-${WANT_AUTOCONF}*" ;;
 		latest|2.5) _autoconf_atom=">=sys-devel/autoconf-2.61" ;;
-		*)          _autoconf_atom=">=sys-devel/autoconf-FAIL" ;;
+		*)          _autoconf_atom="INCORRECT-WANT_AUTOCONF-SETTING-IN-EBUILD" ;;
 	esac
 	[[ ${WANT_AUTOCONF} == "latest" ]] && WANT_AUTOCONF="2.5"
 	export WANT_AUTOCONF



-- 
gentoo-commits@gentoo.org mailing list

[gentoo-commits] gentoo-x86 commit in eclass: autotools.eclass

[Mike Frysinger (vapier)]

vapier      08/01/07 02:54:50

  Modified:             autotools.eclass
  Log:
  quote $T usage #204666 by Santiago M. Mola

Revision  Changes    Path
1.69                 eclass/autotools.eclass

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/autotools.eclass?rev=1.69&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/autotools.eclass?rev=1.69&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/autotools.eclass?r1=1.68&r2=1.69

Index: autotools.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -r1.68 -r1.69
--- autotools.eclass	18 Sep 2007 13:25:38 -0000	1.68
+++ autotools.eclass	7 Jan 2008 02:54:49 -0000	1.69
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v 1.68 2007/09/18 13:25:38 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v 1.69 2008/01/07 02:54:49 vapier Exp $
 #
 # Maintainer: base-system@gentoo.org
 #
@@ -200,11 +200,10 @@
 	local STDERR_TARGET="${T}/$$.out"
 	local ris
 
-	echo "***** $1 *****" > ${STDERR_TARGET%/*}/$1-${STDERR_TARGET##*/}
-	echo >> ${STDERR_TARGET%/*}/$1-${STDERR_TARGET##*/}
+	printf "***** $1 *****\n\n" > "${STDERR_TARGET%/*}/$1-${STDERR_TARGET##*/}"
 
 	ebegin "Running $@"
-	$@ >> ${STDERR_TARGET%/*}/$1-${STDERR_TARGET##*/} 2>&1
+	"$@" >> "${STDERR_TARGET%/*}/$1-${STDERR_TARGET##*/}" 2>&1
 	ris=$?
 	eend ${ris}
 



-- 
gentoo-commits@lists.gentoo.org mailing list

[gentoo-commits] gentoo-x86 commit in eclass: autotools.eclass

[Diego Petteno (flameeyes)]

flameeyes    08/01/13 18:41:28

  Modified:             autotools.eclass
  Log:
  Support packages that use GNUmakefile.am sa automake start file. Patch by Luca Bruno in bug #205606.

Revision  Changes    Path
1.70                 eclass/autotools.eclass

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/autotools.eclass?rev=1.70&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/autotools.eclass?rev=1.70&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/autotools.eclass?r1=1.69&r2=1.70

Index: autotools.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -r1.69 -r1.70
--- autotools.eclass	7 Jan 2008 02:54:49 -0000	1.69
+++ autotools.eclass	13 Jan 2008 18:41:28 -0000	1.70
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v 1.69 2008/01/07 02:54:49 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v 1.70 2008/01/13 18:41:28 flameeyes Exp $
 #
 # Maintainer: base-system@gentoo.org
 #
@@ -140,7 +140,7 @@
 	lttest="$(autotools_check_macro "AC_PROG_LIBTOOL")$(autotools_check_macro "AM_PROG_LIBTOOL")"
 	[[ -n $lttest ]] || return 0
 
-	[[ -f Makefile.am ]] && opts="--automake"
+	[[ -f GNUmakefile.am || -f Makefile.am ]] && opts="--automake"
 
 	[[ "${USERLAND}" == "Darwin" ]] && LIBTOOLIZE="glibtoolize"
 	autotools_run_tool ${LIBTOOLIZE:-libtoolize} "$@" ${opts}
@@ -168,16 +168,23 @@
 
 eautomake() {
 	local extra_opts
+	local makefile_name
 
-	[[ -f Makefile.am ]] || return 0
+	if [[ -f GNUmakefile.am ]]; then
+		makefile_name="GNUmakefile"
+	elif [[ -f Makefile.am ]]; then
+		makefile_name="Makefile"
+	else
+		return 0
+	fi
 
-	if [[ -z ${FROM_EAUTORECONF} && -f Makefile.in ]]; then
+	if [[ -z ${FROM_EAUTORECONF} && -f ${makefile_name}.in ]]; then
 		local used_automake
 		local installed_automake
 
 		installed_automake=$(automake --version | head -n 1 | \
 			sed -e 's:.*(GNU automake) ::')
-		used_automake=$(head -n 1 < Makefile.in | \
+		used_automake=$(head -n 1 < ${makefile_name}.in | \
 			sed -e 's:.*by automake \(.*\) from .*:\1:')
 
 		if [[ ${installed_automake} != ${used_automake} ]]; then



-- 
gentoo-commits@lists.gentoo.org mailing list

[gentoo-commits] gentoo-x86 commit in eclass: autotools.eclass

[Diego Petteno (flameeyes)]

flameeyes    08/01/25 22:45:24

  Modified:             autotools.eclass
  Log:
  Output a QA warning when the autotools functions are used outside of
  unpack phase. You should run then in src_unpack().

Revision  Changes    Path
1.71                 eclass/autotools.eclass

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/autotools.eclass?rev=1.71&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/autotools.eclass?rev=1.71&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/autotools.eclass?r1=1.70&r2=1.71

Index: autotools.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -r1.70 -r1.71
--- autotools.eclass	13 Jan 2008 18:41:28 -0000	1.70
+++ autotools.eclass	25 Jan 2008 22:45:23 -0000	1.71
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v 1.70 2008/01/13 18:41:28 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v 1.71 2008/01/25 22:45:23 flameeyes Exp $
 #
 # Maintainer: base-system@gentoo.org
 #
@@ -204,6 +204,10 @@
 
 # Internal function to run an autotools' tool
 autotools_run_tool() {
+	if [[ ${EBUILD_PHASE} != "unpack" ]]; then
+		ewarn "QA Warning: running $1 in ${EBUILD_PHASE} phase"
+	fi
+
 	local STDERR_TARGET="${T}/$$.out"
 	local ris
 



-- 
gentoo-commits@lists.gentoo.org mailing list

[gentoo-commits] gentoo-x86 commit in eclass: autotools.eclass

[Mike Frysinger (vapier)]

vapier      08/02/23 02:21:22

  Modified:             autotools.eclass
  Log:
  newer libtool versions have an --install flag for copying/updating helper files

Revision  Changes    Path
1.72                 eclass/autotools.eclass

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/autotools.eclass?rev=1.72&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/autotools.eclass?rev=1.72&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/autotools.eclass?r1=1.71&r2=1.72

Index: autotools.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -r1.71 -r1.72
--- autotools.eclass	25 Jan 2008 22:45:23 -0000	1.71
+++ autotools.eclass	23 Feb 2008 02:21:21 -0000	1.72
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v 1.71 2008/01/25 22:45:23 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v 1.72 2008/02/23 02:21:21 vapier Exp $
 #
 # Maintainer: base-system@gentoo.org
 #
@@ -92,7 +92,11 @@
 	einfo "Running eautoreconf in '$(pwd)' ..."
 	[[ -n ${auxdir} ]] && mkdir -p ${auxdir}
 	eaclocal
-	_elibtoolize --copy --force
+	if ${LIBTOOLIZE:-libtoolize} -n --install >& /dev/null ; then
+		_elibtoolize --copy --force --install
+	else
+		_elibtoolize --copy --force
+	fi
 	eautoconf
 	eautoheader
 	FROM_EAUTORECONF="yes" eautomake ${AM_OPTS}



-- 
gentoo-commits@lists.gentoo.org mailing list

[gentoo-commits] gentoo-x86 commit in eclass: autotools.eclass

[Mike Frysinger (vapier)]

vapier      08/03/31 14:19:35

  Modified:             autotools.eclass
  Log:
  include the exact command executed in the log

Revision  Changes    Path
1.73                 eclass/autotools.eclass

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/autotools.eclass?rev=1.73&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/autotools.eclass?rev=1.73&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/autotools.eclass?r1=1.72&r2=1.73

Index: autotools.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -r1.72 -r1.73
--- autotools.eclass	23 Feb 2008 02:21:21 -0000	1.72
+++ autotools.eclass	31 Mar 2008 14:19:35 -0000	1.73
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v 1.72 2008/02/23 02:21:21 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v 1.73 2008/03/31 14:19:35 vapier Exp $
 #
 # Maintainer: base-system@gentoo.org
 #
@@ -215,7 +215,7 @@
 	local STDERR_TARGET="${T}/$$.out"
 	local ris
 
-	printf "***** $1 *****\n\n" > "${STDERR_TARGET%/*}/$1-${STDERR_TARGET##*/}"
+	printf "***** $1 *****\n***** $*\n\n" > "${STDERR_TARGET%/*}/$1-${STDERR_TARGET##*/}"
 
 	ebegin "Running $@"
 	"$@" >> "${STDERR_TARGET%/*}/$1-${STDERR_TARGET##*/}" 2>&1



-- 
gentoo-commits@lists.gentoo.org mailing list

[gentoo-commits] gentoo-x86 commit in eclass: autotools.eclass

[Mike Frysinger (vapier)]

vapier      08/04/22 22:38:22

  Modified:             autotools.eclass
  Log:
  rip out ACLOCAL_AMFLAGS from Makefiles #142787

Revision  Changes    Path
1.74                 eclass/autotools.eclass

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/autotools.eclass?rev=1.74&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/autotools.eclass?rev=1.74&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/autotools.eclass?r1=1.73&r2=1.74

Index: autotools.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -r1.73 -r1.74
--- autotools.eclass	31 Mar 2008 14:19:35 -0000	1.73
+++ autotools.eclass	22 Apr 2008 22:38:22 -0000	1.74
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v 1.73 2008/03/31 14:19:35 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v 1.74 2008/04/22 22:38:22 vapier Exp $
 #
 # Maintainer: base-system@gentoo.org
 #
@@ -117,6 +117,13 @@
 eaclocal() {
 	local aclocal_opts
 
+	local amflags_file
+	for amflags_file in GNUmakefile.am Makefile.am GNUmakefile.in Makefile.in ; do
+		[[ -e ${amflags_file} ]] || continue
+		aclocal_opts=$(sed -n '/^ACLOCAL_AMFLAGS[[:space:]]*=/s:[^=]*=::p' ${amflags_file})
+		break
+	done
+
 	if [[ -n ${AT_M4DIR} ]] ; then
 		for x in ${AT_M4DIR} ; do
 			case "${x}" in



-- 
gentoo-commits@lists.gentoo.org mailing list

[gentoo-commits] gentoo-x86 commit in eclass: autotools.eclass

[Mike Frysinger (vapier)]

vapier      08/04/24 03:15:44

  Modified:             autotools.eclass
  Log:
  expand aclocal flags as it may be shell code #219029

Revision  Changes    Path
1.75                 eclass/autotools.eclass

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/autotools.eclass?rev=1.75&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/autotools.eclass?rev=1.75&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/autotools.eclass?r1=1.74&r2=1.75

Index: autotools.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -r1.74 -r1.75
--- autotools.eclass	22 Apr 2008 22:38:22 -0000	1.74
+++ autotools.eclass	24 Apr 2008 03:15:43 -0000	1.75
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v 1.74 2008/04/22 22:38:22 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v 1.75 2008/04/24 03:15:43 vapier Exp $
 #
 # Maintainer: base-system@gentoo.org
 #
@@ -121,6 +121,7 @@
 	for amflags_file in GNUmakefile.am Makefile.am GNUmakefile.in Makefile.in ; do
 		[[ -e ${amflags_file} ]] || continue
 		aclocal_opts=$(sed -n '/^ACLOCAL_AMFLAGS[[:space:]]*=/s:[^=]*=::p' ${amflags_file})
+		eval aclocal_opts=\"${aclocal_opts}\"
 		break
 	done
 



-- 
gentoo-commits@lists.gentoo.org mailing list

[gentoo-commits] gentoo-x86 commit in eclass: autotools.eclass

[Mike Frysinger (vapier)]

vapier      08/06/01 01:43:07

  Modified:             autotools.eclass
  Log:
  add eclass documentation by mren #210546

Revision  Changes    Path
1.76                 eclass/autotools.eclass

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/autotools.eclass?rev=1.76&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/autotools.eclass?rev=1.76&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/autotools.eclass?r1=1.75&r2=1.76

Index: autotools.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -r1.75 -r1.76
--- autotools.eclass	24 Apr 2008 03:15:43 -0000	1.75
+++ autotools.eclass	1 Jun 2008 01:43:06 -0000	1.76
@@ -1,17 +1,27 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v 1.75 2008/04/24 03:15:43 vapier Exp $
-#
-# Maintainer: base-system@gentoo.org
-#
-# This eclass is for handling autotooled software packages that
-# needs to regenerate their build scripts.
+# $Header: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v 1.76 2008/06/01 01:43:06 vapier Exp $
+
+# @ECLASS: autotools.eclass
+# @MAINTAINER:
+# base-system@gentoo.org
+# @BLURB: Regenerates auto* build scripts
+# @DESCRIPTION:
+# This eclass is for safely handling autotooled software packages that need to
+# regenerate their build scripts.  All functions will abort in case of errors.
 #
 # NB:  If you add anything, please comment it!
 
 inherit eutils libtool
 
+# @ECLASS-VARIABLE: WANT_AUTOCONF
+# @DESCRIPTION:
+# The major version of autoconf your package needs
 [[ -z ${WANT_AUTOCONF} ]] && WANT_AUTOCONF="latest"
+
+# @ECLASS-VARIABLE: WANT_AUTOMAKE
+# @DESCRIPTION:
+# The major version of automake your package needs
 [[ -z ${WANT_AUTOMAKE} ]] && WANT_AUTOMAKE="latest"
 
 _automake_atom="sys-devel/automake"
@@ -42,37 +52,33 @@
 RDEPEND=""
 unset _automake_atom _autoconf_atom
 
-# Variables:
-#
-#	AT_M4DIR		  - Additional director(y|ies) aclocal should search
-#	AM_OPTS			  - Additional options to pass to automake during
-#						eautoreconf call.
-#	AT_NOELIBTOOLIZE  - Don't run elibtoolize command if set to 'yes',
-#						useful when elibtoolize needs to be ran with
-#						particular options
-
-# Functions:
-#
-#	eautoreconf()  - Should do a full autoreconf - normally what most people
-#					 will be interested in.	 Also should handle additional
-#					 directories specified by AC_CONFIG_SUBDIRS.
-#	eaclocal()	   - Runs aclocal.	Respects AT_M4DIR for additional directories
-#					 to search for macro's.
-#	_elibtoolize() - Runs libtoolize.  Note the '_' prefix .. to not collide
-#					 with elibtoolize() from libtool.eclass
-#	eautoconf	   - Runs autoconf.
-#	eautoheader	   - Runs autoheader.
-#	eautomake	   - Runs automake
-#
+# @ECLASS-VARIABLE: AM_OPTS
+# @DESCRIPTION:
+# Additional options to pass to automake during
+# eautoreconf call.
+
+# @ECLASS-VARIABLE: AT_NOELIBTOOLIZE
+# @DESCRIPTION:
+# Don't run elibtoolize command if set to 'yes',
+# useful when elibtoolize needs to be ran with
+# particular options
 
 # XXX: M4DIR should be deprecated
+# @ECLASS-VARIABLE: AT_M4DIR
+# @DESCRIPTION:
+# Additional director(y|ies) aclocal should search
 AT_M4DIR=${AT_M4DIR:-${M4DIR}}
 AT_GNUCONF_UPDATE="no"
 
 
+# @FUNCTION: eautoreconf
+# @DESCRIPTION:
 # This function mimes the behavior of autoreconf, but uses the different
 # eauto* functions to run the tools. It doesn't accept parameters, but
 # the directory with include files can be specified with AT_M4DIR variable.
+# 
+# Should do a full autoreconf - normally what most people will be interested in.
+# Also should handle additional directories specified by AC_CONFIG_SUBDIRS.
 eautoreconf() {
 	local pwd=$(pwd) x auxdir
 
@@ -110,10 +116,13 @@
 	return 0
 }
 
+# @FUNCTION: eaclocal
+# @DESCRIPTION:
 # These functions runs the autotools using autotools_run_tool with the
 # specified parametes. The name of the tool run is the same of the function
 # without e prefix.
 # They also force installing the support files for safety.
+# Respects AT_M4DIR for additional directories to search for macro's.
 eaclocal() {
 	local aclocal_opts
 
@@ -143,6 +152,10 @@
 		autotools_run_tool aclocal "$@" ${aclocal_opts}
 }
 
+# @FUNCTION: _elibtoolize
+# @DESCRIPTION:
+# Runs libtoolize.  Note the '_' prefix .. to not collide with elibtoolize() from
+# libtool.eclass.
 _elibtoolize() {
 	local opts
 	local lttest
@@ -161,12 +174,18 @@
 	eaclocal
 }
 
+# @FUNCTION: eautoheader
+# @DESCRIPTION:
+# Runs autoheader.
 eautoheader() {
 	# Check if we should run autoheader
 	[[ -n $(autotools_check_macro "AC_CONFIG_HEADERS") ]] || return 0
 	NO_FAIL=1 autotools_run_tool autoheader "$@"
 }
 
+# @FUNCTION: eautoconf
+# @DESCRIPTION:
+# Runs autoconf.
 eautoconf() {
 	if [[ ! -f configure.ac && ! -f configure.in ]] ; then
 		echo
@@ -178,6 +197,9 @@
 	autotools_run_tool autoconf "$@"
 }
 
+# @FUNCTION: eautomake
+# @DESCRIPTION:
+# Runs automake.
 eautomake() {
 	local extra_opts
 	local makefile_name



-- 
gentoo-commits@lists.gentoo.org mailing list

[gentoo-commits] gentoo-x86 commit in eclass: autotools.eclass

[Mike Frysinger (vapier)]

vapier      08/06/09 09:09:58

  Modified:             autotools.eclass
  Log:
  allow autotools_check_macro to parse multiple arguments and add LT_INIT to macro list to run libtoolize

Revision  Changes    Path
1.77                 eclass/autotools.eclass

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/autotools.eclass?rev=1.77&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/autotools.eclass?rev=1.77&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/autotools.eclass?r1=1.76&r2=1.77

Index: autotools.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -r1.76 -r1.77
--- autotools.eclass	1 Jun 2008 01:43:06 -0000	1.76
+++ autotools.eclass	9 Jun 2008 09:09:58 -0000	1.77
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v 1.76 2008/06/01 01:43:06 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v 1.77 2008/06/09 09:09:58 vapier Exp $
 
 # @ECLASS: autotools.eclass
 # @MAINTAINER:
@@ -158,12 +158,10 @@
 # libtool.eclass.
 _elibtoolize() {
 	local opts
-	local lttest
 
 	# Check if we should run libtoolize (AM_PROG_LIBTOOL is an older macro,
 	# check for both it and the current AC_PROG_LIBTOOL)
-	lttest="$(autotools_check_macro "AC_PROG_LIBTOOL")$(autotools_check_macro "AM_PROG_LIBTOOL")"
-	[[ -n $lttest ]] || return 0
+	[[ -n $(autotools_check_macro AC_PROG_LIBTOOL AM_PROG_LIBTOOL LT_INIT) ]] || return 0
 
 	[[ -f GNUmakefile.am || -f Makefile.am ]] && opts="--automake"
 
@@ -266,8 +264,11 @@
 
 # Internal function to check for support
 autotools_check_macro() {
-	[[ -f configure.ac || -f configure.in ]] && \
-		WANT_AUTOCONF="2.5" autoconf --trace=$1 2>/dev/null
+	[[ -f configure.ac || -f configure.in ]] || return 0
+	local macro
+	for macro ; do
+		WANT_AUTOCONF="2.5" autoconf --trace="${macro}" 2>/dev/null
+	done
 	return 0
 }
 



-- 
gentoo-commits@lists.gentoo.org mailing list

[gentoo-commits] gentoo-x86 commit in eclass: autotools.eclass

[Jeremy Olexa (darkside)]

darkside    08/07/31 19:13:57

  Modified:             autotools.eclass
  Log:
  Add check to autotools.eclass to make sure eautoreconf doesn't get ran more than once, bug #232820

Revision  Changes    Path
1.78                 eclass/autotools.eclass

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/autotools.eclass?rev=1.78&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/autotools.eclass?rev=1.78&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/autotools.eclass?r1=1.77&r2=1.78

Index: autotools.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -r1.77 -r1.78
--- autotools.eclass	9 Jun 2008 09:09:58 -0000	1.77
+++ autotools.eclass	31 Jul 2008 19:13:57 -0000	1.78
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v 1.77 2008/06/09 09:09:58 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v 1.78 2008/07/31 19:13:57 darkside Exp $
 
 # @ECLASS: autotools.eclass
 # @MAINTAINER:
@@ -81,6 +81,9 @@
 # Also should handle additional directories specified by AC_CONFIG_SUBDIRS.
 eautoreconf() {
 	local pwd=$(pwd) x auxdir
+	
+	[[ -f .eautoreconfd ]] && einfo "eautoreconf already ran, skipping" && return 0
+	touch .eautoreconfd
 
 	if [[ -z ${AT_NO_RECURSIVE} ]]; then
 		# Take care of subdirs

[gentoo-commits] gentoo-x86 commit in eclass: autotools.eclass

[Samuli Suominen (drac)]

drac        08/07/31 19:54:33

  Modified:             autotools.eclass
  Log:
  Replace touch with bash redirection, so that it doesn't depend on coreutils. It doesn't have to.

Revision  Changes    Path
1.79                 eclass/autotools.eclass

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/autotools.eclass?rev=1.79&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/autotools.eclass?rev=1.79&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/autotools.eclass?r1=1.78&r2=1.79

Index: autotools.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -r1.78 -r1.79
--- autotools.eclass	31 Jul 2008 19:13:57 -0000	1.78
+++ autotools.eclass	31 Jul 2008 19:54:33 -0000	1.79
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v 1.78 2008/07/31 19:13:57 darkside Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v 1.79 2008/07/31 19:54:33 drac Exp $
 
 # @ECLASS: autotools.eclass
 # @MAINTAINER:
@@ -83,7 +83,7 @@
 	local pwd=$(pwd) x auxdir
 	
 	[[ -f .eautoreconfd ]] && einfo "eautoreconf already ran, skipping" && return 0
-	touch .eautoreconfd
+	>> .eautoreconfd
 
 	if [[ -z ${AT_NO_RECURSIVE} ]]; then
 		# Take care of subdirs

[gentoo-commits] gentoo-x86 commit in eclass: autotools.eclass

[Jeremy Olexa (darkside)]

darkside    08/07/31 20:45:42

  Modified:             autotools.eclass
  Log:
  Revert my last commit with regards to running eaotoreconf twice. Found out from flameeyes that this is possibly a bad thing that breaks the eclass. Working out a solution.

Revision  Changes    Path
1.80                 eclass/autotools.eclass

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/autotools.eclass?rev=1.80&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/autotools.eclass?rev=1.80&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/autotools.eclass?r1=1.79&r2=1.80

Index: autotools.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -r1.79 -r1.80
--- autotools.eclass	31 Jul 2008 19:54:33 -0000	1.79
+++ autotools.eclass	31 Jul 2008 20:45:41 -0000	1.80
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v 1.79 2008/07/31 19:54:33 drac Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v 1.80 2008/07/31 20:45:41 darkside Exp $
 
 # @ECLASS: autotools.eclass
 # @MAINTAINER:
@@ -82,9 +82,6 @@
 eautoreconf() {
 	local pwd=$(pwd) x auxdir
 	
-	[[ -f .eautoreconfd ]] && einfo "eautoreconf already ran, skipping" && return 0
-	>> .eautoreconfd
-
 	if [[ -z ${AT_NO_RECURSIVE} ]]; then
 		# Take care of subdirs
 		for x in $(autotools_get_subdirs); do

[gentoo-commits] gentoo-x86 commit in eclass: autotools.eclass

[Jorge Manuel B. S. Vicetto (jmbsvicetto)]

jmbsvicetto    08/09/26 16:21:55

  Modified:             autotools.eclass
  Log:
  Add a || clause to the phase test as autotools functions may now be called from
  src_unpack or from src_prepare for EAPI-2.

Revision  Changes    Path
1.81                 eclass/autotools.eclass

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/autotools.eclass?rev=1.81&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/autotools.eclass?rev=1.81&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/autotools.eclass?r1=1.80&r2=1.81

Index: autotools.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -r1.80 -r1.81
--- autotools.eclass	31 Jul 2008 20:45:41 -0000	1.80
+++ autotools.eclass	26 Sep 2008 16:21:54 -0000	1.81
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v 1.80 2008/07/31 20:45:41 darkside Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v 1.81 2008/09/26 16:21:54 jmbsvicetto Exp $
 
 # @ECLASS: autotools.eclass
 # @MAINTAINER:
@@ -76,12 +76,12 @@
 # This function mimes the behavior of autoreconf, but uses the different
 # eauto* functions to run the tools. It doesn't accept parameters, but
 # the directory with include files can be specified with AT_M4DIR variable.
-# 
+#
 # Should do a full autoreconf - normally what most people will be interested in.
 # Also should handle additional directories specified by AC_CONFIG_SUBDIRS.
 eautoreconf() {
 	local pwd=$(pwd) x auxdir
-	
+
 	if [[ -z ${AT_NO_RECURSIVE} ]]; then
 		# Take care of subdirs
 		for x in $(autotools_get_subdirs); do
@@ -236,7 +236,7 @@
 
 # Internal function to run an autotools' tool
 autotools_run_tool() {
-	if [[ ${EBUILD_PHASE} != "unpack" ]]; then
+	if [[ ${EBUILD_PHASE} != "unpack" && ${EBUILD_PHASE} != "prepare" ]]; then
 		ewarn "QA Warning: running $1 in ${EBUILD_PHASE} phase"
 	fi
 

[gentoo-commits] gentoo-x86 commit in eclass: autotools.eclass

[Mike Frysinger (vapier)]

vapier      09/01/04 16:54:10

  Modified:             autotools.eclass
  Log:
  dont add sys-devel/libtool to DEPEND if the package is sys-devel/libtool #253635 by Javier Villavicencio

Revision  Changes    Path
1.82                 eclass/autotools.eclass

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/autotools.eclass?rev=1.82&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/autotools.eclass?rev=1.82&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/autotools.eclass?r1=1.81&r2=1.82

Index: autotools.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -r1.81 -r1.82
--- autotools.eclass	26 Sep 2008 16:21:54 -0000	1.81
+++ autotools.eclass	4 Jan 2009 16:54:10 -0000	1.82
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v 1.81 2008/09/26 16:21:54 jmbsvicetto Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v 1.82 2009/01/04 16:54:10 vapier Exp $
 
 # @ECLASS: autotools.eclass
 # @MAINTAINER:
@@ -47,8 +47,8 @@
 	export WANT_AUTOCONF
 fi
 DEPEND="${_automake_atom}
-	${_autoconf_atom}
-	sys-devel/libtool"
+	${_autoconf_atom}"
+[[ ${CATEGORY}/${PN} != "sys-devel/libtool" ]] && DEPEND="${DEPEND} sys-devel/libtool"
 RDEPEND=""
 unset _automake_atom _autoconf_atom
 

[gentoo-commits] gentoo-x86 commit in eclass: autotools.eclass

[Fabian Groffen (grobian)]

grobian     09/04/04 17:45:43

  Modified:             autotools.eclass
  Log:
  backport Darwin fixes from Prefix

Revision  Changes    Path
1.83                 eclass/autotools.eclass

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/autotools.eclass?rev=1.83&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/autotools.eclass?rev=1.83&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/autotools.eclass?r1=1.82&r2=1.83

Index: autotools.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -r1.82 -r1.83
--- autotools.eclass	4 Jan 2009 16:54:10 -0000	1.82
+++ autotools.eclass	4 Apr 2009 17:45:42 -0000	1.83
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v 1.82 2009/01/04 16:54:10 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v 1.83 2009/04/04 17:45:42 grobian Exp $
 
 # @ECLASS: autotools.eclass
 # @MAINTAINER:
@@ -80,7 +80,7 @@
 # Should do a full autoreconf - normally what most people will be interested in.
 # Also should handle additional directories specified by AC_CONFIG_SUBDIRS.
 eautoreconf() {
-	local pwd=$(pwd) x auxdir
+	local pwd=$(pwd) x auxdir g=
 
 	if [[ -z ${AT_NO_RECURSIVE} ]]; then
 		# Take care of subdirs
@@ -98,7 +98,8 @@
 	einfo "Running eautoreconf in '$(pwd)' ..."
 	[[ -n ${auxdir} ]] && mkdir -p ${auxdir}
 	eaclocal
-	if ${LIBTOOLIZE:-libtoolize} -n --install >& /dev/null ; then
+	[[ ${CHOST} == *-darwin* ]] && g=g
+	if ${LIBTOOLIZE:-${g}libtoolize} -n --install >& /dev/null ; then
 		_elibtoolize --copy --force --install
 	else
 		_elibtoolize --copy --force
@@ -157,7 +158,7 @@
 # Runs libtoolize.  Note the '_' prefix .. to not collide with elibtoolize() from
 # libtool.eclass.
 _elibtoolize() {
-	local opts
+	local opts g=
 
 	# Check if we should run libtoolize (AM_PROG_LIBTOOL is an older macro,
 	# check for both it and the current AC_PROG_LIBTOOL)
@@ -165,8 +166,8 @@
 
 	[[ -f GNUmakefile.am || -f Makefile.am ]] && opts="--automake"
 
-	[[ "${USERLAND}" == "Darwin" ]] && LIBTOOLIZE="glibtoolize"
-	autotools_run_tool ${LIBTOOLIZE:-libtoolize} "$@" ${opts}
+	[[ ${CHOST} == *-darwin* ]] && g=g
+	autotools_run_tool ${LIBTOOLIZE:-${g}libtoolize} "$@" ${opts}
 
 	# Need to rerun aclocal
 	eaclocal

[gentoo-commits] gentoo-x86 commit in eclass: autotools.eclass

[Mike Frysinger (vapier)]

vapier      09/04/12 07:38:33

  Modified:             autotools.eclass
  Log:
  set S when running elibtoolize so we get expected behavior #265319 by Michael Haubenwallner

Revision  Changes    Path
1.84                 eclass/autotools.eclass

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/autotools.eclass?rev=1.84&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/autotools.eclass?rev=1.84&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/autotools.eclass?r1=1.83&r2=1.84

Index: autotools.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -r1.83 -r1.84
--- autotools.eclass	4 Apr 2009 17:45:42 -0000	1.83
+++ autotools.eclass	12 Apr 2009 07:38:33 -0000	1.84
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v 1.83 2009/04/04 17:45:42 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v 1.84 2009/04/12 07:38:33 vapier Exp $
 
 # @ECLASS: autotools.eclass
 # @MAINTAINER:
@@ -111,8 +111,8 @@
 	[[ ${AT_NOELIBTOOLIZE} == "yes" ]] && return 0
 
 	# Call it here to prevent failures due to elibtoolize called _before_
-	# eautoreconf.
-	elibtoolize
+	# eautoreconf.  We set $S because elibtoolize runs on that #265319
+	S=${pwd} elibtoolize
 
 	return 0
 }

[gentoo-commits] gentoo-x86 commit in eclass: autotools.eclass

[Mike Frysinger (vapier)]

vapier      09/05/04 22:27:05

  Modified:             autotools.eclass
  Log:
  simplify log handling in autotools_run_tool and include the pwd in the log header

Revision  Changes    Path
1.85                 eclass/autotools.eclass

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/autotools.eclass?rev=1.85&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/autotools.eclass?rev=1.85&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/autotools.eclass?r1=1.84&r2=1.85

Index: autotools.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -r1.84 -r1.85
--- autotools.eclass	12 Apr 2009 07:38:33 -0000	1.84
+++ autotools.eclass	4 May 2009 22:27:05 -0000	1.85
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v 1.84 2009/04/12 07:38:33 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v 1.85 2009/05/04 22:27:05 vapier Exp $
 
 # @ECLASS: autotools.eclass
 # @MAINTAINER:
@@ -241,23 +241,26 @@
 		ewarn "QA Warning: running $1 in ${EBUILD_PHASE} phase"
 	fi
 
-	local STDERR_TARGET="${T}/$$.out"
-	local ris
+	local STDERR_TARGET="${T}/$1.out"
+	# most of the time, there will only be one run, but if there are
+	# more, make sure we get unique log filenames
+	if [[ -e ${STDERR_TARGET} ]] ; then
+		STDERR_TARGET="${T}/$1-$$.out"
+	fi
 
-	printf "***** $1 *****\n***** $*\n\n" > "${STDERR_TARGET%/*}/$1-${STDERR_TARGET##*/}"
+	printf "***** $1 *****\n***** PWD: ${PWD}\n***** $*\n\n" > "${STDERR_TARGET}"
 
 	ebegin "Running $@"
-	"$@" >> "${STDERR_TARGET%/*}/$1-${STDERR_TARGET##*/}" 2>&1
-	ris=$?
-	eend ${ris}
+	"$@" >> "${STDERR_TARGET}" 2>&1
+	eend $?
 
-	if [[ ${ris} != 0 && ${NO_FAIL} != 1 ]]; then
+	if [[ $? != 0 && ${NO_FAIL} != 1 ]] ; then
 		echo
 		eerror "Failed Running $1 !"
 		eerror
 		eerror "Include in your bugreport the contents of:"
 		eerror
-		eerror "  ${STDERR_TARGET%/*}/$1-${STDERR_TARGET##*/}"
+		eerror "  ${STDERR_TARGET}"
 		echo
 		die "Failed Running $1 !"
 	fi

[gentoo-commits] gentoo-x86 commit in eclass: autotools.eclass

[Diego Petteno (flameeyes)]

flameeyes    09/05/18 11:24:30

  Modified:             autotools.eclass
  Log:
  Replace the “latest” string with the correct version during the autotools_run_tool.
  
  Instead of doing that during the main evaluation, wait for it, so that
  it's done at the very last moment; this solves bug #270010 properly,
  without forcing an older automake version.
  
  It should also be possible to move the latest handling into the
  wrappers and use them if the new version is present, but that's
  another problem.

Revision  Changes    Path
1.86                 eclass/autotools.eclass

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/autotools.eclass?rev=1.86&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/autotools.eclass?rev=1.86&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/autotools.eclass?r1=1.85&r2=1.86

Index: autotools.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -r1.85 -r1.86
--- autotools.eclass	4 May 2009 22:27:05 -0000	1.85
+++ autotools.eclass	18 May 2009 11:24:30 -0000	1.86
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v 1.85 2009/05/04 22:27:05 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v 1.86 2009/05/18 11:24:30 flameeyes Exp $
 
 # @ECLASS: autotools.eclass
 # @MAINTAINER:
@@ -29,10 +29,10 @@
 if [[ -n ${WANT_AUTOMAKE} ]]; then
 	case ${WANT_AUTOMAKE} in
 		none)   _automake_atom="" ;; # some packages don't require automake at all
+		# if you change the “latest” version here, change also autotools_run_tool
 		latest) _automake_atom="=sys-devel/automake-1.10*" ;;
 		*)      _automake_atom="=sys-devel/automake-${WANT_AUTOMAKE}*" ;;
 	esac
-	[[ ${WANT_AUTOMAKE} == "latest" ]] && WANT_AUTOMAKE="1.10"
 	export WANT_AUTOMAKE
 fi
 
@@ -40,10 +40,10 @@
 	case ${WANT_AUTOCONF} in
 		none)       _autoconf_atom="" ;; # some packages don't require autoconf at all
 		2.1)        _autoconf_atom="=sys-devel/autoconf-${WANT_AUTOCONF}*" ;;
+		# if you change the “latest” version here, change also autotools_run_tool
 		latest|2.5) _autoconf_atom=">=sys-devel/autoconf-2.61" ;;
 		*)          _autoconf_atom="INCORRECT-WANT_AUTOCONF-SETTING-IN-EBUILD" ;;
 	esac
-	[[ ${WANT_AUTOCONF} == "latest" ]] && WANT_AUTOCONF="2.5"
 	export WANT_AUTOCONF
 fi
 DEPEND="${_automake_atom}
@@ -241,6 +241,11 @@
 		ewarn "QA Warning: running $1 in ${EBUILD_PHASE} phase"
 	fi
 
+	# We do the “latest” → version switch here because it solves
+	# possible order problems, see bug #270010 as an example.
+	[[ ${WANT_AUTOMAKE} == "latest" ]] && export WANT_AUTOMAKE=1.10
+	[[ ${WANT_AUTOCONF} == "latest" ]] && export WANT_AUTOCONF=2.5
+
 	local STDERR_TARGET="${T}/$1.out"
 	# most of the time, there will only be one run, but if there are
 	# more, make sure we get unique log filenames

[gentoo-commits] gentoo-x86 commit in eclass: autotools.eclass

[Mike Frysinger (vapier)]

vapier      09/12/04 09:11:14

  Modified:             autotools.eclass
  Log:
  reset WANT_AUTOMAKE to avoid "latest" warnings

Revision  Changes    Path
1.87                 eclass/autotools.eclass

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/autotools.eclass?rev=1.87&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/autotools.eclass?rev=1.87&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/autotools.eclass?r1=1.86&r2=1.87

Index: autotools.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -r1.86 -r1.87
--- autotools.eclass	18 May 2009 11:24:30 -0000	1.86
+++ autotools.eclass	4 Dec 2009 09:11:14 -0000	1.87
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v 1.86 2009/05/18 11:24:30 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v 1.87 2009/12/04 09:11:14 vapier Exp $
 
 # @ECLASS: autotools.eclass
 # @MAINTAINER:
@@ -215,7 +215,7 @@
 		local used_automake
 		local installed_automake
 
-		installed_automake=$(automake --version | head -n 1 | \
+		installed_automake=$(WANT_AUTOMAKE= automake --version | head -n 1 | \
 			sed -e 's:.*(GNU automake) ::')
 		used_automake=$(head -n 1 < ${makefile_name}.in | \
 			sed -e 's:.*by automake \(.*\) from .*:\1:')

[gentoo-commits] gentoo-x86 commit in eclass: autotools.eclass

[Tomas Chvatal (scarabeus)]

scarabeus    10/01/10 18:39:17

  Modified:             autotools.eclass
  Log:
  Fix wrongly commited autotools eclass.

Revision  Changes    Path
1.89                 eclass/autotools.eclass

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/autotools.eclass?rev=1.89&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/autotools.eclass?rev=1.89&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/autotools.eclass?r1=1.88&r2=1.89

Index: autotools.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -r1.88 -r1.89
--- autotools.eclass	10 Jan 2010 18:36:13 -0000	1.88
+++ autotools.eclass	10 Jan 2010 18:39:16 -0000	1.89
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v 1.88 2010/01/10 18:36:13 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v 1.89 2010/01/10 18:39:16 scarabeus Exp $
 
 # @ECLASS: autotools.eclass
 # @MAINTAINER:
@@ -30,7 +30,7 @@
 	case ${WANT_AUTOMAKE} in
 		none)   _automake_atom="" ;; # some packages don't require automake at all
 		# if you change the “latest” version here, change also autotools_run_tool
-		latest) _automake_atom=">=sys-devel/automake-1.10.0" ;;
+		latest) _automake_atom="=sys-devel/automake-1.10*" ;;
 		*)      _automake_atom="=sys-devel/automake-${WANT_AUTOMAKE}*" ;;
 	esac
 	export WANT_AUTOMAKE
@@ -243,7 +243,7 @@
 
 	# We do the “latest” → version switch here because it solves
 	# possible order problems, see bug #270010 as an example.
-	[[ ${WANT_AUTOMAKE} == "latest" ]] && export WANT_AUTOMAKE=1.11
+	[[ ${WANT_AUTOMAKE} == "latest" ]] && export WANT_AUTOMAKE=1.10
 	[[ ${WANT_AUTOCONF} == "latest" ]] && export WANT_AUTOCONF=2.5
 
 	local STDERR_TARGET="${T}/$1.out"

[gentoo-commits] gentoo-x86 commit in eclass: autotools.eclass

[Mike Frysinger (vapier)]

vapier      10/01/15 03:19:03

  Modified:             autotools.eclass
  Log:
  start an eautopoint helper

Revision  Changes    Path
1.90                 eclass/autotools.eclass

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/autotools.eclass?rev=1.90&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/autotools.eclass?rev=1.90&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/autotools.eclass?r1=1.89&r2=1.90

Index: autotools.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -r1.89 -r1.90
--- autotools.eclass	10 Jan 2010 18:39:16 -0000	1.89
+++ autotools.eclass	15 Jan 2010 03:19:03 -0000	1.90
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v 1.89 2010/01/10 18:39:16 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v 1.90 2010/01/15 03:19:03 vapier Exp $
 
 # @ECLASS: autotools.eclass
 # @MAINTAINER:
@@ -235,6 +235,13 @@
 	autotools_run_tool automake --add-missing --copy ${extra_opts} "$@"
 }
 
+# @FUNCTION: eautopoint
+# @DESCRIPTION:
+# Runs autopoint (from the gettext package).
+eautopoint() {
+	autotools_run_tool autopoint "$@"
+}
+
 # Internal function to run an autotools' tool
 autotools_run_tool() {
 	if [[ ${EBUILD_PHASE} != "unpack" && ${EBUILD_PHASE} != "prepare" ]]; then

[gentoo-commits] gentoo-x86 commit in eclass: autotools.eclass

[Mike Frysinger (vapier)]

vapier      10/01/17 01:09:04

  Modified:             autotools.eclass
  Log:
  avoid `pwd` command as we already have pushd/popd/$PWD

Revision  Changes    Path
1.91                 eclass/autotools.eclass

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/autotools.eclass?rev=1.91&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/autotools.eclass?rev=1.91&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/autotools.eclass?r1=1.90&r2=1.91

Index: autotools.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -r1.90 -r1.91
--- autotools.eclass	15 Jan 2010 03:19:03 -0000	1.90
+++ autotools.eclass	17 Jan 2010 01:09:04 -0000	1.91
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v 1.90 2010/01/15 03:19:03 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v 1.91 2010/01/17 01:09:04 vapier Exp $
 
 # @ECLASS: autotools.eclass
 # @MAINTAINER:
@@ -80,22 +80,22 @@
 # Should do a full autoreconf - normally what most people will be interested in.
 # Also should handle additional directories specified by AC_CONFIG_SUBDIRS.
 eautoreconf() {
-	local pwd=$(pwd) x auxdir g=
+	local x auxdir g
 
 	if [[ -z ${AT_NO_RECURSIVE} ]]; then
 		# Take care of subdirs
 		for x in $(autotools_get_subdirs); do
 			if [[ -d ${x} ]] ; then
-				cd "${x}"
+				pushd "${x}" >/dev/null
 				AT_NOELIBTOOLIZE="yes" eautoreconf
-				cd "${pwd}"
+				popd >/dev/null
 			fi
 		done
 	fi
 
 	auxdir=$(autotools_get_auxdir)
 
-	einfo "Running eautoreconf in '$(pwd)' ..."
+	einfo "Running eautoreconf in '${PWD}' ..."
 	[[ -n ${auxdir} ]] && mkdir -p ${auxdir}
 	eaclocal
 	[[ ${CHOST} == *-darwin* ]] && g=g
@@ -112,7 +112,7 @@
 
 	# Call it here to prevent failures due to elibtoolize called _before_
 	# eautoreconf.  We set $S because elibtoolize runs on that #265319
-	S=${pwd} elibtoolize
+	S=${PWD} elibtoolize
 
 	return 0
 }
@@ -188,7 +188,7 @@
 eautoconf() {
 	if [[ ! -f configure.ac && ! -f configure.in ]] ; then
 		echo
-		eerror "No configure.{ac,in} present in '$(pwd | sed -e 's:.*/::')'!"
+		eerror "No configure.{ac,in} present in '${PWD}'!"
 		echo
 		die "No configure.{ac,in} present!"
 	fi

[gentoo-commits] gentoo-x86 commit in eclass: autotools.eclass

[Samuli Suominen (ssuominen)]

ssuominen    10/02/08 11:04:02

  Modified:             autotools.eclass
  Log:
  Update libtool depend to at least 2.2.6b, which is first non vulnerable version, and also required by several packages bundling .m4 macros from libtool itself.

Revision  Changes    Path
1.92                 eclass/autotools.eclass

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/autotools.eclass?rev=1.92&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/autotools.eclass?rev=1.92&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/autotools.eclass?r1=1.91&r2=1.92

Index: autotools.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -r1.91 -r1.92
--- autotools.eclass	17 Jan 2010 01:09:04 -0000	1.91
+++ autotools.eclass	8 Feb 2010 11:04:01 -0000	1.92
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v 1.91 2010/01/17 01:09:04 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v 1.92 2010/02/08 11:04:01 ssuominen Exp $
 
 # @ECLASS: autotools.eclass
 # @MAINTAINER:
@@ -48,7 +48,7 @@
 fi
 DEPEND="${_automake_atom}
 	${_autoconf_atom}"
-[[ ${CATEGORY}/${PN} != "sys-devel/libtool" ]] && DEPEND="${DEPEND} sys-devel/libtool"
+[[ ${CATEGORY}/${PN} != "sys-devel/libtool" ]] && DEPEND="${DEPEND} >=sys-devel/libtool-2.2.6b"
 RDEPEND=""
 unset _automake_atom _autoconf_atom
 

[gentoo-commits] gentoo-x86 commit in eclass: autotools.eclass

[Mike Frysinger (vapier)]

vapier      10/03/07 17:42:40

  Modified:             autotools.eclass
  Log:
  let people make the autotool dependencies optional in their ebuilds

Revision  Changes    Path
1.93                 eclass/autotools.eclass

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/autotools.eclass?rev=1.93&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/autotools.eclass?rev=1.93&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/autotools.eclass?r1=1.92&r2=1.93

Index: autotools.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -r1.92 -r1.93
--- autotools.eclass	8 Feb 2010 11:04:01 -0000	1.92
+++ autotools.eclass	7 Mar 2010 17:42:39 -0000	1.93
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v 1.92 2010/02/08 11:04:01 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v 1.93 2010/03/07 17:42:39 vapier Exp $
 
 # @ECLASS: autotools.eclass
 # @MAINTAINER:
@@ -46,10 +46,20 @@
 	esac
 	export WANT_AUTOCONF
 fi
-DEPEND="${_automake_atom}
-	${_autoconf_atom}"
-[[ ${CATEGORY}/${PN} != "sys-devel/libtool" ]] && DEPEND="${DEPEND} >=sys-devel/libtool-2.2.6b"
+
+AUTOTOOLS_DEPEND="${_automake_atom} ${_autoconf_atom}"
+[[ ${CATEGORY}/${PN} != "sys-devel/libtool" ]] && AUTOTOOLS_DEPEND="${AUTOTOOLS_DEPEND} >=sys-devel/libtool-2.2.6b"
 RDEPEND=""
+
+# @ECLASS-VARIABLE: AUTOTOOLS_AUTO_DEPEND
+# @DESCRIPTION:
+# Set to 'no' to disable automatically adding to DEPEND.  This lets
+# ebuilds former conditional depends by using ${AUTOTOOLS_DEPEND} in
+# their own DEPEND string.
+if [[ ${AUTOTOOLS_AUTO_DEPEND} != "no" ]] ; then
+	DEPEND=${AUTOTOOLS_DEPEND}
+fi
+
 unset _automake_atom _autoconf_atom
 
 # @ECLASS-VARIABLE: AM_OPTS

[gentoo-commits] gentoo-x86 commit in eclass: autotools.eclass

[Mike Frysinger (vapier)]

vapier      10/03/07 17:43:11

  Modified:             autotools.eclass
  Log:
  tweak default variable value so eclass-manpages can figure things out

Revision  Changes    Path
1.94                 eclass/autotools.eclass

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/autotools.eclass?rev=1.94&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/autotools.eclass?rev=1.94&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/autotools.eclass?r1=1.93&r2=1.94

Index: autotools.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -r1.93 -r1.94
--- autotools.eclass	7 Mar 2010 17:42:39 -0000	1.93
+++ autotools.eclass	7 Mar 2010 17:43:11 -0000	1.94
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v 1.93 2010/03/07 17:42:39 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v 1.94 2010/03/07 17:43:11 vapier Exp $
 
 # @ECLASS: autotools.eclass
 # @MAINTAINER:
@@ -17,12 +17,12 @@
 # @ECLASS-VARIABLE: WANT_AUTOCONF
 # @DESCRIPTION:
 # The major version of autoconf your package needs
-[[ -z ${WANT_AUTOCONF} ]] && WANT_AUTOCONF="latest"
+: ${WANT_AUTOCONF:=latest}
 
 # @ECLASS-VARIABLE: WANT_AUTOMAKE
 # @DESCRIPTION:
 # The major version of automake your package needs
-[[ -z ${WANT_AUTOMAKE} ]] && WANT_AUTOMAKE="latest"
+: ${WANT_AUTOMAKE:=latest}
 
 _automake_atom="sys-devel/automake"
 _autoconf_atom="sys-devel/autoconf"
@@ -56,6 +56,7 @@
 # Set to 'no' to disable automatically adding to DEPEND.  This lets
 # ebuilds former conditional depends by using ${AUTOTOOLS_DEPEND} in
 # their own DEPEND string.
+: ${AUTOTOOLS_AUTO_DEPEND:=yes}
 if [[ ${AUTOTOOLS_AUTO_DEPEND} != "no" ]] ; then
 	DEPEND=${AUTOTOOLS_DEPEND}
 fi
@@ -77,7 +78,7 @@
 # @ECLASS-VARIABLE: AT_M4DIR
 # @DESCRIPTION:
 # Additional director(y|ies) aclocal should search
-AT_M4DIR=${AT_M4DIR:-${M4DIR}}
+: ${AT_M4DIR:=${M4DIR}}
 AT_GNUCONF_UPDATE="no"
 
 

[gentoo-commits] gentoo-x86 commit in eclass: autotools.eclass

[Robin H. Johnson (robbat2)]

robbat2     10/03/31 02:11:55

  Modified:             autotools.eclass
  Log:
  Bug #312315: We must reflect the latest stable automake SLOT for all architectures, otherwise we get fun circular build dependencies when we already have a should-be-sufficent automake and try to bring in a different one during the stage2->3 transition.

Revision  Changes    Path
1.95                 eclass/autotools.eclass

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/autotools.eclass?rev=1.95&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/autotools.eclass?rev=1.95&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/autotools.eclass?r1=1.94&r2=1.95

Index: autotools.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v
retrieving revision 1.94
retrieving revision 1.95
diff -p -w -b -B -u -u -r1.94 -r1.95
--- autotools.eclass	7 Mar 2010 17:43:11 -0000	1.94
+++ autotools.eclass	31 Mar 2010 02:11:55 -0000	1.95
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v 1.94 2010/03/07 17:43:11 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v 1.95 2010/03/31 02:11:55 robbat2 Exp $
 
 # @ECLASS: autotools.eclass
 # @MAINTAINER:
@@ -24,13 +24,29 @@ inherit eutils libtool
 # The major version of automake your package needs
 : ${WANT_AUTOMAKE:=latest}
 
+# @ECLASS-VARIABLE: _LATEST_AUTOMAKE
+# @DESCRIPTION:
+# CONSTANT!
+# The latest major version/slot of automake available on each arch. 
+# If a newer version is stable on any arch, and is NOT reflected in this list,
+# then circular dependencies may arise during emerge @system bootstraps.
+# Do NOT change this variable in your ebuilds!
+_LATEST_AUTOMAKE='1.11 1.10'
+
 _automake_atom="sys-devel/automake"
 _autoconf_atom="sys-devel/autoconf"
 if [[ -n ${WANT_AUTOMAKE} ]]; then
 	case ${WANT_AUTOMAKE} in
 		none)   _automake_atom="" ;; # some packages don't require automake at all
 		# if you change the “latest” version here, change also autotools_run_tool
-		latest) _automake_atom="=sys-devel/automake-1.10*" ;;
+		# this MUST reflect the latest stable major version for each arch!
+		latest) 
+			t="" ; for v in ${_LATEST_AUTOMAKE} ; do
+				t="${t} =sys-devel/automake-${v}*"
+			done
+			unset t v
+			_automake_atom="|| ( ${_automake_atom} )" 
+			;;
 		*)      _automake_atom="=sys-devel/automake-${WANT_AUTOMAKE}*" ;;
 	esac
 	export WANT_AUTOMAKE
@@ -261,7 +277,12 @@ autotools_run_tool() {
 
 	# We do the “latest” → version switch here because it solves
 	# possible order problems, see bug #270010 as an example.
-	[[ ${WANT_AUTOMAKE} == "latest" ]] && export WANT_AUTOMAKE=1.10
+	for pv in ${_LATEST_AUTOMAKE} ; do
+		has_version "=sys-devel/automake-${pv}*" && export WANT_AUTOMAKE="$pv"
+	done
+	unset pv
+	[[ ${WANT_AUTOMAKE} == "latest" ]] && \
+		die "Cannot find the latest automake! Tried ${_LATEST_AUTOMAKE}"
 	[[ ${WANT_AUTOCONF} == "latest" ]] && export WANT_AUTOCONF=2.5
 
 	local STDERR_TARGET="${T}/$1.out"

[gentoo-commits] gentoo-x86 commit in eclass: autotools.eclass

[Diego Petteno (flameeyes)]

flameeyes    10/04/01 10:12:36

  Modified:             autotools.eclass
  Log:
  Try to unbreak revision 1.95, at least guessing what Robin tried to do.

Revision  Changes    Path
1.96                 eclass/autotools.eclass

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/autotools.eclass?rev=1.96&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/autotools.eclass?rev=1.96&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/autotools.eclass?r1=1.95&r2=1.96

Index: autotools.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -r1.95 -r1.96
--- autotools.eclass	31 Mar 2010 02:11:55 -0000	1.95
+++ autotools.eclass	1 Apr 2010 10:12:36 -0000	1.96
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v 1.95 2010/03/31 02:11:55 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v 1.96 2010/04/01 10:12:36 flameeyes Exp $
 
 # @ECLASS: autotools.eclass
 # @MAINTAINER:
@@ -27,7 +27,7 @@
 # @ECLASS-VARIABLE: _LATEST_AUTOMAKE
 # @DESCRIPTION:
 # CONSTANT!
-# The latest major version/slot of automake available on each arch. 
+# The latest major version/slot of automake available on each arch.
 # If a newer version is stable on any arch, and is NOT reflected in this list,
 # then circular dependencies may arise during emerge @system bootstraps.
 # Do NOT change this variable in your ebuilds!
@@ -40,12 +40,13 @@
 		none)   _automake_atom="" ;; # some packages don't require automake at all
 		# if you change the “latest” version here, change also autotools_run_tool
 		# this MUST reflect the latest stable major version for each arch!
-		latest) 
-			t="" ; for v in ${_LATEST_AUTOMAKE} ; do
+		latest)
+			t=""
+			for v in ${_LATEST_AUTOMAKE} ; do
 				t="${t} =sys-devel/automake-${v}*"
 			done
+			_automake_atom="|| ( ${t} )"
 			unset t v
-			_automake_atom="|| ( ${_automake_atom} )" 
 			;;
 		*)      _automake_atom="=sys-devel/automake-${WANT_AUTOMAKE}*" ;;
 	esac
@@ -277,12 +278,14 @@
 
 	# We do the “latest” → version switch here because it solves
 	# possible order problems, see bug #270010 as an example.
-	for pv in ${_LATEST_AUTOMAKE} ; do
-		has_version "=sys-devel/automake-${pv}*" && export WANT_AUTOMAKE="$pv"
-	done
-	unset pv
-	[[ ${WANT_AUTOMAKE} == "latest" ]] && \
-		die "Cannot find the latest automake! Tried ${_LATEST_AUTOMAKE}"
+	if [[ ${WANT_AUTOMAKE} == "latest" ]]; then
+		for pv in ${_LATEST_AUTOMAKE} ; do
+			has_version "=sys-devel/automake-${pv}*" && export WANT_AUTOMAKE="$pv"
+		done
+		unset pv
+		[[ ${WANT_AUTOMAKE} == "latest" ]] && \
+			die "Cannot find the latest automake! Tried ${_LATEST_AUTOMAKE}"
+	fi
 	[[ ${WANT_AUTOCONF} == "latest" ]] && export WANT_AUTOCONF=2.5
 
 	local STDERR_TARGET="${T}/$1.out"

[gentoo-commits] gentoo-x86 commit in eclass: autotools.eclass

[Robin H. Johnson (robbat2)]

robbat2     10/04/01 21:42:38

  Modified:             autotools.eclass
  Log:
  Bug #312687: We actually need to consider the automake from the real root, not the ROOT destination for stage 1 builds.

Revision  Changes    Path
1.97                 eclass/autotools.eclass

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/autotools.eclass?rev=1.97&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/autotools.eclass?rev=1.97&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/autotools.eclass?r1=1.96&r2=1.97

Index: autotools.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v
retrieving revision 1.96
retrieving revision 1.97
diff -p -w -b -B -u -u -r1.96 -r1.97
--- autotools.eclass	1 Apr 2010 10:12:36 -0000	1.96
+++ autotools.eclass	1 Apr 2010 21:42:37 -0000	1.97
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v 1.96 2010/04/01 10:12:36 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v 1.97 2010/04/01 21:42:37 robbat2 Exp $
 
 # @ECLASS: autotools.eclass
 # @MAINTAINER:
@@ -280,7 +280,9 @@ autotools_run_tool() {
 	# possible order problems, see bug #270010 as an example.
 	if [[ ${WANT_AUTOMAKE} == "latest" ]]; then
 		for pv in ${_LATEST_AUTOMAKE} ; do
-			has_version "=sys-devel/automake-${pv}*" && export WANT_AUTOMAKE="$pv"
+			# has_version respects ROOT, but in this case, we don't want it to,
+			# thus "ROOT=/" prefix:
+			ROOT=/ has_version "=sys-devel/automake-${pv}*" && export WANT_AUTOMAKE="$pv"
 		done
 		unset pv
 		[[ ${WANT_AUTOMAKE} == "latest" ]] && \

[gentoo-commits] gentoo-x86 commit in eclass: autotools.eclass

[Mike Frysinger (vapier)]

vapier      10/05/23 22:52:41

  Modified:             autotools.eclass
  Log:
  run automake if the configure script requests it via AM_INIT_AUTOMAKE even if there are no .am files #311439

Revision  Changes    Path
1.98                 eclass/autotools.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools.eclass?rev=1.98&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools.eclass?rev=1.98&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools.eclass?r1=1.97&r2=1.98

Index: autotools.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -r1.97 -r1.98
--- autotools.eclass	1 Apr 2010 21:42:37 -0000	1.97
+++ autotools.eclass	23 May 2010 22:52:41 -0000	1.98
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v 1.97 2010/04/01 21:42:37 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v 1.98 2010/05/23 22:52:41 vapier Exp $
 
 # @ECLASS: autotools.eclass
 # @MAINTAINER:
@@ -231,21 +231,27 @@
 	local extra_opts
 	local makefile_name
 
-	if [[ -f GNUmakefile.am ]]; then
-		makefile_name="GNUmakefile"
-	elif [[ -f Makefile.am ]]; then
-		makefile_name="Makefile"
-	else
-		return 0
-	fi
+	# Run automake if:
+	#  - a Makefile.am type file exists
+	#  - a Makefile.in type file exists and the configure
+	#    script is using the AM_INIT_AUTOMAKE directive
+	for makefile_name in {GNUmakefile,{M,m}akefile}.{am,in} "" ; do
+		[[ -f ${makefile_name} ]] && break
+	done
+	[[ -z ${makefile_name} ]] && return 0
+
+	if [[ ${makefile_name} == *.in ]] ; then
+		if ! grep -qs AM_INIT_AUTOMAKE configure.?? ; then
+			return 0
+		fi
 
-	if [[ -z ${FROM_EAUTORECONF} && -f ${makefile_name}.in ]]; then
+	elif [[ -z ${FROM_EAUTORECONF} && -f ${makefile_name%.am}.in ]]; then
 		local used_automake
 		local installed_automake
 
 		installed_automake=$(WANT_AUTOMAKE= automake --version | head -n 1 | \
 			sed -e 's:.*(GNU automake) ::')
-		used_automake=$(head -n 1 < ${makefile_name}.in | \
+		used_automake=$(head -n 1 < ${makefile_name%.am}.in | \
 			sed -e 's:.*by automake \(.*\) from .*:\1:')
 
 		if [[ ${installed_automake} != ${used_automake} ]]; then

[gentoo-commits] gentoo-x86 commit in eclass: autotools.eclass

[Mike Frysinger (vapier)]

vapier      10/07/06 18:55:50

  Modified:             autotools.eclass
  Log:
  set automake-1.11 to default now that it is stable everywhere

Revision  Changes    Path
1.99                 eclass/autotools.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools.eclass?rev=1.99&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools.eclass?rev=1.99&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools.eclass?r1=1.98&r2=1.99

Index: autotools.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -r1.98 -r1.99
--- autotools.eclass	23 May 2010 22:52:41 -0000	1.98
+++ autotools.eclass	6 Jul 2010 18:55:50 -0000	1.99
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v 1.98 2010/05/23 22:52:41 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v 1.99 2010/07/06 18:55:50 vapier Exp $
 
 # @ECLASS: autotools.eclass
 # @MAINTAINER:
@@ -31,23 +31,16 @@
 # If a newer version is stable on any arch, and is NOT reflected in this list,
 # then circular dependencies may arise during emerge @system bootstraps.
 # Do NOT change this variable in your ebuilds!
-_LATEST_AUTOMAKE='1.11 1.10'
+_LATEST_AUTOMAKE='1.11'
 
 _automake_atom="sys-devel/automake"
 _autoconf_atom="sys-devel/autoconf"
 if [[ -n ${WANT_AUTOMAKE} ]]; then
 	case ${WANT_AUTOMAKE} in
 		none)   _automake_atom="" ;; # some packages don't require automake at all
-		# if you change the “latest” version here, change also autotools_run_tool
+		# if you change the "latest" version here, change also autotools_run_tool
 		# this MUST reflect the latest stable major version for each arch!
-		latest)
-			t=""
-			for v in ${_LATEST_AUTOMAKE} ; do
-				t="${t} =sys-devel/automake-${v}*"
-			done
-			_automake_atom="|| ( ${t} )"
-			unset t v
-			;;
+		latest) _automake_atom="|| ( `printf '=sys-devel/automake-%s* ' ${_LATEST_AUTOMAKE}` )" ;;
 		*)      _automake_atom="=sys-devel/automake-${WANT_AUTOMAKE}*" ;;
 	esac
 	export WANT_AUTOMAKE
@@ -285,12 +278,12 @@
 	# We do the “latest” → version switch here because it solves
 	# possible order problems, see bug #270010 as an example.
 	if [[ ${WANT_AUTOMAKE} == "latest" ]]; then
+		local pv
 		for pv in ${_LATEST_AUTOMAKE} ; do
 			# has_version respects ROOT, but in this case, we don't want it to,
 			# thus "ROOT=/" prefix:
 			ROOT=/ has_version "=sys-devel/automake-${pv}*" && export WANT_AUTOMAKE="$pv"
 		done
-		unset pv
 		[[ ${WANT_AUTOMAKE} == "latest" ]] && \
 			die "Cannot find the latest automake! Tried ${_LATEST_AUTOMAKE}"
 	fi

[gentoo-commits] gentoo-x86 commit in eclass: autotools.eclass

[Diego Petteno (flameeyes)]

flameeyes    11/04/06 03:52:08

  Modified:             autotools.eclass
  Log:
  Make sure to use AT_M4DIR values for autoheader and autoconf calls as well.
  
  This is required to re-build autotools on app-admin/sudo-1.8*

Revision  Changes    Path
1.102                eclass/autotools.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools.eclass?rev=1.102&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools.eclass?rev=1.102&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools.eclass?r1=1.101&r2=1.102

Index: autotools.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v
retrieving revision 1.101
retrieving revision 1.102
diff -u -r1.101 -r1.102
--- autotools.eclass	21 Aug 2010 19:39:52 -0000	1.101
+++ autotools.eclass	6 Apr 2011 03:52:08 -0000	1.102
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v 1.101 2010/08/21 19:39:52 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v 1.102 2011/04/06 03:52:08 flameeyes Exp $
 
 # @ECLASS: autotools.eclass
 # @MAINTAINER:
@@ -157,22 +157,8 @@
 		break
 	done
 
-	if [[ -n ${AT_M4DIR} ]] ; then
-		for x in ${AT_M4DIR} ; do
-			case "${x}" in
-			"-I")
-				# We handle it below
-				;;
-			*)
-				[[ ! -d ${x} ]] && ewarn "eaclocal: '${x}' does not exist"
-				aclocal_opts="${aclocal_opts} -I ${x}"
-				;;
-			esac
-		done
-	fi
-
 	[[ ! -f aclocal.m4 || -n $(grep -e 'generated.*by aclocal' aclocal.m4) ]] && \
-		autotools_run_tool aclocal "$@" ${aclocal_opts}
+		autotools_run_tool aclocal $(autotools_m4dir_include) "$@" ${aclocal_opts}
 }
 
 # @FUNCTION: _elibtoolize
@@ -201,7 +187,7 @@
 eautoheader() {
 	# Check if we should run autoheader
 	[[ -n $(autotools_check_macro "AC_CONFIG_HEADERS") ]] || return 0
-	NO_FAIL=1 autotools_run_tool autoheader "$@"
+	NO_FAIL=1 autotools_run_tool autoheader $(autotools_m4dir_include) "$@"
 }
 
 # @FUNCTION: eautoconf
@@ -215,7 +201,7 @@
 		die "No configure.{ac,in} present!"
 	fi
 
-	autotools_run_tool autoconf "$@"
+	autotools_run_tool autoconf $(autotools_m4dir_include) "$@"
 }
 
 # @FUNCTION: eautomake
@@ -320,7 +306,7 @@
 	[[ -f configure.ac || -f configure.in ]] || return 0
 	local macro
 	for macro ; do
-		WANT_AUTOCONF="2.5" autoconf --trace="${macro}" 2>/dev/null
+		WANT_AUTOCONF="2.5" autoconf $(autotools_m4dir_include) --trace="${macro}" 2>/dev/null
 	done
 	return 0
 }
@@ -355,3 +341,23 @@
 
 	return 0
 }
+
+autotools_m4dir_include() {
+	[[ -n ${AT_M4DIR} ]] || return
+
+	local include_opts=
+
+	for x in ${AT_M4DIR} ; do
+		case "${x}" in
+			"-I")
+				# We handle it below
+				;;
+			*)
+				[[ ! -d ${x} ]] && ewarn "autotools.eclass: '${x}' does not exist"
+				include_opts="${include_opts} -I ${x}"
+				;;
+		esac
+	done
+
+	echo $include_opts
+}

[gentoo-commits] gentoo-x86 commit in eclass: autotools.eclass

[Mike Frysinger (vapier)]

vapier      11/05/16 03:44:26

  Modified:             autotools.eclass
  Log:
  setup env before loading ACLOCAL_AMFLAGS #365401 by Dennis Schridde

Revision  Changes    Path
1.103                eclass/autotools.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools.eclass?rev=1.103&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools.eclass?rev=1.103&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools.eclass?r1=1.102&r2=1.103

Index: autotools.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -r1.102 -r1.103
--- autotools.eclass	6 Apr 2011 03:52:08 -0000	1.102
+++ autotools.eclass	16 May 2011 03:44:26 -0000	1.103
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v 1.102 2011/04/06 03:52:08 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v 1.103 2011/05/16 03:44:26 vapier Exp $
 
 # @ECLASS: autotools.eclass
 # @MAINTAINER:
@@ -152,6 +152,10 @@
 	local amflags_file
 	for amflags_file in GNUmakefile.am Makefile.am GNUmakefile.in Makefile.in ; do
 		[[ -e ${amflags_file} ]] || continue
+		# setup the env in case the pkg does something crazy
+		# in their ACLOCAL_AMFLAGS.  like run a shell script
+		# which turns around and runs autotools #365401
+		autotools_env_setup
 		aclocal_opts=$(sed -n '/^ACLOCAL_AMFLAGS[[:space:]]*=/s:[^=]*=::p' ${amflags_file})
 		eval aclocal_opts=\"${aclocal_opts}\"
 		break
@@ -257,11 +261,7 @@
 }
 
 # Internal function to run an autotools' tool
-autotools_run_tool() {
-	if [[ ${EBUILD_PHASE} != "unpack" && ${EBUILD_PHASE} != "prepare" ]]; then
-		ewarn "QA Warning: running $1 in ${EBUILD_PHASE} phase"
-	fi
-
+autotools_env_setup() {
 	# We do the “latest” → version switch here because it solves
 	# possible order problems, see bug #270010 as an example.
 	if [[ ${WANT_AUTOMAKE} == "latest" ]]; then
@@ -275,6 +275,13 @@
 			die "Cannot find the latest automake! Tried ${_LATEST_AUTOMAKE}"
 	fi
 	[[ ${WANT_AUTOCONF} == "latest" ]] && export WANT_AUTOCONF=2.5
+}
+autotools_run_tool() {
+	if [[ ${EBUILD_PHASE} != "unpack" && ${EBUILD_PHASE} != "prepare" ]]; then
+		ewarn "QA Warning: running $1 in ${EBUILD_PHASE} phase"
+	fi
+
+	autotools_env_setup
 
 	local STDERR_TARGET="${T}/$1.out"
 	# most of the time, there will only be one run, but if there are

[gentoo-commits] gentoo-x86 commit in eclass: autotools.eclass

[Mike Frysinger (vapier)]

vapier      11/08/07 22:53:28

  Modified:             autotools.eclass
  Log:
  make sure log output is unique #378057 by Martin von Gagern

Revision  Changes    Path
1.104                eclass/autotools.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools.eclass?rev=1.104&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools.eclass?rev=1.104&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools.eclass?r1=1.103&r2=1.104

Index: autotools.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -r1.103 -r1.104
--- autotools.eclass	16 May 2011 03:44:26 -0000	1.103
+++ autotools.eclass	7 Aug 2011 22:53:28 -0000	1.104
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v 1.103 2011/05/16 03:44:26 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v 1.104 2011/08/07 22:53:28 vapier Exp $
 
 # @ECLASS: autotools.eclass
 # @MAINTAINER:
@@ -287,7 +287,12 @@
 	# most of the time, there will only be one run, but if there are
 	# more, make sure we get unique log filenames
 	if [[ -e ${STDERR_TARGET} ]] ; then
-		STDERR_TARGET="${T}/$1-$$.out"
+		local i=1
+		while :; do
+			STDERR_TARGET="${T}/$1-${i}.out"
+			[[ -e ${STDERR_TARGET} ]] || break
+			: $(( i++ ))
+		done
 	fi
 
 	printf "***** $1 *****\n***** PWD: ${PWD}\n***** $*\n\n" > "${STDERR_TARGET}"

[gentoo-commits] gentoo-x86 commit in eclass: autotools.eclass

[Mike Frysinger (vapier)]

vapier      11/08/22 18:22:27

  Modified:             autotools.eclass
  Log:
  add a WANT_LIBTOOL knob so people can disable the dep if they really know what they are doing

Revision  Changes    Path
1.105                eclass/autotools.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools.eclass?rev=1.105&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools.eclass?rev=1.105&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools.eclass?r1=1.104&r2=1.105

Index: autotools.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -r1.104 -r1.105
--- autotools.eclass	7 Aug 2011 22:53:28 -0000	1.104
+++ autotools.eclass	22 Aug 2011 18:22:27 -0000	1.105
@@ -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.eclass,v 1.104 2011/08/07 22:53:28 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v 1.105 2011/08/22 18:22:27 vapier Exp $
 
 # @ECLASS: autotools.eclass
 # @MAINTAINER:
@@ -24,6 +24,11 @@
 # The major version of automake your package needs
 : ${WANT_AUTOMAKE:=latest}
 
+# @ECLASS-VARIABLE: WANT_LIBTOOL
+# @DESCRIPTION:
+# Do you want libtool?  Valid values here are "latest" and "none".
+: ${WANT_LIBTOOL:=latest}
+
 # @ECLASS-VARIABLE: _LATEST_AUTOMAKE
 # @INTERNAL
 # @DESCRIPTION:
@@ -58,8 +63,17 @@
 	export WANT_AUTOCONF
 fi
 
-AUTOTOOLS_DEPEND="${_automake_atom} ${_autoconf_atom}"
-[[ ${CATEGORY}/${PN} != "sys-devel/libtool" ]] && AUTOTOOLS_DEPEND="${AUTOTOOLS_DEPEND} >=sys-devel/libtool-2.2.6b"
+_libtool_atom="sys-devel/libtool"
+if [[ -n ${WANT_LIBTOOL} ]] ; then
+	case ${WANT_LIBTOOL} in
+		none)   _libtool_atom="" ;;
+		latest) ;;
+		*)      _libtool_atom="INCORRECT-WANT_LIBTOOL-SETTING-IN-EBUILD" ;;
+	esac
+	export WANT_LIBTOOL
+fi
+
+AUTOTOOLS_DEPEND="${_automake_atom} ${_autoconf_atom} ${_libtool_atom}"
 RDEPEND=""
 
 # @ECLASS-VARIABLE: AUTOTOOLS_AUTO_DEPEND

[gentoo-commits] gentoo-x86 commit in eclass: autotools.eclass

[Mike Frysinger (vapier)]

vapier      11/08/22 19:39:52

  Modified:             autotools.eclass
  Log:
  use `die` rather than invalid depend atoms since council ok-ed it some time ago

Revision  Changes    Path
1.106                eclass/autotools.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools.eclass?rev=1.106&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools.eclass?rev=1.106&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools.eclass?r1=1.105&r2=1.106

Index: autotools.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v
retrieving revision 1.105
retrieving revision 1.106
diff -u -r1.105 -r1.106
--- autotools.eclass	22 Aug 2011 18:22:27 -0000	1.105
+++ autotools.eclass	22 Aug 2011 19:39:52 -0000	1.106
@@ -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.eclass,v 1.105 2011/08/22 18:22:27 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v 1.106 2011/08/22 19:39:52 vapier Exp $
 
 # @ECLASS: autotools.eclass
 # @MAINTAINER:
@@ -58,7 +58,7 @@
 		2.1)        _autoconf_atom="=sys-devel/autoconf-${WANT_AUTOCONF}*" ;;
 		# if you change the “latest” version here, change also autotools_run_tool
 		latest|2.5) _autoconf_atom=">=sys-devel/autoconf-2.61" ;;
-		*)          _autoconf_atom="INCORRECT-WANT_AUTOCONF-SETTING-IN-EBUILD" ;;
+		*)          die "Invalid WANT_AUTOCONF value '${WANT_AUTOCONF}'" ;;
 	esac
 	export WANT_AUTOCONF
 fi
@@ -68,7 +68,7 @@
 	case ${WANT_LIBTOOL} in
 		none)   _libtool_atom="" ;;
 		latest) ;;
-		*)      _libtool_atom="INCORRECT-WANT_LIBTOOL-SETTING-IN-EBUILD" ;;
+		*)      die "Invalid WANT_LIBTOOL value '${WANT_LIBTOOL}'" ;;
 	esac
 	export WANT_LIBTOOL
 fi

[gentoo-commits] gentoo-x86 commit in eclass: autotools.eclass

[Mike Frysinger (vapier)]

vapier      11/09/23 04:14:02

  Modified:             autotools.eclass
  Log:
  handle multiline ACLOCAL_AMFLAGS #383525 by Mikael Morin

Revision  Changes    Path
1.107                eclass/autotools.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools.eclass?rev=1.107&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools.eclass?rev=1.107&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools.eclass?r1=1.106&r2=1.107

Index: autotools.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v
retrieving revision 1.106
retrieving revision 1.107
diff -u -r1.106 -r1.107
--- autotools.eclass	22 Aug 2011 19:39:52 -0000	1.106
+++ autotools.eclass	23 Sep 2011 04:14:02 -0000	1.107
@@ -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.eclass,v 1.106 2011/08/22 19:39:52 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v 1.107 2011/09/23 04:14:02 vapier Exp $
 
 # @ECLASS: autotools.eclass
 # @MAINTAINER:
@@ -153,30 +153,44 @@
 	return 0
 }
 
-# @FUNCTION: eaclocal
+# @FUNCTION: eaclocal_amflags
 # @DESCRIPTION:
-# These functions runs the autotools using autotools_run_tool with the
-# specified parametes. The name of the tool run is the same of the function
-# without e prefix.
-# They also force installing the support files for safety.
-# Respects AT_M4DIR for additional directories to search for macro's.
-eaclocal() {
-	local aclocal_opts
+# Extract the ACLOCAL_AMFLAGS value from the Makefile.am and try to handle
+# (most) of the crazy crap that people throw at us.
+eaclocal_amflags() {
+	local aclocal_opts amflags_file
 
-	local amflags_file
 	for amflags_file in GNUmakefile.am Makefile.am GNUmakefile.in Makefile.in ; do
 		[[ -e ${amflags_file} ]] || continue
 		# setup the env in case the pkg does something crazy
 		# in their ACLOCAL_AMFLAGS.  like run a shell script
-		# which turns around and runs autotools #365401
+		# which turns around and runs autotools. #365401
+		# or split across multiple lines. #383525
 		autotools_env_setup
-		aclocal_opts=$(sed -n '/^ACLOCAL_AMFLAGS[[:space:]]*=/s:[^=]*=::p' ${amflags_file})
-		eval aclocal_opts=\"${aclocal_opts}\"
+		aclocal_opts=$(sed -n \
+			"/^ACLOCAL_AMFLAGS[[:space:]]*=/{ \
+			  # match the first line
+			  s:[^=]*=::p; \
+			  # then gobble up all escaped lines
+			  : nextline /\\\\$/{ n; p; b nextline; } \
+			}" ${amflags_file})
+		eval aclocal_opts=\""${aclocal_opts}"\"
 		break
 	done
 
+	echo ${aclocal_opts}
+}
+
+# @FUNCTION: eaclocal
+# @DESCRIPTION:
+# These functions runs the autotools using autotools_run_tool with the
+# specified parametes. The name of the tool run is the same of the function
+# without e prefix.
+# They also force installing the support files for safety.
+# Respects AT_M4DIR for additional directories to search for macro's.
+eaclocal() {
 	[[ ! -f aclocal.m4 || -n $(grep -e 'generated.*by aclocal' aclocal.m4) ]] && \
-		autotools_run_tool aclocal $(autotools_m4dir_include) "$@" ${aclocal_opts}
+		autotools_run_tool aclocal $(autotools_m4dir_include) "$@" $(eaclocal_amflags)
 }
 
 # @FUNCTION: _elibtoolize

[gentoo-commits] gentoo-x86 commit in eclass: autotools.eclass

[Mike Frysinger (vapier)]

vapier      11/09/23 04:14:38

  Modified:             autotools.eclass
  Log:
  drop comment that bleeds into man page

Revision  Changes    Path
1.108                eclass/autotools.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools.eclass?rev=1.108&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools.eclass?rev=1.108&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools.eclass?r1=1.107&r2=1.108

Index: autotools.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v
retrieving revision 1.107
retrieving revision 1.108
diff -u -r1.107 -r1.108
--- autotools.eclass	23 Sep 2011 04:14:02 -0000	1.107
+++ autotools.eclass	23 Sep 2011 04:14:38 -0000	1.108
@@ -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.eclass,v 1.107 2011/09/23 04:14:02 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v 1.108 2011/09/23 04:14:38 vapier Exp $
 
 # @ECLASS: autotools.eclass
 # @MAINTAINER:
@@ -9,8 +9,6 @@
 # @DESCRIPTION:
 # This eclass is for safely handling autotooled software packages that need to
 # regenerate their build scripts.  All functions will abort in case of errors.
-#
-# NB:  If you add anything, please comment it!
 
 inherit eutils libtool
 

[gentoo-commits] gentoo-x86 commit in eclass: autotools.eclass

[Mike Frysinger (vapier)]

vapier      11/10/05 13:44:25

  Modified:             autotools.eclass
  Log:
  also check for README files for --foreign (reported by Mr_Bones_)

Revision  Changes    Path
1.109                eclass/autotools.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools.eclass?rev=1.109&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools.eclass?rev=1.109&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools.eclass?r1=1.108&r2=1.109

Index: autotools.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v
retrieving revision 1.108
retrieving revision 1.109
diff -u -r1.108 -r1.109
--- autotools.eclass	23 Sep 2011 04:14:38 -0000	1.108
+++ autotools.eclass	5 Oct 2011 13:44:25 -0000	1.109
@@ -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.eclass,v 1.108 2011/09/23 04:14:38 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v 1.109 2011/10/05 13:44:25 vapier Exp $
 
 # @ECLASS: autotools.eclass
 # @MAINTAINER:
@@ -272,7 +272,7 @@
 		fi
 	fi
 
-	[[ -f INSTALL && -f AUTHORS && -f ChangeLog && -f NEWS ]] \
+	[[ -f INSTALL && -f AUTHORS && -f ChangeLog && -f NEWS && -f README ]] \
 		|| extra_opts="${extra_opts} --foreign"
 
 	# --force-missing seems not to be recognized by some flavours of automake

[gentoo-commits] gentoo-x86 commit in eclass: autotools.eclass

[Mike Frysinger (vapier)]

vapier      11/12/13 21:27:38

  Modified:             autotools.eclass
  Log:
  avoid multiple inclusions when possible to speed caching up

Revision  Changes    Path
1.111                eclass/autotools.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools.eclass?rev=1.111&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools.eclass?rev=1.111&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools.eclass?r1=1.110&r2=1.111

Index: autotools.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v
retrieving revision 1.110
retrieving revision 1.111
diff -u -r1.110 -r1.111
--- autotools.eclass	14 Nov 2011 17:08:49 -0000	1.110
+++ autotools.eclass	13 Dec 2011 21:27:38 -0000	1.111
@@ -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.eclass,v 1.110 2011/11/14 17:08:49 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v 1.111 2011/12/13 21:27:38 vapier Exp $
 
 # @ECLASS: autotools.eclass
 # @MAINTAINER:
@@ -10,6 +10,9 @@
 # This eclass is for safely handling autotooled software packages that need to
 # regenerate their build scripts.  All functions will abort in case of errors.
 
+if [[ ${___ECLASS_ONCE_AUTOTOOLS} != "recur -_+^+_- spank" ]] ; then
+___ECLASS_ONCE_AUTOTOOLS="recur -_+^+_- spank"
+
 inherit eutils libtool
 
 # @ECLASS-VARIABLE: WANT_AUTOCONF
@@ -399,3 +402,5 @@
 
 	echo $include_opts
 }
+
+fi

[gentoo-commits] gentoo-x86 commit in eclass: autotools.eclass

[Mike Frysinger (vapier)]

vapier      11/12/13 21:44:22

  Modified:             autotools.eclass
  Log:
  unify duplicated code for extracting values from traced variables

Revision  Changes    Path
1.112                eclass/autotools.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools.eclass?rev=1.112&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools.eclass?rev=1.112&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools.eclass?r1=1.111&r2=1.112

Index: autotools.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v
retrieving revision 1.111
retrieving revision 1.112
diff -u -r1.111 -r1.112
--- autotools.eclass	13 Dec 2011 21:27:38 -0000	1.111
+++ autotools.eclass	13 Dec 2011 21:44:22 -0000	1.112
@@ -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.eclass,v 1.111 2011/12/13 21:27:38 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v 1.112 2011/12/13 21:44:22 vapier Exp $
 
 # @ECLASS: autotools.eclass
 # @MAINTAINER:
@@ -352,36 +352,23 @@
 	return 0
 }
 
-# Internal function to get additional subdirs to configure
-autotools_get_subdirs() {
-	local subdirs_scan_out
-
-	subdirs_scan_out=$(autotools_check_macro "AC_CONFIG_SUBDIRS")
-	[[ -n ${subdirs_scan_out} ]] || return 0
-
-	echo "${subdirs_scan_out}" | gawk \
-	'($0 !~ /^[[:space:]]*(#|dnl)/) {
-		if (match($0, /AC_CONFIG_SUBDIRS:(.*)$/, res))
-			print res[1]
-	}' | uniq
+# Internal function to look for a macro and extract its value
+autotools_check_macro_val() {
+	local macro=$1 scan_out
+
+	autotools_check_macro "${macro}" | \
+		gawk -v macro="${macro}" \
+			'($0 !~ /^[[:space:]]*(#|dnl)/) {
+				if (match($0, macro ":(.*)$", res))
+					print res[1]
+			}' | uniq
 
 	return 0
 }
 
-autotools_get_auxdir() {
-	local auxdir_scan_out
-
-	auxdir_scan_out=$(autotools_check_macro "AC_CONFIG_AUX_DIR")
-	[[ -n ${auxdir_scan_out} ]] || return 0
-
-	echo ${auxdir_scan_out} | gawk \
-	'($0 !~ /^[[:space:]]*(#|dnl)/) {
-		if (match($0, /AC_CONFIG_AUX_DIR:(.*)$/, res))
-			print res[1]
-	}' | uniq
-
-	return 0
-}
+# Internal function to get additional subdirs to configure
+autotools_get_subdirs() { autotools_check_macro_val AC_CONFIG_SUBDIRS ; }
+autotools_get_auxdir() { autotools_check_macro_val AC_CONFIG_AUX_DIR ; }
 
 autotools_m4dir_include() {
 	[[ -n ${AT_M4DIR} ]] || return

[gentoo-commits] gentoo-x86 commit in eclass: autotools.eclass

[Mike Frysinger (vapier)]

vapier      11/12/13 21:57:05

  Modified:             autotools.eclass
  Log:
  initial AT_SYS_M4DIR for weird system integrators (cross-compiling/prefix/etc...)

Revision  Changes    Path
1.113                eclass/autotools.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools.eclass?rev=1.113&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools.eclass?rev=1.113&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools.eclass?r1=1.112&r2=1.113

Index: autotools.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v
retrieving revision 1.112
retrieving revision 1.113
diff -u -r1.112 -r1.113
--- autotools.eclass	13 Dec 2011 21:44:22 -0000	1.112
+++ autotools.eclass	13 Dec 2011 21:57:05 -0000	1.113
@@ -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.eclass,v 1.112 2011/12/13 21:44:22 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v 1.113 2011/12/13 21:57:05 vapier Exp $
 
 # @ECLASS: autotools.eclass
 # @MAINTAINER:
@@ -108,6 +108,14 @@
 # Additional director(y|ies) aclocal should search
 : ${AT_M4DIR:=${M4DIR}}
 
+# @ECLASS-VARIABLE: AT_SYS_M4DIR
+# @INTERNAL
+# @DESCRIPTION:
+# For system integrators, a list of additional aclocal search paths.
+# This variable gets eval-ed, so you can use variables in the definition
+# that may not be valid until eautoreconf & friends are run.
+: ${AT_SYS_M4DIR:=}
+
 # @FUNCTION: eautoreconf
 # @DESCRIPTION:
 # This function mimes the behavior of autoreconf, but uses the different
@@ -371,23 +379,21 @@
 autotools_get_auxdir() { autotools_check_macro_val AC_CONFIG_AUX_DIR ; }
 
 autotools_m4dir_include() {
-	[[ -n ${AT_M4DIR} ]] || return
-
-	local include_opts=
+	local x include_opts
 
-	for x in ${AT_M4DIR} ; do
+	for x in ${AT_M4DIR} $(eval echo ${AT_SYS_M4DIR}) ; do
 		case "${x}" in
 			"-I")
 				# We handle it below
 				;;
 			*)
 				[[ ! -d ${x} ]] && ewarn "autotools.eclass: '${x}' does not exist"
-				include_opts="${include_opts} -I ${x}"
+				include_opts+=" -I ${x}"
 				;;
 		esac
 	done
 
-	echo $include_opts
+	echo ${include_opts}
 }
 
 fi

[gentoo-commits] gentoo-x86 commit in eclass: autotools.eclass

[Mike Frysinger (vapier)]

vapier      11/12/14 18:33:59

  Modified:             autotools.eclass
  Log:
  drop old M4DIR support since we have AT_M4DIR and the tree uses only that, and note GNU m4 as a requirement

Revision  Changes    Path
1.114                eclass/autotools.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools.eclass?rev=1.114&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools.eclass?rev=1.114&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools.eclass?r1=1.113&r2=1.114

Index: autotools.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v
retrieving revision 1.113
retrieving revision 1.114
diff -u -r1.113 -r1.114
--- autotools.eclass	13 Dec 2011 21:57:05 -0000	1.113
+++ autotools.eclass	14 Dec 2011 18:33:59 -0000	1.114
@@ -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.eclass,v 1.113 2011/12/13 21:57:05 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v 1.114 2011/12/14 18:33:59 vapier Exp $
 
 # @ECLASS: autotools.eclass
 # @MAINTAINER:
@@ -10,6 +10,9 @@
 # This eclass is for safely handling autotooled software packages that need to
 # regenerate their build scripts.  All functions will abort in case of errors.
 
+# Note: We require GNU m4, as does autoconf.  So feel free to use any features
+# from the GNU version of m4 without worrying about other variants (i.e. BSD).
+
 if [[ ${___ECLASS_ONCE_AUTOTOOLS} != "recur -_+^+_- spank" ]] ; then
 ___ECLASS_ONCE_AUTOTOOLS="recur -_+^+_- spank"
 
@@ -102,11 +105,10 @@
 # useful when elibtoolize needs to be ran with
 # particular options
 
-# XXX: M4DIR should be deprecated
 # @ECLASS-VARIABLE: AT_M4DIR
 # @DESCRIPTION:
 # Additional director(y|ies) aclocal should search
-: ${AT_M4DIR:=${M4DIR}}
+: ${AT_M4DIR:=}
 
 # @ECLASS-VARIABLE: AT_SYS_M4DIR
 # @INTERNAL

[gentoo-commits] gentoo-x86 commit in eclass: autotools.eclass

[Mike Frysinger (vapier)]

vapier      11/12/14 19:15:14

  Modified:             autotools.eclass
  Log:
  push down AT_M4DIR handling into autotools_run_tool to keep the callers simpler, and change the ordering with AT_SYS_M4DIR so that it comes after the ebuild/package settings rather than in the middle

Revision  Changes    Path
1.115                eclass/autotools.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools.eclass?rev=1.115&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools.eclass?rev=1.115&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools.eclass?r1=1.114&r2=1.115

Index: autotools.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v
retrieving revision 1.114
retrieving revision 1.115
diff -u -r1.114 -r1.115
--- autotools.eclass	14 Dec 2011 18:33:59 -0000	1.114
+++ autotools.eclass	14 Dec 2011 19:15:13 -0000	1.115
@@ -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.eclass,v 1.114 2011/12/14 18:33:59 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v 1.115 2011/12/14 19:15:13 vapier Exp $
 
 # @ECLASS: autotools.eclass
 # @MAINTAINER:
@@ -201,7 +201,7 @@
 # Respects AT_M4DIR for additional directories to search for macro's.
 eaclocal() {
 	[[ ! -f aclocal.m4 || -n $(grep -e 'generated.*by aclocal' aclocal.m4) ]] && \
-		autotools_run_tool aclocal $(autotools_m4dir_include) "$@" $(eaclocal_amflags)
+		autotools_run_tool --at-m4flags aclocal "$@" $(eaclocal_amflags)
 }
 
 # @FUNCTION: _elibtoolize
@@ -230,7 +230,7 @@
 eautoheader() {
 	# Check if we should run autoheader
 	[[ -n $(autotools_check_macro "AC_CONFIG_HEADERS") ]] || return 0
-	NO_FAIL=1 autotools_run_tool autoheader $(autotools_m4dir_include) "$@"
+	autotools_run_tool --at-no-fail --at-m4flags autoheader "$@"
 }
 
 # @FUNCTION: eautoconf
@@ -244,7 +244,7 @@
 		die "No configure.{ac,in} present!"
 	fi
 
-	autotools_run_tool autoconf $(autotools_m4dir_include) "$@"
+	autotools_run_tool --at-m4flags autoconf "$@"
 }
 
 # @FUNCTION: eautomake
@@ -320,6 +320,18 @@
 		ewarn "QA Warning: running $1 in ${EBUILD_PHASE} phase"
 	fi
 
+	# Process our own internal flags first
+	local autofail=true m4flags=false
+	while [[ -n $1 ]] ; do
+		case $1 in
+		--at-no-fail) autofail=false;;
+		--at-m4flags) m4flags=true;;
+		# whatever is left goes to the actual tool
+		*) break;;
+		esac
+		shift
+	done
+
 	autotools_env_setup
 
 	local STDERR_TARGET="${T}/$1.out"
@@ -334,13 +346,15 @@
 		done
 	fi
 
+	if ${m4flags} ; then
+		set -- $(autotools_m4dir_include) "$@" $(autotools_m4sysdir_include)
+	fi
+
 	printf "***** $1 *****\n***** PWD: ${PWD}\n***** $*\n\n" > "${STDERR_TARGET}"
 
 	ebegin "Running $@"
 	"$@" >> "${STDERR_TARGET}" 2>&1
-	eend $?
-
-	if [[ $? != 0 && ${NO_FAIL} != 1 ]] ; then
+	if ! eend $? && ${autofail} ; then
 		echo
 		eerror "Failed Running $1 !"
 		eerror
@@ -380,14 +394,13 @@
 autotools_get_subdirs() { autotools_check_macro_val AC_CONFIG_SUBDIRS ; }
 autotools_get_auxdir() { autotools_check_macro_val AC_CONFIG_AUX_DIR ; }
 
-autotools_m4dir_include() {
+_autotools_m4dir_include() {
 	local x include_opts
 
-	for x in ${AT_M4DIR} $(eval echo ${AT_SYS_M4DIR}) ; do
-		case "${x}" in
-			"-I")
-				# We handle it below
-				;;
+	for x in "$@" ; do
+		case ${x} in
+			# We handle it below
+			-I) ;;
 			*)
 				[[ ! -d ${x} ]] && ewarn "autotools.eclass: '${x}' does not exist"
 				include_opts+=" -I ${x}"
@@ -397,5 +410,7 @@
 
 	echo ${include_opts}
 }
+autotools_m4dir_include()    { _autotools_m4dir_include ${AT_M4DIR} ; }
+autotools_m4sysdir_include() { _autotools_m4dir_include $(eval echo ${AT_SYS_M4DIR}) ; }
 
 fi

[gentoo-commits] gentoo-x86 commit in eclass: autotools.eclass

[Mike Frysinger (vapier)]

vapier      11/12/14 20:46:36

  Modified:             autotools.eclass
  Log:
  fix thinko with array handling when injecting args into the cmdline

Revision  Changes    Path
1.116                eclass/autotools.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools.eclass?rev=1.116&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools.eclass?rev=1.116&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools.eclass?r1=1.115&r2=1.116

Index: autotools.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v
retrieving revision 1.115
retrieving revision 1.116
diff -u -r1.115 -r1.116
--- autotools.eclass	14 Dec 2011 19:15:13 -0000	1.115
+++ autotools.eclass	14 Dec 2011 20:46:36 -0000	1.116
@@ -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.eclass,v 1.115 2011/12/14 19:15:13 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v 1.116 2011/12/14 20:46:36 vapier Exp $
 
 # @ECLASS: autotools.eclass
 # @MAINTAINER:
@@ -316,10 +316,6 @@
 	[[ ${WANT_AUTOCONF} == "latest" ]] && export WANT_AUTOCONF=2.5
 }
 autotools_run_tool() {
-	if [[ ${EBUILD_PHASE} != "unpack" && ${EBUILD_PHASE} != "prepare" ]]; then
-		ewarn "QA Warning: running $1 in ${EBUILD_PHASE} phase"
-	fi
-
 	# Process our own internal flags first
 	local autofail=true m4flags=false
 	while [[ -n $1 ]] ; do
@@ -332,6 +328,10 @@
 		shift
 	done
 
+	if [[ ${EBUILD_PHASE} != "unpack" && ${EBUILD_PHASE} != "prepare" ]]; then
+		ewarn "QA Warning: running $1 in ${EBUILD_PHASE} phase"
+	fi
+
 	autotools_env_setup
 
 	local STDERR_TARGET="${T}/$1.out"
@@ -347,7 +347,7 @@
 	fi
 
 	if ${m4flags} ; then
-		set -- $(autotools_m4dir_include) "$@" $(autotools_m4sysdir_include)
+		set -- "${1}" $(autotools_m4dir_include) "${@:2}" $(autotools_m4sysdir_include)
 	fi
 
 	printf "***** $1 *****\n***** PWD: ${PWD}\n***** $*\n\n" > "${STDERR_TARGET}"

[gentoo-commits] gentoo-x86 commit in eclass: autotools.eclass

[Mike Frysinger (vapier)]

vapier      12/01/04 22:00:28

  Modified:             autotools.eclass
  Log:
  always run automake if the configure file calls AM_INIT_AUTOMAKE #397697 by My Th

Revision  Changes    Path
1.117                eclass/autotools.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools.eclass?rev=1.117&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools.eclass?rev=1.117&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools.eclass?r1=1.116&r2=1.117

Index: autotools.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v
retrieving revision 1.116
retrieving revision 1.117
diff -u -r1.116 -r1.117
--- autotools.eclass	14 Dec 2011 20:46:36 -0000	1.116
+++ autotools.eclass	4 Jan 2012 22:00:27 -0000	1.117
@@ -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.eclass,v 1.116 2011/12/14 20:46:36 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v 1.117 2012/01/04 22:00:27 vapier Exp $
 
 # @ECLASS: autotools.eclass
 # @MAINTAINER:
@@ -256,14 +256,12 @@
 
 	# Run automake if:
 	#  - a Makefile.am type file exists
-	#  - a Makefile.in type file exists and the configure
-	#    script is using the AM_INIT_AUTOMAKE directive
-	for makefile_name in {GNUmakefile,{M,m}akefile}.{am,in} "" ; do
+	#  - the configure script is using the AM_INIT_AUTOMAKE directive
+	for makefile_name in {GNUmakefile,{M,m}akefile}.am "" ; do
 		[[ -f ${makefile_name} ]] && break
 	done
-	[[ -z ${makefile_name} ]] && return 0
 
-	if [[ ${makefile_name} == *.in ]] ; then
+	if [[ -z ${makefile_name} ]] ; then
 		if ! grep -qs AM_INIT_AUTOMAKE configure.?? ; then
 			return 0
 		fi

[gentoo-commits] gentoo-x86 commit in eclass: autotools.eclass

[Mike Frysinger (vapier)]

vapier      12/01/06 21:06:17

  Modified:             autotools.eclass
  Log:
  add a helper for updating config.rpath files for projects that dont use gettext

Revision  Changes    Path
1.118                eclass/autotools.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools.eclass?rev=1.118&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools.eclass?rev=1.118&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools.eclass?r1=1.117&r2=1.118

Index: autotools.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v
retrieving revision 1.117
retrieving revision 1.118
diff -u -r1.117 -r1.118
--- autotools.eclass	4 Jan 2012 22:00:27 -0000	1.117
+++ autotools.eclass	6 Jan 2012 21:06:17 -0000	1.118
@@ -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.eclass,v 1.117 2012/01/04 22:00:27 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v 1.118 2012/01/06 21:06:17 vapier Exp $
 
 # @ECLASS: autotools.eclass
 # @MAINTAINER:
@@ -297,6 +297,25 @@
 	autotools_run_tool autopoint "$@"
 }
 
+# @FUNCTION: config_rpath_update
+# @USAGE: [destination]
+# @DESCRIPTION:
+# Some packages utilize the config.rpath helper script, but don't
+# use gettext directly.  So we have to copy it in manually since
+# we can't let `autopoint` do it for us.
+config_rpath_update() {
+	local dst src=$(type -P gettext | sed 's:bin/gettext:share/gettext/config.rpath:')
+
+	[[ $# -eq 0 ]] && set -- $(find -name config.rpath)
+	[[ $# -eq 0 ]] && return 0
+
+	einfo "Updating all config.rpath files"
+	for dst in "$@" ; do
+		einfo "   ${dst}"
+		cp "${src}" "${dst}" || die
+	done
+}
+
 # Internal function to run an autotools' tool
 autotools_env_setup() {
 	# We do the “latest” → version switch here because it solves

[gentoo-commits] gentoo-x86 commit in eclass: autotools.eclass

[Mike Frysinger (vapier)]

vapier      12/02/13 17:21:44

  Modified:             autotools.eclass
  Log:
  update comments to reflect reality of func names

Revision  Changes    Path
1.120                eclass/autotools.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools.eclass?rev=1.120&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools.eclass?rev=1.120&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools.eclass?r1=1.119&r2=1.120

Index: autotools.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v
retrieving revision 1.119
retrieving revision 1.120
diff -u -r1.119 -r1.120
--- autotools.eclass	12 Feb 2012 00:20:54 -0000	1.119
+++ autotools.eclass	13 Feb 2012 17:21:44 -0000	1.120
@@ -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.eclass,v 1.119 2012/02/12 00:20:54 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v 1.120 2012/02/13 17:21:44 vapier Exp $
 
 # @ECLASS: autotools.eclass
 # @MAINTAINER:
@@ -60,7 +60,7 @@
 	case ${WANT_AUTOCONF} in
 		none)       _autoconf_atom="" ;; # some packages don't require autoconf at all
 		2.1)        _autoconf_atom="=sys-devel/autoconf-${WANT_AUTOCONF}*" ;;
-		# if you change the “latest” version here, change also autotools_run_tool
+		# if you change the "latest" version here, change also autotools_env_setup
 		latest|2.5) _autoconf_atom=">=sys-devel/autoconf-2.61" ;;
 		*)          die "Invalid WANT_AUTOCONF value '${WANT_AUTOCONF}'" ;;
 	esac
@@ -324,7 +324,7 @@
 
 # Internal function to run an autotools' tool
 autotools_env_setup() {
-	# We do the “latest” → version switch here because it solves
+	# We do the "latest" → version switch here because it solves
 	# possible order problems, see bug #270010 as an example.
 	if [[ ${WANT_AUTOMAKE} == "latest" ]]; then
 		local pv

[gentoo-commits] gentoo-x86 commit in eclass: autotools.eclass

[Mike Frysinger (vapier)]

vapier      12/02/13 17:26:17

  Modified:             autotools.eclass
  Log:
  require autoconf-2.68 since that is the latest stable now #403035

Revision  Changes    Path
1.121                eclass/autotools.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools.eclass?rev=1.121&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools.eclass?rev=1.121&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools.eclass?r1=1.120&r2=1.121

Index: autotools.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v
retrieving revision 1.120
retrieving revision 1.121
diff -u -r1.120 -r1.121
--- autotools.eclass	13 Feb 2012 17:21:44 -0000	1.120
+++ autotools.eclass	13 Feb 2012 17:26:17 -0000	1.121
@@ -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.eclass,v 1.120 2012/02/13 17:21:44 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v 1.121 2012/02/13 17:26:17 vapier Exp $
 
 # @ECLASS: autotools.eclass
 # @MAINTAINER:
@@ -61,7 +61,7 @@
 		none)       _autoconf_atom="" ;; # some packages don't require autoconf at all
 		2.1)        _autoconf_atom="=sys-devel/autoconf-${WANT_AUTOCONF}*" ;;
 		# if you change the "latest" version here, change also autotools_env_setup
-		latest|2.5) _autoconf_atom=">=sys-devel/autoconf-2.61" ;;
+		latest|2.5) _autoconf_atom=">=sys-devel/autoconf-2.68" ;;
 		*)          die "Invalid WANT_AUTOCONF value '${WANT_AUTOCONF}'" ;;
 	esac
 	export WANT_AUTOCONF

[gentoo-commits] gentoo-x86 commit in eclass: autotools.eclass

[Mike Frysinger (vapier)]

vapier      12/03/21 03:27:47

  Modified:             autotools.eclass
  Log:
  Raise _AUTOMAKE_LATEST from 1.11 to 1.11.1 wrt #408981

Revision  Changes    Path
1.125                eclass/autotools.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools.eclass?rev=1.125&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools.eclass?rev=1.125&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools.eclass?r1=1.124&r2=1.125

Index: autotools.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v
retrieving revision 1.124
retrieving revision 1.125
diff -u -r1.124 -r1.125
--- autotools.eclass	20 Mar 2012 15:32:02 -0000	1.124
+++ autotools.eclass	21 Mar 2012 03:27:47 -0000	1.125
@@ -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.eclass,v 1.124 2012/03/20 15:32:02 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v 1.125 2012/03/21 03:27:47 vapier Exp $
 
 # @ECLASS: autotools.eclass
 # @MAINTAINER:
@@ -37,11 +37,13 @@
 # @INTERNAL
 # @DESCRIPTION:
 # CONSTANT!
-# The latest major version/slot of automake available on each arch.
+# The latest major version/slot of automake available on each arch.  #312315
 # If a newer version is stable on any arch, and is NOT reflected in this list,
 # then circular dependencies may arise during emerge @system bootstraps.
+# If you want to force a newer minor version, you can specify the correct
+# WANT value by using a colon:  <PV>[:<WANT_AUTOMAKE>]
 # Do NOT change this variable in your ebuilds!
-_LATEST_AUTOMAKE='1.11'
+_LATEST_AUTOMAKE=( 1.11.1:1.11 )
 
 _automake_atom="sys-devel/automake"
 _autoconf_atom="sys-devel/autoconf"
@@ -50,7 +52,7 @@
 		none)   _automake_atom="" ;; # some packages don't require automake at all
 		# if you change the "latest" version here, change also autotools_run_tool
 		# this MUST reflect the latest stable major version for each arch!
-		latest) _automake_atom="|| ( `printf '=sys-devel/automake-%s* ' ${_LATEST_AUTOMAKE}` )" ;;
+		latest) _automake_atom="|| ( `printf '=sys-devel/automake-%s* ' ${_LATEST_AUTOMAKE[@]/%:*}` )" ;;
 		*)      _automake_atom="=sys-devel/automake-${WANT_AUTOMAKE}*" ;;
 	esac
 	export WANT_AUTOMAKE
@@ -345,10 +347,10 @@
 	# possible order problems, see bug #270010 as an example.
 	if [[ ${WANT_AUTOMAKE} == "latest" ]]; then
 		local pv
-		for pv in ${_LATEST_AUTOMAKE} ; do
+		for pv in ${_LATEST_AUTOMAKE[@]/#*:} ; do
 			# has_version respects ROOT, but in this case, we don't want it to,
 			# thus "ROOT=/" prefix:
-			ROOT=/ has_version "=sys-devel/automake-${pv}*" && export WANT_AUTOMAKE="$pv"
+			ROOT=/ has_version "=sys-devel/automake-${pv}*" && export WANT_AUTOMAKE="${pv}"
 		done
 		[[ ${WANT_AUTOMAKE} == "latest" ]] && \
 			die "Cannot find the latest automake! Tried ${_LATEST_AUTOMAKE}"

[gentoo-commits] gentoo-x86 commit in eclass: autotools.eclass

[Samuli Suominen (ssuominen)]

ssuominen    12/03/21 08:19:22

  Modified:             autotools.eclass
  Log:
  Fix automake depend atom to not force downgrade from 1.11.2 or 1.11.2 to 1.11.1 wrt #409083

Revision  Changes    Path
1.126                eclass/autotools.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools.eclass?rev=1.126&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools.eclass?rev=1.126&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools.eclass?r1=1.125&r2=1.126

Index: autotools.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v
retrieving revision 1.125
retrieving revision 1.126
diff -u -r1.125 -r1.126
--- autotools.eclass	21 Mar 2012 03:27:47 -0000	1.125
+++ autotools.eclass	21 Mar 2012 08:19:22 -0000	1.126
@@ -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.eclass,v 1.125 2012/03/21 03:27:47 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v 1.126 2012/03/21 08:19:22 ssuominen Exp $
 
 # @ECLASS: autotools.eclass
 # @MAINTAINER:
@@ -52,7 +52,7 @@
 		none)   _automake_atom="" ;; # some packages don't require automake at all
 		# if you change the "latest" version here, change also autotools_run_tool
 		# this MUST reflect the latest stable major version for each arch!
-		latest) _automake_atom="|| ( `printf '=sys-devel/automake-%s* ' ${_LATEST_AUTOMAKE[@]/%:*}` )" ;;
+		latest) _automake_atom="|| ( `printf '>=sys-devel/automake-%s ' ${_LATEST_AUTOMAKE[@]/%:*}` )" ;;
 		*)      _automake_atom="=sys-devel/automake-${WANT_AUTOMAKE}*" ;;
 	esac
 	export WANT_AUTOMAKE

[gentoo-commits] gentoo-x86 commit in eclass: autotools.eclass

[Mike Frysinger (vapier)]

vapier      12/03/21 21:51:32

  Modified:             autotools.eclass
  Log:
  restore functionality lost in previous commit

Revision  Changes    Path
1.128                eclass/autotools.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools.eclass?rev=1.128&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools.eclass?rev=1.128&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools.eclass?r1=1.127&r2=1.128

Index: autotools.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v
retrieving revision 1.127
retrieving revision 1.128
diff -u -r1.127 -r1.128
--- autotools.eclass	21 Mar 2012 17:12:01 -0000	1.127
+++ autotools.eclass	21 Mar 2012 21:51:32 -0000	1.128
@@ -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.eclass,v 1.127 2012/03/21 17:12:01 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v 1.128 2012/03/21 21:51:32 vapier Exp $
 
 # @ECLASS: autotools.eclass
 # @MAINTAINER:
@@ -16,7 +16,7 @@
 if [[ ${___ECLASS_ONCE_AUTOTOOLS} != "recur -_+^+_- spank" ]] ; then
 ___ECLASS_ONCE_AUTOTOOLS="recur -_+^+_- spank"
 
-inherit eutils libtool versionator
+inherit eutils libtool
 
 # @ECLASS-VARIABLE: WANT_AUTOCONF
 # @DESCRIPTION:
@@ -37,11 +37,13 @@
 # @INTERNAL
 # @DESCRIPTION:
 # CONSTANT!
-# The latest major-minor version/slot of automake available on each arch.  #312315
+# The latest major version/slot of automake available on each arch.  #312315
 # If a newer slot is stable on any arch, and is NOT reflected in this list,
 # then circular dependencies may arise during emerge @system bootstraps.
 # Do NOT change this variable in your ebuilds!
-_LATEST_AUTOMAKE=1.11.1
+# 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.11.1:1.11 )
 
 _automake_atom="sys-devel/automake"
 _autoconf_atom="sys-devel/autoconf"
@@ -51,14 +53,14 @@
 		# if you change the "latest" version here, change also autotools_run_tool
 		# this MUST reflect the latest stable major version for each arch!
 		latest)
-			if [[ ${EAPI:-0} != 0 ]]; then
-				_automake_atom=">=sys-devel/automake-${_LATEST_AUTOMAKE}:$(get_version_component_range 1-2 ${_LATEST_AUTOMAKE})"
+			# Use SLOT deps if we can.  For EAPI=0, we get pretty close.
+			if [[ ${EAPI:-0} != 0 ]] ; then
+				_automake_atom="|| ( `printf '>=sys-devel/automake-%s:%s ' ${_LATEST_AUTOMAKE[@]/:/ }` )"
 			else
-				_automake_atom=">=sys-devel/automake-${_LATEST_AUTOMAKE} =sys-devel/automake-$(get_version_component_range 1-2 ${_LATEST_AUTOMAKE})*"
+				_automake_atom="|| ( `printf '>=sys-devel/automake-%s ' ${_LATEST_AUTOMAKE[@]/%:*}` )"
 			fi
 			;;
-		*)
-			_automake_atom="=sys-devel/automake-${WANT_AUTOMAKE}*" ;;
+		*)      _automake_atom="=sys-devel/automake-${WANT_AUTOMAKE}*" ;;
 	esac
 	export WANT_AUTOMAKE
 fi
@@ -351,10 +353,12 @@
 	# We do the "latest" → version switch here because it solves
 	# possible order problems, see bug #270010 as an example.
 	if [[ ${WANT_AUTOMAKE} == "latest" ]]; then
-		# has_version respects ROOT, but in this case, we don't want it to,
-		# thus "ROOT=/" prefix:
-		ROOT=/ has_version "=sys-devel/automake-$(get_version_component_range 1-2 ${_LATEST_AUTOMAKE})*" && export WANT_AUTOMAKE="$(get_version_component_range 1-2 ${_LATEST_AUTOMAKE})"
-
+		local pv
+		for pv in ${_LATEST_AUTOMAKE[@]/#*:} ; do
+			# has_version respects ROOT, but in this case, we don't want it to,
+			# thus "ROOT=/" prefix:
+			ROOT=/ has_version "=sys-devel/automake-${pv}*" && export WANT_AUTOMAKE="${pv}"
+		done
 		[[ ${WANT_AUTOMAKE} == "latest" ]] && \
 			die "Cannot find the latest automake! Tried ${_LATEST_AUTOMAKE}"
 	fi

[gentoo-commits] gentoo-x86 commit in eclass: autotools.eclass

[Mike Frysinger (vapier)]

vapier      12/03/22 15:14:53

  Modified:             autotools.eclass
  Log:
  handle commented out AM_INIT_AUTOMAKE #398743

Revision  Changes    Path
1.129                eclass/autotools.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools.eclass?rev=1.129&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools.eclass?rev=1.129&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools.eclass?r1=1.128&r2=1.129

Index: autotools.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v
retrieving revision 1.128
retrieving revision 1.129
diff -u -r1.128 -r1.129
--- autotools.eclass	21 Mar 2012 21:51:32 -0000	1.128
+++ autotools.eclass	22 Mar 2012 15:14:53 -0000	1.129
@@ -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.eclass,v 1.128 2012/03/21 21:51:32 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v 1.129 2012/03/22 15:14:53 vapier Exp $
 
 # @ECLASS: autotools.eclass
 # @MAINTAINER:
@@ -294,7 +294,9 @@
 	done
 
 	if [[ -z ${makefile_name} ]] ; then
-		if ! grep -qs AM_INIT_AUTOMAKE configure.?? ; then
+		# Really we should just use autotools_check_macro ...
+		local am_init_automake=$(sed -n '/AM_INIT_AUTOMAKE/{s:#.*::;s:\<dnl\>.*::;p}' configure.??)
+		if [[ ${am_init_automake} != *"AM_INIT_AUTOMAKE"* ]] ; then
 			return 0
 		fi
 

[gentoo-commits] gentoo-x86 commit in eclass: autotools.eclass

[Mike Frysinger (vapier)]

vapier      12/03/22 19:16:22

  Modified:             autotools.eclass
  Log:
  drop AT_NOE{ACLOCAL,AUTOCONF,AUTOHEADER} as people should not be disabling these things, and document AT_NOEAUTOMAKE as a hack rather than a normally acceptable solution

Revision  Changes    Path
1.130                eclass/autotools.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools.eclass?rev=1.130&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools.eclass?rev=1.130&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools.eclass?r1=1.129&r2=1.130

Index: autotools.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v
retrieving revision 1.129
retrieving revision 1.130
diff -u -r1.129 -r1.130
--- autotools.eclass	22 Mar 2012 15:14:53 -0000	1.129
+++ autotools.eclass	22 Mar 2012 19:16:22 -0000	1.130
@@ -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.eclass,v 1.129 2012/03/22 15:14:53 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v 1.130 2012/03/22 19:16:22 vapier Exp $
 
 # @ECLASS: autotools.eclass
 # @MAINTAINER:
@@ -107,26 +107,12 @@
 # Additional options to pass to automake during
 # eautoreconf call.
 
-# @ECLASS-VARIABLE: AT_NOEACLOCAL
-# @DEFAULT_UNSET
-# @DESCRIPTION:
-# Don't run eaclocal command if set to 'yes',
-# useful when eaclocal needs to be ran with
-# particular options
-
-# @ECLASS-VARIABLE: AT_NOEAUTOCONF
-# @DEFAULT_UNSET
-# @DESCRIPTION:
-# Don't run eautoconf command if set to 'yes',
-# useful when eautoconf needs to be ran with
-# particular options
-
 # @ECLASS-VARIABLE: AT_NOEAUTOMAKE
 # @DEFAULT_UNSET
 # @DESCRIPTION:
-# Don't run eautomake command if set to 'yes',
-# useful when eautomake needs to be ran with
-# particular options
+# Don't run eautomake command if set to 'yes'; only used to workaround
+# broken packages.  Generally you should, instead, fix the package to
+# not call AM_INIT_AUTOMAKE if it doesn't actually use automake.
 
 # @ECLASS-VARIABLE: AT_NOELIBTOOLIZE
 # @DEFAULT_UNSET
@@ -172,19 +158,17 @@
 
 	auxdir=$(autotools_get_auxdir)
 
-	if  [[ ${AT_NOEACLOCAL} != "yes" ]]; then
-		einfo "Running eautoreconf in '${PWD}' ..."
-		[[ -n ${auxdir} ]] && mkdir -p ${auxdir}
-		eaclocal
-	fi
+	einfo "Running eautoreconf in '${PWD}' ..."
+	[[ -n ${auxdir} ]] && mkdir -p ${auxdir}
+	eaclocal
 	[[ ${CHOST} == *-darwin* ]] && g=g
 	if ${LIBTOOLIZE:-${g}libtoolize} -n --install >& /dev/null ; then
 		_elibtoolize --copy --force --install
 	else
 		_elibtoolize --copy --force
 	fi
-	[[ ${AT_NOEAUTOCONF} != "yes" ]] && eautoconf
-	[[ ${AT_NOEAUTOHEADER} != "yes" ]] && eautoheader
+	eautoconf
+	eautoheader
 	[[ ${AT_NOEAUTOMAKE} != "yes" ]] && FROM_EAUTORECONF="yes" eautomake ${AM_OPTS}
 
 	[[ ${AT_NOELIBTOOLIZE} == "yes" ]] && return 0

[gentoo-commits] gentoo-x86 commit in eclass: autotools.eclass

[Mike Frysinger (vapier)]

vapier      12/05/20 10:26:05

  Modified:             autotools.eclass
  Log:
  automatically create AC_CONFIG_MACRO_DIR dir too

Revision  Changes    Path
1.131                eclass/autotools.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools.eclass?rev=1.131&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools.eclass?rev=1.131&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools.eclass?r1=1.130&r2=1.131

Index: autotools.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v
retrieving revision 1.130
retrieving revision 1.131
diff -u -r1.130 -r1.131
--- autotools.eclass	22 Mar 2012 19:16:22 -0000	1.130
+++ autotools.eclass	20 May 2012 10:26:05 -0000	1.131
@@ -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.eclass,v 1.130 2012/03/22 19:16:22 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v 1.131 2012/05/20 10:26:05 vapier Exp $
 
 # @ECLASS: autotools.eclass
 # @MAINTAINER:
@@ -143,7 +143,7 @@
 # Should do a full autoreconf - normally what most people will be interested in.
 # Also should handle additional directories specified by AC_CONFIG_SUBDIRS.
 eautoreconf() {
-	local x auxdir g
+	local x g
 
 	if [[ -z ${AT_NO_RECURSIVE} ]]; then
 		# Take care of subdirs
@@ -156,10 +156,11 @@
 		done
 	fi
 
-	auxdir=$(autotools_get_auxdir)
+	local auxdir=$(autotools_get_auxdir)
+	local macdir=$(autotools_get_macrodir)
 
 	einfo "Running eautoreconf in '${PWD}' ..."
-	[[ -n ${auxdir} ]] && mkdir -p ${auxdir}
+	[[ -n ${auxdir}${macdir} ]] && mkdir -p ${auxdir} ${macdir}
 	eaclocal
 	[[ ${CHOST} == *-darwin* ]] && g=g
 	if ${LIBTOOLIZE:-${g}libtoolize} -n --install >& /dev/null ; then
@@ -428,6 +429,7 @@
 # Internal function to get additional subdirs to configure
 autotools_get_subdirs() { autotools_check_macro_val AC_CONFIG_SUBDIRS ; }
 autotools_get_auxdir() { autotools_check_macro_val AC_CONFIG_AUX_DIR ; }
+autotools_get_macrodir() { autotools_check_macro_val AC_CONFIG_MACRO_DIR ; }
 
 _autotools_m4dir_include() {
 	local x include_opts

[gentoo-commits] gentoo-x86 commit in eclass: autotools.eclass

[Mike Frysinger (vapier)]

vapier      12/05/20 10:32:05

  Modified:             autotools.eclass
  Log:
  eautoreconf: automatically run eautopoint when the code base uses it

Revision  Changes    Path
1.132                eclass/autotools.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools.eclass?rev=1.132&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools.eclass?rev=1.132&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools.eclass?r1=1.131&r2=1.132

Index: autotools.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v
retrieving revision 1.131
retrieving revision 1.132
diff -u -r1.131 -r1.132
--- autotools.eclass	20 May 2012 10:26:05 -0000	1.131
+++ autotools.eclass	20 May 2012 10:32:05 -0000	1.132
@@ -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.eclass,v 1.131 2012/05/20 10:26:05 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v 1.132 2012/05/20 10:32:05 vapier Exp $
 
 # @ECLASS: autotools.eclass
 # @MAINTAINER:
@@ -162,6 +162,9 @@
 	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

[gentoo-commits] gentoo-x86 commit in eclass: autotools.eclass

[Mike Frysinger (vapier)]

vapier      12/05/20 10:39:45

  Modified:             autotools.eclass
  Log:
  always depend on automake even when WANT_AUTOMAKE=none #401605

Revision  Changes    Path
1.133                eclass/autotools.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools.eclass?rev=1.133&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools.eclass?rev=1.133&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools.eclass?r1=1.132&r2=1.133

Index: autotools.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v
retrieving revision 1.132
retrieving revision 1.133
diff -u -r1.132 -r1.133
--- autotools.eclass	20 May 2012 10:32:05 -0000	1.132
+++ autotools.eclass	20 May 2012 10:39:45 -0000	1.133
@@ -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.eclass,v 1.132 2012/05/20 10:32:05 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v 1.133 2012/05/20 10:39:45 vapier Exp $
 
 # @ECLASS: autotools.eclass
 # @MAINTAINER:
@@ -49,9 +49,10 @@
 _autoconf_atom="sys-devel/autoconf"
 if [[ -n ${WANT_AUTOMAKE} ]]; then
 	case ${WANT_AUTOMAKE} in
-		none)   _automake_atom="" ;; # some packages don't require automake at all
-		# if you change the "latest" version here, change also autotools_run_tool
-		# this MUST reflect the latest stable major version for each arch!
+		# Even if the package doesn't use automake, we still need to depend
+		# on it because we run aclocal to process m4 macros.  This matches
+		# the autoreconf tool, so this requirement is correct.  #401605
+		none) ;;
 		latest)
 			# Use SLOT deps if we can.  For EAPI=0, we get pretty close.
 			if [[ ${EAPI:-0} != 0 ]] ; then

[gentoo-commits] gentoo-x86 commit in eclass: autotools.eclass

[Mike Frysinger (vapier)]

vapier      12/05/20 12:31:33

  Modified:             autotools.eclass
  Log:
  we don't use anything from eutils eclass now, so drop the inherit

Revision  Changes    Path
1.134                eclass/autotools.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools.eclass?rev=1.134&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools.eclass?rev=1.134&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools.eclass?r1=1.133&r2=1.134

Index: autotools.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v
retrieving revision 1.133
retrieving revision 1.134
diff -u -r1.133 -r1.134
--- autotools.eclass	20 May 2012 10:39:45 -0000	1.133
+++ autotools.eclass	20 May 2012 12:31:32 -0000	1.134
@@ -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.eclass,v 1.133 2012/05/20 10:39:45 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v 1.134 2012/05/20 12:31:32 vapier Exp $
 
 # @ECLASS: autotools.eclass
 # @MAINTAINER:
@@ -16,7 +16,7 @@
 if [[ ${___ECLASS_ONCE_AUTOTOOLS} != "recur -_+^+_- spank" ]] ; then
 ___ECLASS_ONCE_AUTOTOOLS="recur -_+^+_- spank"
 
-inherit eutils libtool
+inherit libtool
 
 # @ECLASS-VARIABLE: WANT_AUTOCONF
 # @DESCRIPTION:

[gentoo-commits] gentoo-x86 commit in eclass: autotools.eclass

[Mike Frysinger (vapier)]

vapier      12/05/20 12:38:33

  Modified:             autotools.eclass
  Log:
  make eliding of --install transparent to the caller so that we can drop duplicated variable expansion and simplify higher code flows

Revision  Changes    Path
1.135                eclass/autotools.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools.eclass?rev=1.135&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools.eclass?rev=1.135&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools.eclass?r1=1.134&r2=1.135

Index: autotools.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v
retrieving revision 1.134
retrieving revision 1.135
diff -u -r1.134 -r1.135
--- autotools.eclass	20 May 2012 12:31:32 -0000	1.134
+++ autotools.eclass	20 May 2012 12:38:33 -0000	1.135
@@ -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.eclass,v 1.134 2012/05/20 12:31:32 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v 1.135 2012/05/20 12:38:33 vapier Exp $
 
 # @ECLASS: autotools.eclass
 # @MAINTAINER:
@@ -166,12 +166,7 @@
 	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
-	else
-		_elibtoolize --copy --force
-	fi
+	_elibtoolize --install --copy --force
 	eautoconf
 	eautoheader
 	[[ ${AT_NOEAUTOMAKE} != "yes" ]] && FROM_EAUTORECONF="yes" eautomake ${AM_OPTS}
@@ -227,19 +222,24 @@
 
 # @FUNCTION: _elibtoolize
 # @DESCRIPTION:
-# Runs libtoolize.  Note the '_' prefix .. to not collide with elibtoolize() from
-# libtool.eclass.
+# Runs libtoolize.  If --install is the first arg, automatically drop it if
+# the active libtool version doesn't support it.
+#
+# Note the '_' prefix .. to not collide with elibtoolize() from libtool.eclass.
 _elibtoolize() {
-	local opts g=
-
 	# Check if we should run libtoolize (AM_PROG_LIBTOOL is an older macro,
 	# check for both it and the current AC_PROG_LIBTOOL)
 	[[ -n $(autotools_check_macro AC_PROG_LIBTOOL AM_PROG_LIBTOOL LT_INIT) ]] || return 0
 
-	[[ -f GNUmakefile.am || -f Makefile.am ]] && opts="--automake"
+	local LIBTOOLIZE=${LIBTOOLIZE:-libtoolize}
+	type -P glibtoolize && LIBTOOLIZE=glibtoolize
+
+	[[ -f GNUmakefile.am || -f Makefile.am ]] && set -- "$@" --automake
+	if [[ $1 == "--install" ]] ; then
+		${LIBTOOLIZE} -n --install >& /dev/null || shift
+	fi
 
-	[[ ${CHOST} == *-darwin* ]] && g=g
-	autotools_run_tool ${LIBTOOLIZE:-${g}libtoolize} "$@" ${opts}
+	autotools_run_tool ${LIBTOOLIZE} "$@" ${opts}
 
 	# Need to rerun aclocal
 	eaclocal

[gentoo-commits] gentoo-x86 commit in eclass: autotools.eclass

[Mike Frysinger (vapier)]

vapier      12/05/20 12:55:06

  Modified:             autotools.eclass
  Log:
  allow autotools_check_macro_val to take multiple macros when the values can safely be merged by the caller (like macros that implicitly create dirs, and we just want a list of all those dirs)

Revision  Changes    Path
1.136                eclass/autotools.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools.eclass?rev=1.136&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools.eclass?rev=1.136&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools.eclass?r1=1.135&r2=1.136

Index: autotools.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v
retrieving revision 1.135
retrieving revision 1.136
diff -u -r1.135 -r1.136
--- autotools.eclass	20 May 2012 12:38:33 -0000	1.135
+++ autotools.eclass	20 May 2012 12:55:06 -0000	1.136
@@ -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.eclass,v 1.135 2012/05/20 12:38:33 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v 1.136 2012/05/20 12:55:06 vapier Exp $
 
 # @ECLASS: autotools.eclass
 # @MAINTAINER:
@@ -416,16 +416,22 @@
 	return 0
 }
 
-# Internal function to look for a macro and extract its value
+# @FUNCTION: autotools_check_macro_val
+# @USAGE: <macro> [macros]
+# @INTERNAL
+# @DESCRIPTION:
+# Look for a macro and extract its value.
 autotools_check_macro_val() {
-	local macro=$1 scan_out
+	local macro scan_out
 
-	autotools_check_macro "${macro}" | \
-		gawk -v macro="${macro}" \
-			'($0 !~ /^[[:space:]]*(#|dnl)/) {
-				if (match($0, macro ":(.*)$", res))
-					print res[1]
-			}' | uniq
+	for macro ; do
+		autotools_check_macro "${macro}" | \
+			gawk -v macro="${macro}" \
+				'($0 !~ /^[[:space:]]*(#|dnl)/) {
+					if (match($0, macro ":(.*)$", res))
+						print res[1]
+				}' | uniq
+	done
 
 	return 0
 }

[gentoo-commits] gentoo-x86 commit in eclass: autotools.eclass

[Mike Frysinger (vapier)]

vapier      12/05/20 12:58:23

  Modified:             autotools.eclass
  Log:
  optimize autotools_check_macro to cache the result of the autoconf trace as we can end up calling this code multiple times when doing `eautoreconf`

Revision  Changes    Path
1.137                eclass/autotools.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools.eclass?rev=1.137&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools.eclass?rev=1.137&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools.eclass?r1=1.136&r2=1.137

Index: autotools.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v
retrieving revision 1.136
retrieving revision 1.137
diff -u -r1.136 -r1.137
--- autotools.eclass	20 May 2012 12:55:06 -0000	1.136
+++ autotools.eclass	20 May 2012 12:58:23 -0000	1.137
@@ -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.eclass,v 1.136 2012/05/20 12:55:06 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v 1.137 2012/05/20 12:58:23 vapier Exp $
 
 # @ECLASS: autotools.eclass
 # @MAINTAINER:
@@ -148,7 +148,7 @@
 
 	if [[ -z ${AT_NO_RECURSIVE} ]]; then
 		# Take care of subdirs
-		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
 				AT_NOELIBTOOLIZE="yes" eautoreconf
@@ -157,11 +157,11 @@
 		done
 	fi
 
-	local auxdir=$(autotools_get_auxdir)
-	local macdir=$(autotools_get_macrodir)
-
 	einfo "Running eautoreconf in '${PWD}' ..."
-	[[ -n ${auxdir}${macdir} ]] && mkdir -p ${auxdir} ${macdir}
+
+	local m4dirs=$(autotools_check_macro_val AC_CONFIG_{AUX,MACRO}_DIR)
+	[[ -n ${m4dirs} ]] && mkdir -p ${m4dirs}
+
 	eaclocal
 	if grep -q '^AM_GNU_GETTEXT_VERSION' configure.?? ; then
 		eautopoint --force
@@ -339,7 +339,10 @@
 	done
 }
 
-# Internal function to run an autotools' tool
+# @FUNCTION: autotools_env_setup
+# @INTERNAL
+# @DESCRIPTION:
+# Process the WANT_AUTO{CONF,MAKE} flags.
 autotools_env_setup() {
 	# We do the "latest" → version switch here because it solves
 	# possible order problems, see bug #270010 as an example.
@@ -355,6 +358,13 @@
 	fi
 	[[ ${WANT_AUTOCONF} == "latest" ]] && export WANT_AUTOCONF=2.5
 }
+
+# @FUNCTION: autotools_run_tool
+# @USAGE: [--at-no-fail] [--at-m4flags] <autotool> [tool-specific flags]
+# @INTERNAL
+# @DESCRIPTION:
+# Run the specified autotool helper, but do logging and error checking
+# around it in the process.
 autotools_run_tool() {
 	# Process our own internal flags first
 	local autofail=true m4flags=false
@@ -407,13 +417,34 @@
 }
 
 # Internal function to check for support
+
+# Keep a list of all the macros we might use so that we only
+# have to run the trace code once.  Order doesn't matter.
+ALL_AUTOTOOLS_MACROS=(
+	AC_PROG_LIBTOOL AM_PROG_LIBTOOL LT_INIT
+	AC_CONFIG_HEADERS
+	AC_CONFIG_SUBDIRS
+	AC_CONFIG_AUX_DIR AC_CONFIG_MACRO_DIR
+	AM_INIT_AUTOMAKE
+)
 autotools_check_macro() {
 	[[ -f configure.ac || -f configure.in ]] || return 0
-	local macro
+
+	# We can run in multiple dirs, so we have to cache the trace
+	# data in $PWD rather than an env var.
+	local trace_file=".__autoconf_trace_data"
+	if [[ ! -e ${trace_file} ]] || [[ aclocal.m4 -nt ${trace_file} ]] ; then
+		WANT_AUTOCONF="2.5" autoconf \
+			$(autotools_m4dir_include) \
+			${ALL_AUTOTOOLS_MACROS[@]/#/--trace=} > ${trace_file} 2>/dev/null
+	fi
+
+	local macro args=()
 	for macro ; do
-		WANT_AUTOCONF="2.5" autoconf $(autotools_m4dir_include) --trace="${macro}" 2>/dev/null
+		has ${macro} ${ALL_AUTOTOOLS_MACROS[@]} || die "internal error: add ${macro} to ALL_AUTOTOOLS_MACROS"
+		args+=( -e ":${macro}:" )
 	done
-	return 0
+	grep "${args[@]}" ${trace_file}
 }
 
 # @FUNCTION: autotools_check_macro_val
@@ -436,11 +467,6 @@
 	return 0
 }
 
-# Internal function to get additional subdirs to configure
-autotools_get_subdirs() { autotools_check_macro_val AC_CONFIG_SUBDIRS ; }
-autotools_get_auxdir() { autotools_check_macro_val AC_CONFIG_AUX_DIR ; }
-autotools_get_macrodir() { autotools_check_macro_val AC_CONFIG_MACRO_DIR ; }
-
 _autotools_m4dir_include() {
 	local x include_opts
 

[gentoo-commits] gentoo-x86 commit in eclass: autotools.eclass

[Mike Frysinger (vapier)]

vapier      12/05/20 13:01:23

  Modified:             autotools.eclass
  Log:
  change eautomake over to autotools_check_macro now that we cache the results and it should be quick

Revision  Changes    Path
1.138                eclass/autotools.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools.eclass?rev=1.138&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools.eclass?rev=1.138&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools.eclass?r1=1.137&r2=1.138

Index: autotools.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v
retrieving revision 1.137
retrieving revision 1.138
diff -u -r1.137 -r1.138
--- autotools.eclass	20 May 2012 12:58:23 -0000	1.137
+++ autotools.eclass	20 May 2012 13:01:22 -0000	1.138
@@ -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.eclass,v 1.137 2012/05/20 12:58:23 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v 1.138 2012/05/20 13:01:22 vapier Exp $
 
 # @ECLASS: autotools.eclass
 # @MAINTAINER:
@@ -283,11 +283,7 @@
 	done
 
 	if [[ -z ${makefile_name} ]] ; then
-		# Really we should just use autotools_check_macro ...
-		local am_init_automake=$(sed -n '/AM_INIT_AUTOMAKE/{s:#.*::;s:\<dnl\>.*::;p}' configure.??)
-		if [[ ${am_init_automake} != *"AM_INIT_AUTOMAKE"* ]] ; then
-			return 0
-		fi
+		[[ -n $(autotools_check_macro AM_INIT_AUTOMAKE) ]] || return 0
 
 	elif [[ -z ${FROM_EAUTORECONF} && -f ${makefile_name%.am}.in ]]; then
 		local used_automake

[gentoo-commits] gentoo-x86 commit in eclass: autotools.eclass

[Mike Frysinger (vapier)]

vapier      12/05/21 17:40:44

  Modified:             autotools.eclass
  Log:
  re-arch external tool handling to make it scalable for adding more tools

Revision  Changes    Path
1.139                eclass/autotools.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools.eclass?rev=1.139&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools.eclass?rev=1.139&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools.eclass?r1=1.138&r2=1.139

Index: autotools.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v
retrieving revision 1.138
retrieving revision 1.139
diff -u -r1.138 -r1.139
--- autotools.eclass	20 May 2012 13:01:22 -0000	1.138
+++ autotools.eclass	21 May 2012 17:40:44 -0000	1.139
@@ -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.eclass,v 1.138 2012/05/20 13:01:22 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v 1.139 2012/05/21 17:40:44 vapier Exp $
 
 # @ECLASS: autotools.eclass
 # @MAINTAINER:
@@ -162,11 +162,34 @@
 	local m4dirs=$(autotools_check_macro_val AC_CONFIG_{AUX,MACRO}_DIR)
 	[[ -n ${m4dirs} ]] && mkdir -p ${m4dirs}
 
+	# Run all the tools before aclocal so we can gather the .m4 files.
+	local i tools=(
+		# <tool> <was run> <command>
+		gettext false "eautopoint --force"
+		libtool false "_elibtoolize --install --copy --force"
+	)
+	for (( i = 0; i < ${#tools[@]}; i += 3 )) ; do
+		if _at_uses_${tools[i]} ; then
+			tools[i+1]=true
+			${tools[i+2]}
+		fi
+	done
+
+	# Generate aclocal.m4 with our up-to-date m4 files.
+	local rerun_aclocal=false
 	eaclocal
-	if grep -q '^AM_GNU_GETTEXT_VERSION' configure.?? ; then
-		eautopoint --force
-	fi
-	_elibtoolize --install --copy --force
+
+	# Check to see if we had macros expanded by other macros or in other
+	# m4 files that we couldn't detect early.  This is uncommon, but some
+	# packages do this, so we have to handle it correctly.
+	for (( i = 0; i < ${#tools[@]}; i += 3 )) ; do
+		if ! ${tools[i+1]} && _at_uses_${tools[i]} ; then
+			${tools[i+2]}
+			rerun_aclocal=true
+		fi
+	done
+	${rerun_aclocal} && eaclocal
+
 	eautoconf
 	eautoheader
 	[[ ${AT_NOEAUTOMAKE} != "yes" ]] && FROM_EAUTORECONF="yes" eautomake ${AM_OPTS}
@@ -180,6 +203,28 @@
 	return 0
 }
 
+# @FUNCTION: _at_uses_pkg
+# @USAGE: <macros>
+# @INTERNAL
+# See if the specified macros are enabled.
+_at_uses_pkg() {
+	if [[ -e aclocal.m4 ]] ; then
+		# If aclocal.m4 exists, trust the trace data.
+		[[ -n $(autotools_check_macro "${@}") ]]
+	else
+		# If aclocal.m4 hasn't been generated yet, cheat, but be conservative.
+		local macro args=()
+		for macro ; do
+			args+=( -e "^[[:space:]]*${macro}\>" )
+		done
+		egrep -q "${args[@]}" configure.??
+	fi
+}
+_at_uses_gettext()    { _at_uses_pkg AM_GNU_GETTEXT_VERSION; }
+_at_uses_autoheader() { _at_uses_pkg AC_CONFIG_HEADERS; }
+_at_uses_automake()   { _at_uses_pkg AM_INIT_AUTOMAKE; }
+_at_uses_libtool()    { _at_uses_pkg A{C,M}_PROG_LIBTOOL LT_INIT; }
+
 # @FUNCTION: eaclocal_amflags
 # @DESCRIPTION:
 # Extract the ACLOCAL_AMFLAGS value from the Makefile.am and try to handle
@@ -227,10 +272,6 @@
 #
 # Note the '_' prefix .. to not collide with elibtoolize() from libtool.eclass.
 _elibtoolize() {
-	# Check if we should run libtoolize (AM_PROG_LIBTOOL is an older macro,
-	# check for both it and the current AC_PROG_LIBTOOL)
-	[[ -n $(autotools_check_macro AC_PROG_LIBTOOL AM_PROG_LIBTOOL LT_INIT) ]] || return 0
-
 	local LIBTOOLIZE=${LIBTOOLIZE:-libtoolize}
 	type -P glibtoolize && LIBTOOLIZE=glibtoolize
 
@@ -240,17 +281,13 @@
 	fi
 
 	autotools_run_tool ${LIBTOOLIZE} "$@" ${opts}
-
-	# Need to rerun aclocal
-	eaclocal
 }
 
 # @FUNCTION: eautoheader
 # @DESCRIPTION:
 # Runs autoheader.
 eautoheader() {
-	# Check if we should run autoheader
-	[[ -n $(autotools_check_macro "AC_CONFIG_HEADERS") ]] || return 0
+	_at_uses_autoheader || return 0
 	autotools_run_tool --at-no-fail --at-m4flags autoheader "$@"
 }
 
@@ -283,7 +320,7 @@
 	done
 
 	if [[ -z ${makefile_name} ]] ; then
-		[[ -n $(autotools_check_macro AM_INIT_AUTOMAKE) ]] || return 0
+		_at_uses_automake || return 0
 
 	elif [[ -z ${FROM_EAUTORECONF} && -f ${makefile_name%.am}.in ]]; then
 		local used_automake
@@ -422,6 +459,7 @@
 	AC_CONFIG_SUBDIRS
 	AC_CONFIG_AUX_DIR AC_CONFIG_MACRO_DIR
 	AM_INIT_AUTOMAKE
+	AM_GNU_GETTEXT_VERSION
 )
 autotools_check_macro() {
 	[[ -f configure.ac || -f configure.in ]] || return 0

[gentoo-commits] gentoo-x86 commit in eclass: autotools.eclass

[Mike Frysinger (vapier)]

vapier      12/05/21 17:53:08

  Modified:             autotools.eclass
  Log:
  run intltoolize when IT_PROG_INTLTOOL is in use #416789 by Markus Oehme

Revision  Changes    Path
1.140                eclass/autotools.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools.eclass?rev=1.140&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools.eclass?rev=1.140&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools.eclass?r1=1.139&r2=1.140

Index: autotools.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v
retrieving revision 1.139
retrieving revision 1.140
diff -u -r1.139 -r1.140
--- autotools.eclass	21 May 2012 17:40:44 -0000	1.139
+++ autotools.eclass	21 May 2012 17:53:08 -0000	1.140
@@ -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.eclass,v 1.139 2012/05/21 17:40:44 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v 1.140 2012/05/21 17:53:08 vapier Exp $
 
 # @ECLASS: autotools.eclass
 # @MAINTAINER:
@@ -165,8 +165,10 @@
 	# Run all the tools before aclocal so we can gather the .m4 files.
 	local i tools=(
 		# <tool> <was run> <command>
-		gettext false "eautopoint --force"
-		libtool false "_elibtoolize --install --copy --force"
+		gettext  false "eautopoint --force"
+		# intltool must come after autopoint.
+		intltool false "autotools_run_tool intltoolize --automake --copy --force"
+		libtool  false "_elibtoolize --install --copy --force"
 	)
 	for (( i = 0; i < ${#tools[@]}; i += 3 )) ; do
 		if _at_uses_${tools[i]} ; then
@@ -220,9 +222,10 @@
 		egrep -q "${args[@]}" configure.??
 	fi
 }
-_at_uses_gettext()    { _at_uses_pkg AM_GNU_GETTEXT_VERSION; }
 _at_uses_autoheader() { _at_uses_pkg AC_CONFIG_HEADERS; }
 _at_uses_automake()   { _at_uses_pkg AM_INIT_AUTOMAKE; }
+_at_uses_gettext()    { _at_uses_pkg AM_GNU_GETTEXT_VERSION; }
+_at_uses_intltool()   { _at_uses_pkg IT_PROG_INTLTOOL; }
 _at_uses_libtool()    { _at_uses_pkg A{C,M}_PROG_LIBTOOL LT_INIT; }
 
 # @FUNCTION: eaclocal_amflags
@@ -460,6 +463,7 @@
 	AC_CONFIG_AUX_DIR AC_CONFIG_MACRO_DIR
 	AM_INIT_AUTOMAKE
 	AM_GNU_GETTEXT_VERSION
+	IT_PROG_INTLTOOL
 )
 autotools_check_macro() {
 	[[ -f configure.ac || -f configure.in ]] || return 0

[gentoo-commits] gentoo-x86 commit in eclass: autotools.eclass

[Mike Frysinger (vapier)]

vapier      12/05/21 18:13:10

  Modified:             autotools.eclass
  Log:
  also scan for older AC_PROG_INTLTOOL since not all packages have updated yet

Revision  Changes    Path
1.141                eclass/autotools.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools.eclass?rev=1.141&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools.eclass?rev=1.141&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools.eclass?r1=1.140&r2=1.141

Index: autotools.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v
retrieving revision 1.140
retrieving revision 1.141
diff -u -r1.140 -r1.141
--- autotools.eclass	21 May 2012 17:53:08 -0000	1.140
+++ autotools.eclass	21 May 2012 18:13:10 -0000	1.141
@@ -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.eclass,v 1.140 2012/05/21 17:53:08 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v 1.141 2012/05/21 18:13:10 vapier Exp $
 
 # @ECLASS: autotools.eclass
 # @MAINTAINER:
@@ -225,7 +225,7 @@
 _at_uses_autoheader() { _at_uses_pkg AC_CONFIG_HEADERS; }
 _at_uses_automake()   { _at_uses_pkg AM_INIT_AUTOMAKE; }
 _at_uses_gettext()    { _at_uses_pkg AM_GNU_GETTEXT_VERSION; }
-_at_uses_intltool()   { _at_uses_pkg IT_PROG_INTLTOOL; }
+_at_uses_intltool()   { _at_uses_pkg {AC,IT}_PROG_INTLTOOL; }
 _at_uses_libtool()    { _at_uses_pkg A{C,M}_PROG_LIBTOOL LT_INIT; }
 
 # @FUNCTION: eaclocal_amflags
@@ -463,7 +463,7 @@
 	AC_CONFIG_AUX_DIR AC_CONFIG_MACRO_DIR
 	AM_INIT_AUTOMAKE
 	AM_GNU_GETTEXT_VERSION
-	IT_PROG_INTLTOOL
+	{AC,IT}_PROG_INTLTOOL
 )
 autotools_check_macro() {
 	[[ -f configure.ac || -f configure.in ]] || return 0

[gentoo-commits] gentoo-x86 commit in eclass: autotools.eclass

[Mike Frysinger (vapier)]

vapier      12/05/24 01:13:32

  Modified:             autotools.eclass
  Log:
  do not require aclocal.m4 to trace macros as simpler packages might not end up generating one, yet will expand autoconf macros all the time that might be the ones we are looking for #417275 by Rick Farina

Revision  Changes    Path
1.142                eclass/autotools.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools.eclass?rev=1.142&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools.eclass?rev=1.142&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools.eclass?r1=1.141&r2=1.142

Index: autotools.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v
retrieving revision 1.141
retrieving revision 1.142
diff -u -r1.141 -r1.142
--- autotools.eclass	21 May 2012 18:13:10 -0000	1.141
+++ autotools.eclass	24 May 2012 01:13:32 -0000	1.142
@@ -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.eclass,v 1.141 2012/05/21 18:13:10 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v 1.142 2012/05/24 01:13:32 vapier Exp $
 
 # @ECLASS: autotools.eclass
 # @MAINTAINER:
@@ -210,11 +210,11 @@
 # @INTERNAL
 # See if the specified macros are enabled.
 _at_uses_pkg() {
-	if [[ -e aclocal.m4 ]] ; then
-		# If aclocal.m4 exists, trust the trace data.
-		[[ -n $(autotools_check_macro "${@}") ]]
+	if [[ -n $(autotools_check_macro "$@") ]] ; then
+		return 0
 	else
-		# If aclocal.m4 hasn't been generated yet, cheat, but be conservative.
+		# If the trace didn't find it (perhaps because aclocal.m4 hasn't
+		# been generated yet), cheat, but be conservative.
 		local macro args=()
 		for macro ; do
 			args+=( -e "^[[:space:]]*${macro}\>" )

[gentoo-commits] gentoo-x86 commit in eclass: autotools.eclass

[Mike Frysinger (vapier)]

vapier      12/06/07 04:50:04

  Modified:             autotools.eclass
  Log:
  allow gtkdoc steps to be skipped if the tools are not installed #419979 -- if packages want these steps, they can DEPEND on the pkg in question; similarly, give a blanket pass to autopoint for embedded/USE=-nls systems that do not install the gettext package #417641

Revision  Changes    Path
1.145                eclass/autotools.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools.eclass?rev=1.145&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools.eclass?rev=1.145&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools.eclass?r1=1.144&r2=1.145

Index: autotools.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v
retrieving revision 1.144
retrieving revision 1.145
diff -u -r1.144 -r1.145
--- autotools.eclass	6 Jun 2012 17:15:08 -0000	1.144
+++ autotools.eclass	7 Jun 2012 04:50:04 -0000	1.145
@@ -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.eclass,v 1.144 2012/06/06 17:15:08 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v 1.145 2012/06/07 04:50:04 vapier Exp $
 
 # @ECLASS: autotools.eclass
 # @MAINTAINER:
@@ -166,11 +166,11 @@
 	local i tools=(
 		# <tool> <was run> <command>
 		glibgettext false "autotools_run_tool glib-gettextize --copy --force"
-		gettext     false "eautopoint --force"
+		gettext     false "autotools_run_tool --at-missing autopoint --force"
 		# intltool must come after autopoint.
 		intltool    false "autotools_run_tool intltoolize --automake --copy --force"
-		gtkdoc      false "autotools_run_tool gtkdocize --copy"
-		gnomedoc    false "autotools_run_tool gnome-doc-prepare --copy --force"
+		gtkdoc      false "autotools_run_tool --at-missing gtkdocize --copy"
+		gnomedoc    false "autotools_run_tool --at-missing gnome-doc-prepare --copy --force"
 		libtool     false "_elibtoolize --install --copy --force"
 	)
 	for (( i = 0; i < ${#tools[@]}; i += 3 )) ; do
@@ -402,18 +402,19 @@
 }
 
 # @FUNCTION: autotools_run_tool
-# @USAGE: [--at-no-fail] [--at-m4flags] <autotool> [tool-specific flags]
+# @USAGE: [--at-no-fail] [--at-m4flags] [--at-missing] <autotool> [tool-specific flags]
 # @INTERNAL
 # @DESCRIPTION:
 # Run the specified autotool helper, but do logging and error checking
 # around it in the process.
 autotools_run_tool() {
 	# Process our own internal flags first
-	local autofail=true m4flags=false
+	local autofail=true m4flags=false missing_ok=false
 	while [[ -n $1 ]] ; do
 		case $1 in
 		--at-no-fail) autofail=false;;
 		--at-m4flags) m4flags=true;;
+		--at-missing) missing_ok=true;;
 		# whatever is left goes to the actual tool
 		*) break;;
 		esac
@@ -424,6 +425,11 @@
 		ewarn "QA Warning: running $1 in ${EBUILD_PHASE} phase"
 	fi
 
+	if ${missing_ok} && ! type -P ${1} >/dev/null ; then
+		einfo "Skipping '$*' due $1 not installed"
+		return 0
+	fi
+
 	autotools_env_setup
 
 	local STDERR_TARGET="${T}/$1.out"

[gentoo-commits] gentoo-x86 commit in eclass: autotools.eclass

[Mike Frysinger (vapier)]

vapier      12/06/07 06:00:05

  Modified:             autotools.eclass
  Log:
  run autotools in subdirs in parallel with new multiprocessing eclass

Revision  Changes    Path
1.146                eclass/autotools.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools.eclass?rev=1.146&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools.eclass?rev=1.146&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools.eclass?r1=1.145&r2=1.146

Index: autotools.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v
retrieving revision 1.145
retrieving revision 1.146
diff -u -r1.145 -r1.146
--- autotools.eclass	7 Jun 2012 04:50:04 -0000	1.145
+++ autotools.eclass	7 Jun 2012 06:00:05 -0000	1.146
@@ -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.eclass,v 1.145 2012/06/07 04:50:04 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v 1.146 2012/06/07 06:00:05 vapier Exp $
 
 # @ECLASS: autotools.eclass
 # @MAINTAINER:
@@ -16,7 +16,7 @@
 if [[ ${___ECLASS_ONCE_AUTOTOOLS} != "recur -_+^+_- spank" ]] ; then
 ___ECLASS_ONCE_AUTOTOOLS="recur -_+^+_- spank"
 
-inherit libtool
+inherit libtool multiprocessing
 
 # @ECLASS-VARIABLE: WANT_AUTOCONF
 # @DESCRIPTION:
@@ -144,14 +144,20 @@
 # Should do a full autoreconf - normally what most people will be interested in.
 # Also should handle additional directories specified by AC_CONFIG_SUBDIRS.
 eautoreconf() {
-	local x g
+	local x g multitop
 
-	if [[ -z ${AT_NO_RECURSIVE} ]]; then
+	if [[ -z ${AT_TOPLEVEL_EAUTORECONF} ]] ; then
+		AT_TOPLEVEL_EAUTORECONF="yes"
+		multitop="yes"
+		multijob_init
+	fi
+
+	if [[ -z ${AT_NO_RECURSIVE} ]] ; then
 		# Take care of subdirs
 		for x in $(autotools_check_macro_val AC_CONFIG_SUBDIRS) ; do
 			if [[ -d ${x} ]] ; then
 				pushd "${x}" >/dev/null
-				AT_NOELIBTOOLIZE="yes" eautoreconf
+				AT_NOELIBTOOLIZE="yes" multijob_child_init eautoreconf || die
 				popd >/dev/null
 			fi
 		done
@@ -199,11 +205,16 @@
 	eautoheader
 	[[ ${AT_NOEAUTOMAKE} != "yes" ]] && FROM_EAUTORECONF="yes" eautomake ${AM_OPTS}
 
-	[[ ${AT_NOELIBTOOLIZE} == "yes" ]] && return 0
+	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
+	fi
 
-	# 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
+	if [[ -n ${multitop} ]] ; then
+		unset AT_TOPLEVEL_EAUTORECONF
+		multijob_finish || die
+	fi
 
 	return 0
 }

[gentoo-commits] gentoo-x86 commit in eclass: autotools.eclass

[Mike Frysinger (vapier)]

vapier      12/06/08 04:55:39

  Modified:             autotools.eclass
  Log:
  add automake-1.12 to the list so people with only that version installed can build things #419459 by Oleg

Revision  Changes    Path
1.147                eclass/autotools.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools.eclass?rev=1.147&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools.eclass?rev=1.147&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools.eclass?r1=1.146&r2=1.147

Index: autotools.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v
retrieving revision 1.146
retrieving revision 1.147
diff -u -r1.146 -r1.147
--- autotools.eclass	7 Jun 2012 06:00:05 -0000	1.146
+++ autotools.eclass	8 Jun 2012 04:55:39 -0000	1.147
@@ -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.eclass,v 1.146 2012/06/07 06:00:05 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v 1.147 2012/06/08 04:55:39 vapier Exp $
 
 # @ECLASS: autotools.eclass
 # @MAINTAINER:
@@ -42,8 +42,8 @@
 # then circular dependencies may arise during emerge @system bootstraps.
 # 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.11.1:1.11 )
+# WANT value by using a colon:  <PV>:<WANT_AUTOMAKE>
+_LATEST_AUTOMAKE=( 1.11.1:1.11 1.12:1.12 )
 
 _automake_atom="sys-devel/automake"
 _autoconf_atom="sys-devel/autoconf"

[gentoo-commits] gentoo-x86 commit in eclass: autotools.eclass

[Mike Frysinger (vapier)]

vapier      13/01/28 04:13:00

  Modified:             autotools.eclass
  Log:
  use -l to set the macro dir when using autoconf-2.13 #448986 by Ryan Sleevi

Revision  Changes    Path
1.151                eclass/autotools.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools.eclass?rev=1.151&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools.eclass?rev=1.151&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools.eclass?r1=1.150&r2=1.151

Index: autotools.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v
retrieving revision 1.150
retrieving revision 1.151
diff -u -r1.150 -r1.151
--- autotools.eclass	5 Jan 2013 02:27:16 -0000	1.150
+++ autotools.eclass	28 Jan 2013 04:13:00 -0000	1.151
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v 1.150 2013/01/05 02:27:16 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v 1.151 2013/01/28 04:13:00 vapier Exp $
 
 # @ECLASS: autotools.eclass
 # @MAINTAINER:
@@ -537,15 +537,20 @@
 }
 
 _autotools_m4dir_include() {
-	local x include_opts
+	local x include_opts flag
+
+	# Use the right flag to autoconf based on the version #448986
+	[[ ${WANT_AUTOCONF} == "2.1" ]] \
+		&& flag="l" \
+		|| flag="I"
 
 	for x in "$@" ; do
 		case ${x} in
 			# We handle it below
-			-I) ;;
+			-${flag}) ;;
 			*)
 				[[ ! -d ${x} ]] && ewarn "autotools.eclass: '${x}' does not exist"
-				include_opts+=" -I ${x}"
+				include_opts+=" -${flag} ${x}"
 				;;
 		esac
 	done

[gentoo-commits] gentoo-x86 commit in eclass: autotools.eclass

[Mike Frysinger (vapier)]

vapier      13/04/15 21:46:44

  Modified:             autotools.eclass
  Log:
  drop automake 1.11 from dep list now that 1.12 is stable everywhere

Revision  Changes    Path
1.152                eclass/autotools.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools.eclass?rev=1.152&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools.eclass?rev=1.152&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools.eclass?r1=1.151&r2=1.152

Index: autotools.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v
retrieving revision 1.151
retrieving revision 1.152
diff -u -r1.151 -r1.152
--- autotools.eclass	28 Jan 2013 04:13:00 -0000	1.151
+++ autotools.eclass	15 Apr 2013 21:46:44 -0000	1.152
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v 1.151 2013/01/28 04:13:00 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v 1.152 2013/04/15 21:46:44 vapier Exp $
 
 # @ECLASS: autotools.eclass
 # @MAINTAINER:
@@ -43,7 +43,7 @@
 # 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.11.1:1.11 1.12:1.12 )
+_LATEST_AUTOMAKE=( 1.12:1.12 )
 
 _automake_atom="sys-devel/automake"
 _autoconf_atom="sys-devel/autoconf"

[gentoo-commits] gentoo-x86 commit in eclass: autotools.eclass

[Mike Frysinger (vapier)]

vapier      13/04/23 19:16:00

  Modified:             autotools.eclass
  Log:
  add automake-1.13 to the acceptable dependency list #465732 by Arfrever Frehtes Taifersar Arahesis

Revision  Changes    Path
1.153                eclass/autotools.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools.eclass?rev=1.153&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools.eclass?rev=1.153&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools.eclass?r1=1.152&r2=1.153

Index: autotools.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v
retrieving revision 1.152
retrieving revision 1.153
diff -u -r1.152 -r1.153
--- autotools.eclass	15 Apr 2013 21:46:44 -0000	1.152
+++ autotools.eclass	23 Apr 2013 19:16:00 -0000	1.153
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v 1.152 2013/04/15 21:46:44 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v 1.153 2013/04/23 19:16:00 vapier Exp $
 
 # @ECLASS: autotools.eclass
 # @MAINTAINER:
@@ -38,12 +38,15 @@
 # @DESCRIPTION:
 # CONSTANT!
 # The latest major version/slot of automake available on each arch.  #312315
+# We should list both the latest stable, and the latest unstable.  #465732
+# This way the stable builds will still work, but the unstable are allowed
+# to build & test things for us ahead of time (if they have it installed).
 # If a newer slot is stable on any arch, and is NOT reflected in this list,
 # then circular dependencies may arise during emerge @system bootstraps.
 # 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 )
+_LATEST_AUTOMAKE=( 1.12:1.12 1.13:1.13 )
 
 _automake_atom="sys-devel/automake"
 _autoconf_atom="sys-devel/autoconf"

[gentoo-commits] gentoo-x86 commit in eclass: autotools.eclass

[Mike Frysinger (vapier)]

vapier      13/04/28 16:45:37

  Modified:             autotools.eclass
  Log:
  check for AM_CONFIG_HEADER and AC_CONFIG_HEADER when testing for autoheader usage

Revision  Changes    Path
1.154                eclass/autotools.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools.eclass?rev=1.154&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools.eclass?rev=1.154&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools.eclass?r1=1.153&r2=1.154

Index: autotools.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v
retrieving revision 1.153
retrieving revision 1.154
diff -u -r1.153 -r1.154
--- autotools.eclass	23 Apr 2013 19:16:00 -0000	1.153
+++ autotools.eclass	28 Apr 2013 16:45:37 -0000	1.154
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v 1.153 2013/04/23 19:16:00 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v 1.154 2013/04/28 16:45:37 vapier Exp $
 
 # @ECLASS: autotools.eclass
 # @MAINTAINER:
@@ -245,7 +245,7 @@
 		egrep -q "${args[@]}" configure.??
 	fi
 }
-_at_uses_autoheader()  { _at_uses_pkg AC_CONFIG_HEADERS; }
+_at_uses_autoheader()  { _at_uses_pkg A{C,M}_CONFIG_HEADER{S,}; }
 _at_uses_automake()    { _at_uses_pkg AM_INIT_AUTOMAKE; }
 _at_uses_gettext()     { _at_uses_pkg AM_GNU_GETTEXT_VERSION; }
 _at_uses_glibgettext() { _at_uses_pkg AM_GLIB_GNU_GETTEXT; }

[gentoo-commits] gentoo-x86 commit in eclass: autotools.eclass

[Mike Frysinger (vapier)]

vapier      13/04/28 21:55:33

  Modified:             autotools.eclass
  Log:
  check for AM_CONFIG_HEADER and AC_CONFIG_HEADER when testing for autoheader usage #424195

Revision  Changes    Path
1.156                eclass/autotools.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools.eclass?rev=1.156&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools.eclass?rev=1.156&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools.eclass?r1=1.155&r2=1.156

Index: autotools.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v
retrieving revision 1.155
retrieving revision 1.156
diff -u -r1.155 -r1.156
--- autotools.eclass	28 Apr 2013 18:59:59 -0000	1.155
+++ autotools.eclass	28 Apr 2013 21:55:32 -0000	1.156
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v 1.155 2013/04/28 18:59:59 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v 1.156 2013/04/28 21:55:32 vapier Exp $
 
 # @ECLASS: autotools.eclass
 # @MAINTAINER:
@@ -245,7 +245,7 @@
 		egrep -q "${args[@]}" configure.??
 	fi
 }
-_at_uses_autoheader()  { _at_uses_pkg AC_CONFIG_HEADERS; }
+_at_uses_autoheader()  { _at_uses_pkg A{C,M}_CONFIG_HEADER{S,}; }
 _at_uses_automake()    { _at_uses_pkg AM_INIT_AUTOMAKE; }
 _at_uses_gettext()     { _at_uses_pkg AM_GNU_GETTEXT_VERSION; }
 _at_uses_glibgettext() { _at_uses_pkg AM_GLIB_GNU_GETTEXT; }
@@ -488,8 +488,8 @@
 # Keep a list of all the macros we might use so that we only
 # have to run the trace code once.  Order doesn't matter.
 ALL_AUTOTOOLS_MACROS=(
-	AC_PROG_LIBTOOL AM_PROG_LIBTOOL LT_INIT
-	AC_CONFIG_HEADERS
+	A{C,M}_PROG_LIBTOOL LT_INIT
+	A{C,M}_CONFIG_HEADER{S,}
 	AC_CONFIG_SUBDIRS
 	AC_CONFIG_AUX_DIR AC_CONFIG_MACRO_DIR
 	AM_INIT_AUTOMAKE

[gentoo-commits] gentoo-x86 commit in eclass: autotools.eclass

[Mike Frysinger (vapier)]

vapier      13/11/30 06:00:16

  Modified:             autotools.eclass
  Log:
  shift 1.12 out of _LATEST_AUTOMAKE as 1.13 is stable, and shift in 1.14 #474600

Revision  Changes    Path
1.157                eclass/autotools.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools.eclass?rev=1.157&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools.eclass?rev=1.157&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools.eclass?r1=1.156&r2=1.157

Index: autotools.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v
retrieving revision 1.156
retrieving revision 1.157
diff -u -r1.156 -r1.157
--- autotools.eclass	28 Apr 2013 21:55:32 -0000	1.156
+++ autotools.eclass	30 Nov 2013 06:00:16 -0000	1.157
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v 1.156 2013/04/28 21:55:32 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v 1.157 2013/11/30 06:00:16 vapier Exp $
 
 # @ECLASS: autotools.eclass
 # @MAINTAINER:
@@ -46,7 +46,7 @@
 # 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"

[gentoo-commits] gentoo-x86 commit in eclass: autotools.eclass

[Mike Frysinger (vapier)]

vapier      13/12/30 08:19:02

  Modified:             autotools.eclass
  Log:
  force people to nicely upgrade to a stable version of gettext to avoid known issues with old versions #496454

Revision  Changes    Path
1.158                eclass/autotools.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools.eclass?rev=1.158&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools.eclass?rev=1.158&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools.eclass?r1=1.157&r2=1.158

Index: autotools.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v
retrieving revision 1.157
retrieving revision 1.158
diff -u -r1.157 -r1.158
--- autotools.eclass	30 Nov 2013 06:00:16 -0000	1.157
+++ autotools.eclass	30 Dec 2013 08:19:02 -0000	1.158
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v 1.157 2013/11/30 06:00:16 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v 1.158 2013/12/30 08:19:02 vapier Exp $
 
 # @ECLASS: autotools.eclass
 # @MAINTAINER:
@@ -90,7 +90,12 @@
 	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

[gentoo-commits] gentoo-x86 commit in eclass: autotools.eclass

[Mike Frysinger (vapier)]

vapier      14/02/18 03:57:36

  Modified:             autotools.eclass
  Log:
  eautomake: run with --force-missing with newer versions so we regen bundled files #133489

Revision  Changes    Path
1.160                eclass/autotools.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools.eclass?rev=1.160&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools.eclass?rev=1.160&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools.eclass?r1=1.159&r2=1.160

Index: autotools.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v
retrieving revision 1.159
retrieving revision 1.160
diff -u -r1.159 -r1.160
--- autotools.eclass	31 Dec 2013 16:53:05 -0000	1.159
+++ autotools.eclass	18 Feb 2014 03:57:36 -0000	1.160
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v 1.159 2013/12/31 16:53:05 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v 1.160 2014/02/18 03:57:36 vapier Exp $
 
 # @ECLASS: autotools.eclass
 # @MAINTAINER:
@@ -342,7 +342,7 @@
 # @DESCRIPTION:
 # Runs automake.
 eautomake() {
-	local extra_opts
+	local extra_opts=()
 	local makefile_name
 
 	# Run automake if:
@@ -352,6 +352,10 @@
 		[[ -f ${makefile_name} ]] && break
 	done
 
+	_automake_version() {
+		automake --version 2>/dev/null | sed -n -e '1{s:.*(GNU automake) ::p;q}'
+	}
+
 	if [[ -z ${makefile_name} ]] ; then
 		_at_uses_automake || return 0
 
@@ -359,8 +363,7 @@
 		local used_automake
 		local installed_automake
 
-		installed_automake=$(WANT_AUTOMAKE= automake --version | head -n 1 | \
-			sed -e 's:.*(GNU automake) ::')
+		installed_automake=$(WANT_AUTOMAKE= _automake_version)
 		used_automake=$(head -n 1 < ${makefile_name%.am}.in | \
 			sed -e 's:.*by automake \(.*\) from .*:\1:')
 
@@ -373,10 +376,16 @@
 	fi
 
 	[[ -f INSTALL && -f AUTHORS && -f ChangeLog && -f NEWS && -f README ]] \
-		|| extra_opts="${extra_opts} --foreign"
+		|| extra_opts+=( --foreign )
+
+	# 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 ) ;;
+	esac
 
-	# --force-missing seems not to be recognized by some flavours of automake
-	autotools_run_tool automake --add-missing --copy ${extra_opts} "$@"
+	autotools_run_tool automake --add-missing --copy "${extra_opts[@]}" "$@"
 }
 
 # @FUNCTION: eautopoint

[gentoo-commits] gentoo-x86 commit in eclass: autotools.eclass

[Mike Frysinger (vapier)]

vapier      14/08/12 12:15:56

  Modified:             autotools.eclass
  Log:
  require autoconf-2.69 now that it is stable for a while #507374

Revision  Changes    Path
1.163                eclass/autotools.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools.eclass?rev=1.163&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools.eclass?rev=1.163&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools.eclass?r1=1.162&r2=1.163

Index: autotools.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v
retrieving revision 1.162
retrieving revision 1.163
diff -u -r1.162 -r1.163
--- autotools.eclass	11 Jul 2014 08:21:58 -0000	1.162
+++ autotools.eclass	12 Aug 2014 12:15:55 -0000	1.163
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v 1.162 2014/07/11 08:21:58 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v 1.163 2014/08/12 12:15:55 vapier Exp $
 
 # @ECLASS: autotools.eclass
 # @MAINTAINER:
@@ -74,7 +74,7 @@
 		none)       _autoconf_atom="" ;; # some packages don't require autoconf at all
 		2.1)        _autoconf_atom="=sys-devel/autoconf-${WANT_AUTOCONF}*" ;;
 		# if you change the "latest" version here, change also autotools_env_setup
-		latest|2.5) _autoconf_atom=">=sys-devel/autoconf-2.68" ;;
+		latest|2.5) _autoconf_atom=">=sys-devel/autoconf-2.69" ;;
 		*)          die "Invalid WANT_AUTOCONF value '${WANT_AUTOCONF}'" ;;
 	esac
 	export WANT_AUTOCONF

[gentoo-commits] gentoo-x86 commit in eclass: autotools.eclass

[Mike Frysinger (vapier)]

vapier      14/11/13 17:14:22

  Modified:             autotools.eclass
  Log:
  force recent libtool and drop the libtoolize --install probing #529008 by Alexander Tsoy

Revision  Changes    Path
1.164                eclass/autotools.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools.eclass?rev=1.164&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools.eclass?rev=1.164&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools.eclass?r1=1.163&r2=1.164

Index: autotools.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v
retrieving revision 1.163
retrieving revision 1.164
diff -u -r1.163 -r1.164
--- autotools.eclass	12 Aug 2014 12:15:55 -0000	1.163
+++ autotools.eclass	13 Nov 2014 17:14:22 -0000	1.164
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v 1.163 2014/08/12 12:15:55 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v 1.164 2014/11/13 17:14:22 vapier Exp $
 
 # @ECLASS: autotools.eclass
 # @MAINTAINER:
@@ -80,7 +80,7 @@
 	export WANT_AUTOCONF
 fi
 
-_libtool_atom="sys-devel/libtool"
+_libtool_atom=">=sys-devel/libtool-2.4"
 if [[ -n ${WANT_LIBTOOL} ]] ; then
 	case ${WANT_LIBTOOL} in
 		none)   _libtool_atom="" ;;
@@ -301,17 +301,13 @@
 
 # @FUNCTION: _elibtoolize
 # @DESCRIPTION:
-# Runs libtoolize.  If --install is the first arg, automatically drop it if
-# the active libtool version doesn't support it.
+# Runs libtoolize.
 #
-# Note the '_' prefix .. to not collide with elibtoolize() from libtool.eclass.
+# Note the '_' prefix: avoid collision with elibtoolize() from libtool.eclass.
 _elibtoolize() {
 	local LIBTOOLIZE=${LIBTOOLIZE:-$(type -P glibtoolize > /dev/null && echo glibtoolize || echo libtoolize)}
 
 	[[ -f GNUmakefile.am || -f Makefile.am ]] && set -- "$@" --automake
-	if [[ $1 == "--install" ]] ; then
-		${LIBTOOLIZE} -n --install >& /dev/null || shift
-	fi
 
 	autotools_run_tool ${LIBTOOLIZE} "$@" ${opts}
 }

[gentoo-commits] gentoo-x86 commit in eclass: autotools.eclass

[Mike Frysinger (vapier)]

vapier      14/11/14 01:31:02

  Modified:             autotools.eclass
  Log:
  _elibtoolize: clean up stray $opts as the var was deleted in rev 1.135; pointed out by Fabian Groffen #517282

Revision  Changes    Path
1.165                eclass/autotools.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools.eclass?rev=1.165&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools.eclass?rev=1.165&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools.eclass?r1=1.164&r2=1.165

Index: autotools.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v
retrieving revision 1.164
retrieving revision 1.165
diff -u -r1.164 -r1.165
--- autotools.eclass	13 Nov 2014 17:14:22 -0000	1.164
+++ autotools.eclass	14 Nov 2014 01:31:01 -0000	1.165
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v 1.164 2014/11/13 17:14:22 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v 1.165 2014/11/14 01:31:01 vapier Exp $
 
 # @ECLASS: autotools.eclass
 # @MAINTAINER:
@@ -309,7 +309,7 @@
 
 	[[ -f GNUmakefile.am || -f Makefile.am ]] && set -- "$@" --automake
 
-	autotools_run_tool ${LIBTOOLIZE} "$@" ${opts}
+	autotools_run_tool ${LIBTOOLIZE} "$@"
 }
 
 # @FUNCTION: eautoheader

[gentoo-commits] gentoo-x86 commit in eclass: autotools.eclass

[Mike Frysinger (vapier)]

vapier      14/11/15 05:10:47

  Modified:             autotools.eclass
  Log:
  eautoconf: dump a QA warning when we find old configure.in files instead of configure.ac #426262

Revision  Changes    Path
1.166                eclass/autotools.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools.eclass?rev=1.166&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools.eclass?rev=1.166&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools.eclass?r1=1.165&r2=1.166

Index: autotools.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v
retrieving revision 1.165
retrieving revision 1.166
diff -u -r1.165 -r1.166
--- autotools.eclass	14 Nov 2014 01:31:01 -0000	1.165
+++ autotools.eclass	15 Nov 2014 05:10:47 -0000	1.166
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v 1.165 2014/11/14 01:31:01 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v 1.166 2014/11/15 05:10:47 vapier Exp $
 
 # @ECLASS: autotools.eclass
 # @MAINTAINER:
@@ -330,6 +330,11 @@
 		echo
 		die "No configure.{ac,in} present!"
 	fi
+	if [[ -e configure.in ]] ; then
+		eqawarn "This package has a configure.in file which has long been deprecated.  Please"
+		eqawarn "update it to use configure.ac instead as newer versions of autotools will die"
+		eqawarn "when it finds this file.  See https://bugs.gentoo.org/426262 for details."
+	fi
 
 	autotools_run_tool --at-m4flags autoconf "$@"
 }

[gentoo-commits] gentoo-x86 commit in eclass: autotools.eclass

[Mike Frysinger (vapier)]

vapier      14/11/15 05:40:04

  Modified:             autotools.eclass
  Log:
  eautomake: fix parsing of version output #509786 by Brian Evans

Revision  Changes    Path
1.167                eclass/autotools.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools.eclass?rev=1.167&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools.eclass?rev=1.167&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools.eclass?r1=1.166&r2=1.167

Index: autotools.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v
retrieving revision 1.166
retrieving revision 1.167
diff -u -r1.166 -r1.167
--- autotools.eclass	15 Nov 2014 05:10:47 -0000	1.166
+++ autotools.eclass	15 Nov 2014 05:40:04 -0000	1.167
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v 1.166 2014/11/15 05:10:47 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v 1.167 2014/11/15 05:40:04 vapier Exp $
 
 # @ECLASS: autotools.eclass
 # @MAINTAINER:
@@ -354,7 +354,8 @@
 	done
 
 	_automake_version() {
-		autotools_run_tool automake --version 2>/dev/null | sed -n -e '1{s:.*(GNU automake) ::p;q}'
+		autotools_run_tool --at-output automake --version 2>/dev/null |
+			sed -n -e '1{s:.*(GNU automake) ::p;q}'
 	}
 
 	if [[ -z ${makefile_name} ]] ; then
@@ -369,8 +370,9 @@
 			sed -e 's:.*by automake \(.*\) from .*:\1:')
 
 		if [[ ${installed_automake} != ${used_automake} ]]; then
-			einfo "Automake used for the package (${used_automake}) differs from"
-			einfo "the installed version (${installed_automake})."
+			ewarn "Automake used for the package (${used_automake}) differs from" \
+				"the installed version (${installed_automake})."
+			ewarn "Forcing a full rebuild of the autotools to workaround."
 			eautoreconf
 			return 0
 		fi
@@ -436,19 +438,20 @@
 }
 
 # @FUNCTION: autotools_run_tool
-# @USAGE: [--at-no-fail] [--at-m4flags] [--at-missing] <autotool> [tool-specific flags]
+# @USAGE: [--at-no-fail] [--at-m4flags] [--at-missing] [--at-output] <autotool> [tool-specific flags]
 # @INTERNAL
 # @DESCRIPTION:
 # Run the specified autotool helper, but do logging and error checking
 # around it in the process.
 autotools_run_tool() {
 	# Process our own internal flags first
-	local autofail=true m4flags=false missing_ok=false
+	local autofail=true m4flags=false missing_ok=false return_output=false
 	while [[ -n $1 ]] ; do
 		case $1 in
 		--at-no-fail) autofail=false;;
 		--at-m4flags) m4flags=true;;
 		--at-missing) missing_ok=true;;
+		--at-output)  return_output=true;;
 		# whatever is left goes to the actual tool
 		*) break;;
 		esac
@@ -482,6 +485,12 @@
 		set -- "${1}" $(autotools_m4dir_include) "${@:2}" $(autotools_m4sysdir_include)
 	fi
 
+	# If the caller wants to probe something, then let them do it directly.
+	if ${return_output} ; then
+		"$@"
+		return
+	fi
+
 	printf "***** $1 *****\n***** PWD: ${PWD}\n***** $*\n\n" > "${STDERR_TARGET}"
 
 	ebegin "Running $@"

[gentoo-commits] gentoo-x86 commit in eclass: autotools.eclass

[Mike Frysinger (vapier)]

vapier      14/11/15 07:11:41

  Modified:             autotools.eclass
  Log:
  autotools_env_setup: fix die message to list all the versions we tried and not just the first one #514724 by Alon Bar-Lev

Revision  Changes    Path
1.168                eclass/autotools.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools.eclass?rev=1.168&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools.eclass?rev=1.168&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools.eclass?r1=1.167&r2=1.168

Index: autotools.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v
retrieving revision 1.167
retrieving revision 1.168
diff -u -r1.167 -r1.168
--- autotools.eclass	15 Nov 2014 05:40:04 -0000	1.167
+++ autotools.eclass	15 Nov 2014 07:11:41 -0000	1.168
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v 1.167 2014/11/15 05:40:04 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v 1.168 2014/11/15 07:11:41 vapier Exp $
 
 # @ECLASS: autotools.eclass
 # @MAINTAINER:
@@ -432,7 +432,7 @@
 			ROOT=/ has_version "=sys-devel/automake-${pv}*" && export WANT_AUTOMAKE="${pv}"
 		done
 		[[ ${WANT_AUTOMAKE} == "latest" ]] && \
-			die "Cannot find the latest automake! Tried ${_LATEST_AUTOMAKE}"
+			die "Cannot find the latest automake! Tried ${_LATEST_AUTOMAKE[*]}"
 	fi
 	[[ ${WANT_AUTOCONF} == "latest" ]] && export WANT_AUTOCONF=2.5
 }

[gentoo-commits] gentoo-x86 commit in eclass: autotools.eclass

[Mike Frysinger (vapier)]

vapier      14/11/15 07:50:02

  Modified:             autotools.eclass
  Log:
  abort when AUTOTOOLS_AUTO_DEPEND changes on us as it will not work and is not intended behavior #409611 by Michał Górny

Revision  Changes    Path
1.169                eclass/autotools.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools.eclass?rev=1.169&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools.eclass?rev=1.169&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools.eclass?r1=1.168&r2=1.169

Index: autotools.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v
retrieving revision 1.168
retrieving revision 1.169
diff -u -r1.168 -r1.169
--- autotools.eclass	15 Nov 2014 07:11:41 -0000	1.168
+++ autotools.eclass	15 Nov 2014 07:50:02 -0000	1.169
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v 1.168 2014/11/15 07:11:41 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v 1.169 2014/11/15 07:50:02 vapier Exp $
 
 # @ECLASS: autotools.eclass
 # @MAINTAINER:
@@ -13,6 +13,16 @@
 # Note: We require GNU m4, as does autoconf.  So feel free to use any features
 # from the GNU version of m4 without worrying about other variants (i.e. BSD).
 
+if [[ ${__AUTOTOOLS_AUTO_DEPEND+set} == "set" ]] ; then
+	# See if we were included already, but someone changed the value
+	# of AUTOTOOLS_AUTO_DEPEND on us.  We could reload the entire
+	# eclass at that point, but that adds overhead, and it's trivial
+	# to re-order inherit in eclasses/ebuilds instead.  #409611
+	if [[ ${__AUTOTOOLS_AUTO_DEPEND} != ${AUTOTOOLS_AUTO_DEPEND} ]] ; then
+		die "AUTOTOOLS_AUTO_DEPEND changed value between inherits; please inherit autotools.eclass first! ${__AUTOTOOLS_AUTO_DEPEND} -> ${AUTOTOOLS_AUTO_DEPEND}"
+	fi
+fi
+
 if [[ -z ${_AUTOTOOLS_ECLASS} ]]; then
 _AUTOTOOLS_ECLASS=1
 
@@ -107,6 +117,7 @@
 if [[ ${AUTOTOOLS_AUTO_DEPEND} != "no" ]] ; then
 	DEPEND=${AUTOTOOLS_DEPEND}
 fi
+__AUTOTOOLS_AUTO_DEPEND=${AUTOTOOLS_AUTO_DEPEND} # See top of eclass
 
 unset _automake_atom _autoconf_atom
 

[gentoo-commits] gentoo-x86 commit in eclass: autotools.eclass

[Mike Frysinger (vapier)]

vapier      14/11/21 09:17:07

  Modified:             autotools.eclass
  Log:
  drop parallel support for now until we can safely add locking on sub-steps #529404 by Alexander Tsoy

Revision  Changes    Path
1.170                eclass/autotools.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools.eclass?rev=1.170&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools.eclass?rev=1.170&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools.eclass?r1=1.169&r2=1.170

Index: autotools.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v
retrieving revision 1.169
retrieving revision 1.170
diff -u -r1.169 -r1.170
--- autotools.eclass	15 Nov 2014 07:50:02 -0000	1.169
+++ autotools.eclass	21 Nov 2014 09:17:07 -0000	1.170
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v 1.169 2014/11/15 07:50:02 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v 1.170 2014/11/21 09:17:07 vapier Exp $
 
 # @ECLASS: autotools.eclass
 # @MAINTAINER:
@@ -26,7 +26,7 @@
 if [[ -z ${_AUTOTOOLS_ECLASS} ]]; then
 _AUTOTOOLS_ECLASS=1
 
-inherit libtool multiprocessing
+inherit libtool
 
 # @ECLASS-VARIABLE: WANT_AUTOCONF
 # @DESCRIPTION:
@@ -163,26 +163,22 @@
 # Should do a full autoreconf - normally what most people will be interested in.
 # Also should handle additional directories specified by AC_CONFIG_SUBDIRS.
 eautoreconf() {
-	local x g multitop
-
-	if [[ -z ${AT_TOPLEVEL_EAUTORECONF} ]] ; then
-		AT_TOPLEVEL_EAUTORECONF="yes"
-		multitop="yes"
-		multijob_init
-	fi
+	local x g
 
+	# Subdirs often share a common build dir #529404.  If so, we can't safely
+	# run in parallel because many tools clobber the content in there.  Libtool
+	# and automake both `rm && cp` while aclocal reads the output.  We might be
+	# able to handle this if we split the steps and grab locks on the dirs the
+	# tools actually write to.  Then we'd run all the common tools that use
+	# those inputs.  Doing this in bash does not scale easily.
+	# If we do re-enable parallel support, make sure #426512 is handled.
 	if [[ -z ${AT_NO_RECURSIVE} ]] ; then
 		# Take care of subdirs
 		for x in $(autotools_check_macro_val AC_CONFIG_SUBDIRS) ; do
 			if [[ -d ${x} ]] ; then
 				pushd "${x}" >/dev/null
-				if [[ -z ${PAST_TOPLEVEL_EAUTORECONF} ]] ; then
-					PAST_TOPLEVEL_EAUTORECONF="yes" AT_NOELIBTOOLIZE="yes" \
-						multijob_child_init eautoreconf || die
-				else
-					# Avoid unsafe nested multijob_finish_one for bug #426512.
-					AT_NOELIBTOOLIZE="yes" eautoreconf || die
-				fi
+				# Avoid unsafe nested multijob_finish_one for bug #426512.
+				AT_NOELIBTOOLIZE="yes" eautoreconf || die
 				popd >/dev/null
 			fi
 		done
@@ -236,11 +232,6 @@
 		elibtoolize --force "${PWD}"
 	fi
 
-	if [[ -n ${multitop} ]] ; then
-		unset AT_TOPLEVEL_EAUTORECONF
-		multijob_finish || die
-	fi
-
 	return 0
 }
 

[gentoo-commits] gentoo-x86 commit in eclass: autotools.eclass

[Mike Frysinger (vapier)]

vapier      15/03/19 19:27:02

  Modified:             autotools.eclass
  Log:
  eautoconf: do not warn about configure.in usage when using autoconf-2.1 #531646 by Alexander Tsoy

Revision  Changes    Path
1.174                eclass/autotools.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools.eclass?rev=1.174&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools.eclass?rev=1.174&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools.eclass?r1=1.173&r2=1.174

Index: autotools.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v
retrieving revision 1.173
retrieving revision 1.174
diff -u -r1.173 -r1.174
--- autotools.eclass	12 Jan 2015 23:17:14 -0000	1.173
+++ autotools.eclass	19 Mar 2015 19:27:02 -0000	1.174
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v 1.173 2015/01/12 23:17:14 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v 1.174 2015/03/19 19:27:02 vapier Exp $
 
 # @ECLASS: autotools.eclass
 # @MAINTAINER:
@@ -336,7 +336,7 @@
 		echo
 		die "No configure.{ac,in} present!"
 	fi
-	if [[ -e configure.in ]] ; then
+	if [[ ${WANT_AUTOCONF} != "2.1" && -e configure.in ]] ; then
 		eqawarn "This package has a configure.in file which has long been deprecated.  Please"
 		eqawarn "update it to use configure.ac instead as newer versions of autotools will die"
 		eqawarn "when it finds this file.  See https://bugs.gentoo.org/426262 for details."

[gentoo-commits] gentoo-x86 commit in eclass: autotools.eclass

[Mike Frysinger (vapier)]

vapier      15/05/20 05:57:38

  Modified:             autotools.eclass
  Log:
  bump min automake to 1.14.1 #547876

Revision  Changes    Path
1.175                eclass/autotools.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools.eclass?rev=1.175&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools.eclass?rev=1.175&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools.eclass?r1=1.174&r2=1.175

Index: autotools.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v
retrieving revision 1.174
retrieving revision 1.175
diff -u -r1.174 -r1.175
--- autotools.eclass	19 Mar 2015 19:27:02 -0000	1.174
+++ autotools.eclass	20 May 2015 05:57:38 -0000	1.175
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v 1.174 2015/03/19 19:27:02 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v 1.175 2015/05/20 05:57:38 vapier Exp $
 
 # @ECLASS: autotools.eclass
 # @MAINTAINER:
@@ -56,7 +56,7 @@
 # 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.13:1.13 1.15:1.15 )
+_LATEST_AUTOMAKE=( 1.14.1:1.14 1.15:1.15 )
 
 _automake_atom="sys-devel/automake"
 _autoconf_atom="sys-devel/autoconf"

[gentoo-commits] gentoo-x86 commit in eclass: autotools.eclass

[Mike Frysinger (vapier)]

vapier      15/06/03 04:06:08

  Modified:             autotools.eclass
  Log:
  set the default m4 system dir to the SYSROOT when it is available

Revision  Changes    Path
1.176                eclass/autotools.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools.eclass?rev=1.176&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools.eclass?rev=1.176&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools.eclass?r1=1.175&r2=1.176

Index: autotools.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v
retrieving revision 1.175
retrieving revision 1.176
diff -u -r1.175 -r1.176
--- autotools.eclass	20 May 2015 05:57:38 -0000	1.175
+++ autotools.eclass	3 Jun 2015 04:06:08 -0000	1.176
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v 1.175 2015/05/20 05:57:38 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v 1.176 2015/06/03 04:06:08 vapier Exp $
 
 # @ECLASS: autotools.eclass
 # @MAINTAINER:
@@ -591,6 +591,17 @@
 	echo ${include_opts}
 }
 autotools_m4dir_include()    { _autotools_m4dir_include ${AT_M4DIR} ; }
-autotools_m4sysdir_include() { _autotools_m4dir_include $(eval echo ${AT_SYS_M4DIR}) ; }
+autotools_m4sysdir_include() {
+	# First try to use the paths the system integrator has set up.
+	local paths=( $(eval echo ${AT_SYS_M4DIR}) )
+
+	if [[ ${#paths[@]} -eq 0 && -n ${SYSROOT} ]] ; then
+		# If they didn't give us anything, then default to the SYSROOT.
+		# This helps when cross-compiling.
+		local path="${SYSROOT}/usr/share/aclocal"
+		[[ -d ${path} ]] && paths+=( "${path}" )
+	fi
+	_autotools_m4dir_include "${paths[@]}"
+}
 
 fi

[gentoo-commits] gentoo-x86 commit in eclass: autotools.eclass

[Mike Frysinger (vapier)]

vapier      15/07/17 09:36:24

  Modified:             autotools.eclass
  Log:
  update automake version to match stable ebuilds #553738

Revision  Changes    Path
1.177                eclass/autotools.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools.eclass?rev=1.177&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools.eclass?rev=1.177&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools.eclass?r1=1.176&r2=1.177

Index: autotools.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v
retrieving revision 1.176
retrieving revision 1.177
diff -u -r1.176 -r1.177
--- autotools.eclass	3 Jun 2015 04:06:08 -0000	1.176
+++ autotools.eclass	17 Jul 2015 09:36:24 -0000	1.177
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v 1.176 2015/06/03 04:06:08 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v 1.177 2015/07/17 09:36:24 vapier Exp $
 
 # @ECLASS: autotools.eclass
 # @MAINTAINER:
@@ -56,7 +56,7 @@
 # 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.14.1:1.14 1.15:1.15 )
+_LATEST_AUTOMAKE=( 1.15:1.15 )
 
 _automake_atom="sys-devel/automake"
 _autoconf_atom="sys-devel/autoconf"