summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJustin Lecher <jlec@gentoo.org>2012-05-30 07:59:51 +0000
committerJustin Lecher <jlec@gentoo.org>2012-05-30 07:59:51 +0000
commit2913c00e1b0e1f815837629bf869ef77d594d2be (patch)
treefe35052e3a84c112d3c50f0db9889b64b0131769 /eclass/flag-o-matic.eclass
parentAdd fix for prefix, missing rpath for qt4 installation (diff)
downloadgentoo-2-2913c00e1b0e1f815837629bf869ef77d594d2be.tar.gz
gentoo-2-2913c00e1b0e1f815837629bf869ef77d594d2be.tar.bz2
gentoo-2-2913c00e1b0e1f815837629bf869ef77d594d2be.zip
Sort ldflags handling functions to logic place
Diffstat (limited to 'eclass/flag-o-matic.eclass')
-rw-r--r--eclass/flag-o-matic.eclass54
1 files changed, 27 insertions, 27 deletions
diff --git a/eclass/flag-o-matic.eclass b/eclass/flag-o-matic.eclass
index ad4f1409b180..d7ec758e0ad4 100644
--- a/eclass/flag-o-matic.eclass
+++ b/eclass/flag-o-matic.eclass
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 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.170 2012/05/26 02:55:02 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/flag-o-matic.eclass,v 1.171 2012/05/30 07:59:51 jlec Exp $
# @ECLASS: flag-o-matic.eclass
# @MAINTAINER:
@@ -123,6 +123,15 @@ filter-lfs-flags() {
filter-flags -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE
}
+# @FUNCTION: filter-ldflags
+# @USAGE: <flags>
+# @DESCRIPTION:
+# Remove particular <flags> from LDFLAGS. Accepts shell globs.
+filter-ldflags() {
+ _filter-var LDFLAGS "$@"
+ return 0
+}
+
# @FUNCTION: append-cppflags
# @USAGE: <flags>
# @DESCRIPTION:
@@ -173,6 +182,22 @@ append-lfs-flags() {
append-cppflags -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE
}
+# @FUNCTION: append-ldflags
+# @USAGE: <flags>
+# @DESCRIPTION:
+# Add extra <flags> to the current LDFLAGS.
+append-ldflags() {
+ [[ $# -eq 0 ]] && return 0
+ local flag
+ for flag in "$@"; do
+ [[ ${flag} == -l* ]] && \
+ ewarn "Appending a library link instruction (${flag}); libraries to link to should not be passed through LDFLAGS"
+ done
+
+ export LDFLAGS="${LDFLAGS} $*"
+ return 0
+}
+
# @FUNCTION: append-flags
# @USAGE: <flags>
# @DESCRIPTION:
@@ -552,31 +577,6 @@ append-libs() {
return 0
}
-# @FUNCTION: append-ldflags
-# @USAGE: <flags>
-# @DESCRIPTION:
-# Add extra <flags> to the current LDFLAGS.
-append-ldflags() {
- [[ $# -eq 0 ]] && return 0
- local flag
- for flag in "$@"; do
- [[ ${flag} == -l* ]] && \
- ewarn "Appending a library link instruction (${flag}); libraries to link to should not be passed through LDFLAGS"
- done
-
- export LDFLAGS="${LDFLAGS} $*"
- return 0
-}
-
-# @FUNCTION: filter-ldflags
-# @USAGE: <flags>
-# @DESCRIPTION:
-# Remove particular <flags> from LDFLAGS. Accepts shell globs.
-filter-ldflags() {
- _filter-var LDFLAGS "$@"
- return 0
-}
-
# @FUNCTION: raw-ldflags
# @USAGE: [flags]
# @DESCRIPTION: