| 1 |
robbat2 13/12/27 21:27:38 |
| 2 |
|
| 3 |
Modified: ChangeLog flag-o-matic.eclass |
| 4 |
Log: |
| 5 |
There are usages in the tree of "append-libs $(pkg-config ...)"; if pkg-config returns something other than a library, append-libs can end up inserting -l-L/usr/lib64 or other weirdness. We need to check for these and warn about them. |
| 6 |
|
| 7 |
Revision Changes Path |
| 8 |
1.1090 eclass/ChangeLog |
| 9 |
|
| 10 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1090&view=markup |
| 11 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1090&content-type=text/plain |
| 12 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1089&r2=1.1090 |
| 13 |
|
| 14 |
Index: ChangeLog |
| 15 |
=================================================================== |
| 16 |
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v |
| 17 |
retrieving revision 1.1089 |
| 18 |
retrieving revision 1.1090 |
| 19 |
diff -p -w -b -B -u -u -r1.1089 -r1.1090 |
| 20 |
--- ChangeLog 27 Dec 2013 09:28:41 -0000 1.1089 |
| 21 |
+++ ChangeLog 27 Dec 2013 21:27:38 -0000 1.1090 |
| 22 |
@@ -1,6 +1,12 @@ |
| 23 |
# ChangeLog for eclass directory |
| 24 |
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 |
| 25 |
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1089 2013/12/27 09:28:41 mgorny Exp $ |
| 26 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1090 2013/12/27 21:27:38 robbat2 Exp $ |
| 27 |
+ |
| 28 |
+ 27 Dec 2013; Robin H. Johnson <robbat2@g.o> flag-o-matic.eclass: |
| 29 |
+ There are usages in the tree of "append-libs $(pkg-config ...)"; if |
| 30 |
+ pkg-config returns something other than a library, append-libs can end up |
| 31 |
+ inserting -l-L/usr/lib64 or other weirdness. We need to check for these and |
| 32 |
+ warn about them. |
| 33 |
|
| 34 |
27 Dec 2013; Michał Górny <mgorny@g.o> eutils.eclass: |
| 35 |
Document einstalldocs. |
| 36 |
|
| 37 |
|
| 38 |
|
| 39 |
1.193 eclass/flag-o-matic.eclass |
| 40 |
|
| 41 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/flag-o-matic.eclass?rev=1.193&view=markup |
| 42 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/flag-o-matic.eclass?rev=1.193&content-type=text/plain |
| 43 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/flag-o-matic.eclass?r1=1.192&r2=1.193 |
| 44 |
|
| 45 |
Index: flag-o-matic.eclass |
| 46 |
=================================================================== |
| 47 |
RCS file: /var/cvsroot/gentoo-x86/eclass/flag-o-matic.eclass,v |
| 48 |
retrieving revision 1.192 |
| 49 |
retrieving revision 1.193 |
| 50 |
diff -p -w -b -B -u -u -r1.192 -r1.193 |
| 51 |
--- flag-o-matic.eclass 2 Nov 2013 03:20:37 -0000 1.192 |
| 52 |
+++ flag-o-matic.eclass 27 Dec 2013 21:27:38 -0000 1.193 |
| 53 |
@@ -1,6 +1,6 @@ |
| 54 |
# Copyright 1999-2013 Gentoo Foundation |
| 55 |
# Distributed under the terms of the GNU General Public License v2 |
| 56 |
-# $Header: /var/cvsroot/gentoo-x86/eclass/flag-o-matic.eclass,v 1.192 2013/11/02 03:20:37 dirtyepic Exp $ |
| 57 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/flag-o-matic.eclass,v 1.193 2013/12/27 21:27:38 robbat2 Exp $ |
| 58 |
|
| 59 |
# @ECLASS: flag-o-matic.eclass |
| 60 |
# @MAINTAINER: |
| 61 |
@@ -605,7 +605,12 @@ append-libs() { |
| 62 |
local flag |
| 63 |
for flag in "$@"; do |
| 64 |
[[ ${flag} == -l* ]] && flag=${flag#-l} |
| 65 |
+ if [[ ${flag} == -* ]]; then |
| 66 |
+ eqawarn "Appending non-library to LIBS (${flag}); Other linker flags should be passed via LDFLAGS" |
| 67 |
+ export LIBS="${LIBS} ${flag}" |
| 68 |
+ else |
| 69 |
export LIBS="${LIBS} -l${flag}" |
| 70 |
+ fi |
| 71 |
done |
| 72 |
|
| 73 |
return 0 |
Archives