[gentoo-commits] gentoo-x86 commit in eclass: ChangeLog flag-o-matic.eclass

[Robin H. Johnson (robbat2)]

robbat2     13/12/27 21:39:36

  Modified:             ChangeLog flag-o-matic.eclass
  Log:
  Per discussion with Flameeyes, make -l and -L always valid, and only warn about other arguments to append-libs. Also document expected arguments to append-libs.

Revision  Changes    Path
1.1091               eclass/ChangeLog

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

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1090
retrieving revision 1.1091
diff -p -w -b -B -u -u -r1.1090 -r1.1091
--- ChangeLog	27 Dec 2013 21:27:38 -0000	1.1090
+++ ChangeLog	27 Dec 2013 21:39:36 -0000	1.1091
@@ -1,6 +1,11 @@
 # ChangeLog for eclass directory
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1090 2013/12/27 21:27:38 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1091 2013/12/27 21:39:36 robbat2 Exp $
+
+  27 Dec 2013; Robin H. Johnson <robbat2@g.o> flag-o-matic.eclass:
+  Per discussion with Flameeyes, make -l and -L always valid, and only warn
+  about other arguments to append-libs. Also document expected arguments to
+  append-libs.
 
   27 Dec 2013; Robin H. Johnson <robbat2@g.o> flag-o-matic.eclass:
   There are usages in the tree of "append-libs $(pkg-config ...)"; if



1.194                eclass/flag-o-matic.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/flag-o-matic.eclass?rev=1.194&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/flag-o-matic.eclass?rev=1.194&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/flag-o-matic.eclass?r1=1.193&r2=1.194

Index: flag-o-matic.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/flag-o-matic.eclass,v
retrieving revision 1.193
retrieving revision 1.194
diff -p -w -b -B -u -u -r1.193 -r1.194
--- flag-o-matic.eclass	27 Dec 2013 21:27:38 -0000	1.193
+++ flag-o-matic.eclass	27 Dec 2013 21:39:36 -0000	1.194
@@ -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/flag-o-matic.eclass,v 1.193 2013/12/27 21:27:38 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/flag-o-matic.eclass,v 1.194 2013/12/27 21:39:36 robbat2 Exp $
 
 # @ECLASS: flag-o-matic.eclass
 # @MAINTAINER:
@@ -599,18 +599,24 @@ replace-sparc64-flags() {
 # @FUNCTION: append-libs
 # @USAGE: <libs>
 # @DESCRIPTION:
-# Add extra <libs> to the current LIBS.
+# Add extra <libs> to the current LIBS. All arguments should prefixed with
+# either -l or -L.  For compatability, if arguments are not prefixed as
+# options, they are given a -l prefix automatically.
 append-libs() {
 	[[ $# -eq 0 ]] && return 0
 	local flag
 	for flag in "$@"; do
-		[[ ${flag} == -l* ]] && flag=${flag#-l}
-		if [[ ${flag} == -* ]]; then
+		case $flag in
+			-[lL]*) 
+				export LIBS="${LIBS} ${flag}"
+				;;
+			-*) 
 			eqawarn "Appending non-library to LIBS (${flag}); Other linker flags should be passed via LDFLAGS"
 			export LIBS="${LIBS} ${flag}"
-		else
+				;;
+			*)
 			export LIBS="${LIBS} -l${flag}"
-		fi
+		esac
 	done
 
 	return 0