1 |
jlec 12/05/30 07:59:51 |
2 |
|
3 |
Modified: flag-o-matic.eclass ChangeLog |
4 |
Log: |
5 |
Sort ldflags handling functions to logic place |
6 |
|
7 |
Revision Changes Path |
8 |
1.171 eclass/flag-o-matic.eclass |
9 |
|
10 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/flag-o-matic.eclass?rev=1.171&view=markup |
11 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/flag-o-matic.eclass?rev=1.171&content-type=text/plain |
12 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/flag-o-matic.eclass?r1=1.170&r2=1.171 |
13 |
|
14 |
Index: flag-o-matic.eclass |
15 |
=================================================================== |
16 |
RCS file: /var/cvsroot/gentoo-x86/eclass/flag-o-matic.eclass,v |
17 |
retrieving revision 1.170 |
18 |
retrieving revision 1.171 |
19 |
diff -u -r1.170 -r1.171 |
20 |
--- flag-o-matic.eclass 26 May 2012 02:55:02 -0000 1.170 |
21 |
+++ flag-o-matic.eclass 30 May 2012 07:59:51 -0000 1.171 |
22 |
@@ -1,6 +1,6 @@ |
23 |
-# Copyright 1999-2011 Gentoo Foundation |
24 |
+# Copyright 1999-2012 Gentoo Foundation |
25 |
# Distributed under the terms of the GNU General Public License v2 |
26 |
-# $Header: /var/cvsroot/gentoo-x86/eclass/flag-o-matic.eclass,v 1.170 2012/05/26 02:55:02 vapier Exp $ |
27 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/flag-o-matic.eclass,v 1.171 2012/05/30 07:59:51 jlec Exp $ |
28 |
|
29 |
# @ECLASS: flag-o-matic.eclass |
30 |
# @MAINTAINER: |
31 |
@@ -123,6 +123,15 @@ |
32 |
filter-flags -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE |
33 |
} |
34 |
|
35 |
+# @FUNCTION: filter-ldflags |
36 |
+# @USAGE: <flags> |
37 |
+# @DESCRIPTION: |
38 |
+# Remove particular <flags> from LDFLAGS. Accepts shell globs. |
39 |
+filter-ldflags() { |
40 |
+ _filter-var LDFLAGS "$@" |
41 |
+ return 0 |
42 |
+} |
43 |
+ |
44 |
# @FUNCTION: append-cppflags |
45 |
# @USAGE: <flags> |
46 |
# @DESCRIPTION: |
47 |
@@ -173,6 +182,22 @@ |
48 |
append-cppflags -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE |
49 |
} |
50 |
|
51 |
+# @FUNCTION: append-ldflags |
52 |
+# @USAGE: <flags> |
53 |
+# @DESCRIPTION: |
54 |
+# Add extra <flags> to the current LDFLAGS. |
55 |
+append-ldflags() { |
56 |
+ [[ $# -eq 0 ]] && return 0 |
57 |
+ local flag |
58 |
+ for flag in "$@"; do |
59 |
+ [[ ${flag} == -l* ]] && \ |
60 |
+ ewarn "Appending a library link instruction (${flag}); libraries to link to should not be passed through LDFLAGS" |
61 |
+ done |
62 |
+ |
63 |
+ export LDFLAGS="${LDFLAGS} $*" |
64 |
+ return 0 |
65 |
+} |
66 |
+ |
67 |
# @FUNCTION: append-flags |
68 |
# @USAGE: <flags> |
69 |
# @DESCRIPTION: |
70 |
@@ -552,31 +577,6 @@ |
71 |
return 0 |
72 |
} |
73 |
|
74 |
-# @FUNCTION: append-ldflags |
75 |
-# @USAGE: <flags> |
76 |
-# @DESCRIPTION: |
77 |
-# Add extra <flags> to the current LDFLAGS. |
78 |
-append-ldflags() { |
79 |
- [[ $# -eq 0 ]] && return 0 |
80 |
- local flag |
81 |
- for flag in "$@"; do |
82 |
- [[ ${flag} == -l* ]] && \ |
83 |
- ewarn "Appending a library link instruction (${flag}); libraries to link to should not be passed through LDFLAGS" |
84 |
- done |
85 |
- |
86 |
- export LDFLAGS="${LDFLAGS} $*" |
87 |
- return 0 |
88 |
-} |
89 |
- |
90 |
-# @FUNCTION: filter-ldflags |
91 |
-# @USAGE: <flags> |
92 |
-# @DESCRIPTION: |
93 |
-# Remove particular <flags> from LDFLAGS. Accepts shell globs. |
94 |
-filter-ldflags() { |
95 |
- _filter-var LDFLAGS "$@" |
96 |
- return 0 |
97 |
-} |
98 |
- |
99 |
# @FUNCTION: raw-ldflags |
100 |
# @USAGE: [flags] |
101 |
# @DESCRIPTION: |
102 |
|
103 |
|
104 |
|
105 |
1.278 eclass/ChangeLog |
106 |
|
107 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.278&view=markup |
108 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.278&content-type=text/plain |
109 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.277&r2=1.278 |
110 |
|
111 |
Index: ChangeLog |
112 |
=================================================================== |
113 |
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v |
114 |
retrieving revision 1.277 |
115 |
retrieving revision 1.278 |
116 |
diff -u -r1.277 -r1.278 |
117 |
--- ChangeLog 30 May 2012 06:35:43 -0000 1.277 |
118 |
+++ ChangeLog 30 May 2012 07:59:51 -0000 1.278 |
119 |
@@ -1,6 +1,9 @@ |
120 |
# ChangeLog for eclass directory |
121 |
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 |
122 |
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.277 2012/05/30 06:35:43 slyfox Exp $ |
123 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.278 2012/05/30 07:59:51 jlec Exp $ |
124 |
+ |
125 |
+ 30 May 2012; Justin Lecher <jlec@g.o> flag-o-matic.eclass: |
126 |
+ Sort ldflags handling functions to logic place |
127 |
|
128 |
30 May 2012; Sergei Trofimovich <slyfox@g.o> games.eclass: |
129 |
Allow EAPI=4. |