1 |
mgorny 14/04/28 17:38:22 |
2 |
|
3 |
Modified: ChangeLog multilib-build.eclass |
4 |
Log: |
5 |
Deprecate multilib_build_binaries, and switch the code to use multilib_is_native_abi. |
6 |
|
7 |
Revision Changes Path |
8 |
1.1227 eclass/ChangeLog |
9 |
|
10 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1227&view=markup |
11 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1227&content-type=text/plain |
12 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1226&r2=1.1227 |
13 |
|
14 |
Index: ChangeLog |
15 |
=================================================================== |
16 |
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v |
17 |
retrieving revision 1.1226 |
18 |
retrieving revision 1.1227 |
19 |
diff -u -r1.1226 -r1.1227 |
20 |
--- ChangeLog 26 Apr 2014 05:13:24 -0000 1.1226 |
21 |
+++ ChangeLog 28 Apr 2014 17:38:21 -0000 1.1227 |
22 |
@@ -1,6 +1,10 @@ |
23 |
# ChangeLog for eclass directory |
24 |
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 |
25 |
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1226 2014/04/26 05:13:24 hd_brummy Exp $ |
26 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1227 2014/04/28 17:38:21 mgorny Exp $ |
27 |
+ |
28 |
+ 28 Apr 2014; Michał Górny <mgorny@g.o> multilib-build.eclass: |
29 |
+ Deprecate multilib_build_binaries, and switch the code to use |
30 |
+ multilib_is_native_abi. |
31 |
|
32 |
26 Apr 2014; Joerg Bornkessel <hd_brummy@g.o> -vdr-plugin.eclass: |
33 |
vdr-plugin.eclass removed, see #497058, #489116 |
34 |
|
35 |
|
36 |
|
37 |
1.40 eclass/multilib-build.eclass |
38 |
|
39 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multilib-build.eclass?rev=1.40&view=markup |
40 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multilib-build.eclass?rev=1.40&content-type=text/plain |
41 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multilib-build.eclass?r1=1.39&r2=1.40 |
42 |
|
43 |
Index: multilib-build.eclass |
44 |
=================================================================== |
45 |
RCS file: /var/cvsroot/gentoo-x86/eclass/multilib-build.eclass,v |
46 |
retrieving revision 1.39 |
47 |
retrieving revision 1.40 |
48 |
diff -u -r1.39 -r1.40 |
49 |
--- multilib-build.eclass 22 Apr 2014 20:12:53 -0000 1.39 |
50 |
+++ multilib-build.eclass 28 Apr 2014 17:38:21 -0000 1.40 |
51 |
@@ -1,6 +1,6 @@ |
52 |
# Copyright 1999-2014 Gentoo Foundation |
53 |
# Distributed under the terms of the GNU General Public License v2 |
54 |
-# $Header: /var/cvsroot/gentoo-x86/eclass/multilib-build.eclass,v 1.39 2014/04/22 20:12:53 mgorny Exp $ |
55 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/multilib-build.eclass,v 1.40 2014/04/28 17:38:21 mgorny Exp $ |
56 |
|
57 |
# @ECLASS: multilib-build.eclass |
58 |
# @MAINTAINER: |
59 |
@@ -394,7 +394,7 @@ |
60 |
mv "${root}/${f}" "${root}/${dir}/${CHOST}-${fn}" || die |
61 |
|
62 |
# symlink the native one back |
63 |
- if multilib_build_binaries; then |
64 |
+ if multilib_is_native_abi; then |
65 |
ln -s "${CHOST}-${fn}" "${root}/${f}" || die |
66 |
fi |
67 |
done |
68 |
@@ -439,7 +439,9 @@ |
69 |
multilib_is_native_abi() { |
70 |
debug-print-function ${FUNCNAME} "${@}" |
71 |
|
72 |
- multilib_build_binaries "${@}" |
73 |
+ [[ ${#} -eq 0 ]] || die "${FUNCNAME}: too many arguments" |
74 |
+ |
75 |
+ [[ ${COMPLETE_MULTILIB} == yes || ${ABI} == ${DEFAULT_ABI} ]] |
76 |
} |
77 |
|
78 |
# @FUNCTION: multilib_build_binaries |
79 |
@@ -455,20 +457,21 @@ |
80 |
multilib_build_binaries() { |
81 |
debug-print-function ${FUNCNAME} "${@}" |
82 |
|
83 |
- [[ ${#} -eq 0 ]] || die "${FUNCNAME}: too many arguments" |
84 |
+ eqawarn "QA warning: multilib_build_binaries is deprecated. Please use the equivalent" |
85 |
+ eqawarn "multilib_is_native_abi function instead." |
86 |
|
87 |
- [[ ${COMPLETE_MULTILIB} == yes || ${ABI} == ${DEFAULT_ABI} ]] |
88 |
+ multilib_is_native_abi "${@}" |
89 |
} |
90 |
|
91 |
# @FUNCTION: multilib_native_use_with |
92 |
# @USAGE: <flag> [<opt-name> [<opt-value>]] |
93 |
# @DESCRIPTION: |
94 |
# Output --with configure option alike use_with if USE <flag> is enabled |
95 |
-# and executables are being built (multilib_build_binaries is true). |
96 |
+# and executables are being built (multilib_is_native_abi is true). |
97 |
# Otherwise, outputs --without configure option. Arguments are the same |
98 |
# as for use_with in the EAPI. |
99 |
multilib_native_use_with() { |
100 |
- if multilib_build_binaries; then |
101 |
+ if multilib_is_native_abi; then |
102 |
use_with "${@}" |
103 |
else |
104 |
echo "--without-${2:-${1}}" |
105 |
@@ -479,11 +482,11 @@ |
106 |
# @USAGE: <flag> [<opt-name> [<opt-value>]] |
107 |
# @DESCRIPTION: |
108 |
# Output --enable configure option alike use_with if USE <flag> |
109 |
-# is enabled and executables are being built (multilib_build_binaries |
110 |
+# is enabled and executables are being built (multilib_is_native_abi |
111 |
# is true). Otherwise, outputs --disable configure option. Arguments are |
112 |
# the same as for use_enable in the EAPI. |
113 |
multilib_native_use_enable() { |
114 |
- if multilib_build_binaries; then |
115 |
+ if multilib_is_native_abi; then |
116 |
use_enable "${@}" |
117 |
else |
118 |
echo "--disable-${2:-${1}}" |
119 |
@@ -495,13 +498,13 @@ |
120 |
# @DESCRIPTION: |
121 |
# Output the concatenation of <true1> (or 'yes' if unspecified) |
122 |
# and <true2> if USE <flag> is enabled and executables are being built |
123 |
-# (multilib_build_binaries is true). Otherwise, output the concatenation |
124 |
+# (multilib_is_native_abi is true). Otherwise, output the concatenation |
125 |
# of <false1> (or 'no' if unspecified) and <false2>. Arguments |
126 |
# are the same as for usex in the EAPI. |
127 |
# |
128 |
# Note: in EAPI 4 you need to inherit eutils to use this function. |
129 |
multilib_native_usex() { |
130 |
- if multilib_build_binaries; then |
131 |
+ if multilib_is_native_abi; then |
132 |
usex "${@}" |
133 |
else |
134 |
echo "${3-no}${5}" |