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

[Mike Frysinger (vapier)]

vapier      13/05/22 06:03:08

  Modified:             gnuconfig.eclass
  Log:
  use arrays & globs to get slightly better dynamic coverage for config.sub lookups #470146

Revision  Changes    Path
1.35                 eclass/gnuconfig.eclass

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

Index: gnuconfig.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/gnuconfig.eclass,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- gnuconfig.eclass	15 Sep 2012 16:16:53 -0000	1.34
+++ gnuconfig.eclass	22 May 2013 06:03:08 -0000	1.35
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/gnuconfig.eclass,v 1.34 2012/09/15 16:16:53 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/gnuconfig.eclass,v 1.35 2013/05/22 06:03:08 vapier Exp $
 #
 # THIS ECLASS IS DEAD: It has been integrated into portage
 #
@@ -87,15 +87,13 @@
 # this searches the standard locations for the newest config.{sub|guess}, and
 # returns the directory where they can be found.
 gnuconfig_findnewest() {
-	local locations="
+	local locations=(
+		/usr/share/misc/config.sub
 		/usr/share/gnuconfig/config.sub
-		/usr/share/automake-1.9/config.sub
-		/usr/share/automake-1.8/config.sub
-		/usr/share/automake-1.7/config.sub
-		/usr/share/automake-1.6/config.sub
-		/usr/share/automake-1.5/config.sub
-		/usr/share/automake-1.4/config.sub
+		/usr/share/automake*/config.sub
 		/usr/share/libtool/config.sub
-	"
-	grep -s '^timestamp' ${locations} | sort -n -t\' -k2 | tail -n 1 | sed 's,/config.sub:.*$,,'
+	)
+	grep -s '^timestamp' "${locations[@]}" | \
+		sort -r -n -t\' -k2 | \
+		sed -n '1{s,/config.sub:.*$,,;p;q}'
 }