diff options
| author |   Robin H. Johnson <robbat2@gentoo.org> | 2013-12-27 21:27:38 +0000 |
|---|---|---|
| committer | Robin H. Johnson <robbat2@gentoo.org> | 2013-12-27 21:27:38 +0000 |
| commit | f24cee2a1b0c33e0bf289707f184ffebf9703d3c (patch) | |
| tree | f416722517bb40d475c4a66a7a8a9fd12cd9eb75 /eclass | |
| parent | Remove old sandbox mask for *-sources as those ebuilds are no longer present ... (diff) | |
| download | historical-f24cee2a1b0c33e0bf289707f184ffebf9703d3c.tar.gz historical-f24cee2a1b0c33e0bf289707f184ffebf9703d3c.tar.bz2 historical-f24cee2a1b0c33e0bf289707f184ffebf9703d3c.zip | |
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.
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/ChangeLog | 8 | ||||
| -rw-r--r-- | eclass/flag-o-matic.eclass | 9 |
2 files changed, 14 insertions, 3 deletions
diff --git a/eclass/ChangeLog b/eclass/ChangeLog index 85e2ea19a63d..fbb61bbff3d5 100644 --- a/eclass/ChangeLog +++ b/eclass/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for eclass directory # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1089 2013/12/27 09:28:41 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1090 2013/12/27 21:27:38 robbat2 Exp $ + + 27 Dec 2013; Robin H. Johnson <robbat2@gentoo.org> flag-o-matic.eclass: + 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. 27 Dec 2013; Michał Górny <mgorny@gentoo.org> eutils.eclass: Document einstalldocs. diff --git a/eclass/flag-o-matic.eclass b/eclass/flag-o-matic.eclass index 0339f932e47a..7a44adf652b6 100644 --- a/eclass/flag-o-matic.eclass +++ b/eclass/flag-o-matic.eclass @@ -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.192 2013/11/02 03:20:37 dirtyepic Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/flag-o-matic.eclass,v 1.193 2013/12/27 21:27:38 robbat2 Exp $ # @ECLASS: flag-o-matic.eclass # @MAINTAINER: @@ -605,7 +605,12 @@ append-libs() { local flag for flag in "$@"; do [[ ${flag} == -l* ]] && flag=${flag#-l} - export LIBS="${LIBS} -l${flag}" + if [[ ${flag} == -* ]]; then + 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 done return 0 |