1 |
commit: e4b034ec87ff80561b18d52ee07df66b04a50cab |
2 |
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Jan 25 14:04:13 2016 +0000 |
4 |
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Jan 25 14:07:05 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e4b034ec |
7 |
|
8 |
cmake-utils.eclass: namespace some private functions |
9 |
|
10 |
eclass/cmake-utils.eclass | 66 +++++++++++++++++++++++------------------------ |
11 |
1 file changed, 33 insertions(+), 33 deletions(-) |
12 |
|
13 |
diff --git a/eclass/cmake-utils.eclass b/eclass/cmake-utils.eclass |
14 |
index d71f57b..6224cbd 100644 |
15 |
--- a/eclass/cmake-utils.eclass |
16 |
+++ b/eclass/cmake-utils.eclass |
17 |
@@ -158,7 +158,7 @@ DEPEND="${CMAKEDEPEND}" |
18 |
unset CMAKEDEPEND |
19 |
|
20 |
# Internal functions used by cmake-utils_use_* |
21 |
-_use_me_now() { |
22 |
+_cmake_use_me_now() { |
23 |
debug-print-function ${FUNCNAME} "$@" |
24 |
|
25 |
local uper capitalised x |
26 |
@@ -175,7 +175,7 @@ _use_me_now() { |
27 |
done |
28 |
fi |
29 |
} |
30 |
-_use_me_now_inverted() { |
31 |
+_cmake_use_me_now_inverted() { |
32 |
debug-print-function ${FUNCNAME} "$@" |
33 |
|
34 |
local uper capitalised x |
35 |
@@ -194,7 +194,7 @@ _use_me_now_inverted() { |
36 |
} |
37 |
|
38 |
# Determine using IN or OUT source build |
39 |
-_check_build_dir() { |
40 |
+_cmake_check_build_dir() { |
41 |
: ${CMAKE_USE_DIR:=${S}} |
42 |
if [[ -n ${CMAKE_IN_SOURCE_BUILD} ]]; then |
43 |
# we build in source dir |
44 |
@@ -226,7 +226,7 @@ _check_build_dir() { |
45 |
} |
46 |
|
47 |
# Determine which generator to use |
48 |
-_generator_to_use() { |
49 |
+_cmake_generator_to_use() { |
50 |
local generator_name |
51 |
|
52 |
case ${CMAKE_MAKEFILE_GENERATOR} in |
53 |
@@ -283,7 +283,7 @@ comment_add_subdirectory() { |
54 |
# |
55 |
# `cmake-utils_use_with foo FOO` echoes -DWITH_FOO=ON if foo is enabled |
56 |
# and -DWITH_FOO=OFF if it is disabled. |
57 |
-cmake-utils_use_with() { _use_me_now WITH_ "$@" ; } |
58 |
+cmake-utils_use_with() { _cmake_use_me_now WITH_ "$@" ; } |
59 |
|
60 |
# @FUNCTION: cmake-utils_use_enable |
61 |
# @USAGE: <USE flag> [flag name] |
62 |
@@ -292,7 +292,7 @@ cmake-utils_use_with() { _use_me_now WITH_ "$@" ; } |
63 |
# |
64 |
# `cmake-utils_use_enable foo FOO` echoes -DENABLE_FOO=ON if foo is enabled |
65 |
# and -DENABLE_FOO=OFF if it is disabled. |
66 |
-cmake-utils_use_enable() { _use_me_now ENABLE_ "$@" ; } |
67 |
+cmake-utils_use_enable() { _cmake_use_me_now ENABLE_ "$@" ; } |
68 |
|
69 |
# @FUNCTION: cmake-utils_use_find_package |
70 |
# @USAGE: <USE flag> [flag name] |
71 |
@@ -302,7 +302,7 @@ cmake-utils_use_enable() { _use_me_now ENABLE_ "$@" ; } |
72 |
# `cmake-utils_use_find_package foo LibFoo` echoes -DCMAKE_DISABLE_FIND_PACKAGE_LibFoo=OFF |
73 |
# if foo is enabled and -DCMAKE_DISABLE_FIND_PACKAGE_LibFoo=ON if it is disabled. |
74 |
# This can be used to make find_package optional. |
75 |
-cmake-utils_use_find_package() { _use_me_now_inverted CMAKE_DISABLE_FIND_PACKAGE_ "$@" ; } |
76 |
+cmake-utils_use_find_package() { _cmake_use_me_now_inverted CMAKE_DISABLE_FIND_PACKAGE_ "$@" ; } |
77 |
|
78 |
# @FUNCTION: cmake-utils_use_disable |
79 |
# @USAGE: <USE flag> [flag name] |
80 |
@@ -311,7 +311,7 @@ cmake-utils_use_find_package() { _use_me_now_inverted CMAKE_DISABLE_FIND_PACKAGE |
81 |
# |
82 |
# `cmake-utils_use_enable foo FOO` echoes -DDISABLE_FOO=OFF if foo is enabled |
83 |
# and -DDISABLE_FOO=ON if it is disabled. |
84 |
-cmake-utils_use_disable() { _use_me_now_inverted DISABLE_ "$@" ; } |
85 |
+cmake-utils_use_disable() { _cmake_use_me_now_inverted DISABLE_ "$@" ; } |
86 |
|
87 |
# @FUNCTION: cmake-utils_use_no |
88 |
# @USAGE: <USE flag> [flag name] |
89 |
@@ -320,7 +320,7 @@ cmake-utils_use_disable() { _use_me_now_inverted DISABLE_ "$@" ; } |
90 |
# |
91 |
# `cmake-utils_use_no foo FOO` echoes -DNO_FOO=OFF if foo is enabled |
92 |
# and -DNO_FOO=ON if it is disabled. |
93 |
-cmake-utils_use_no() { _use_me_now_inverted NO_ "$@" ; } |
94 |
+cmake-utils_use_no() { _cmake_use_me_now_inverted NO_ "$@" ; } |
95 |
|
96 |
# @FUNCTION: cmake-utils_use_want |
97 |
# @USAGE: <USE flag> [flag name] |
98 |
@@ -329,7 +329,7 @@ cmake-utils_use_no() { _use_me_now_inverted NO_ "$@" ; } |
99 |
# |
100 |
# `cmake-utils_use_want foo FOO` echoes -DWANT_FOO=ON if foo is enabled |
101 |
# and -DWANT_FOO=OFF if it is disabled. |
102 |
-cmake-utils_use_want() { _use_me_now WANT_ "$@" ; } |
103 |
+cmake-utils_use_want() { _cmake_use_me_now WANT_ "$@" ; } |
104 |
|
105 |
# @FUNCTION: cmake-utils_use_build |
106 |
# @USAGE: <USE flag> [flag name] |
107 |
@@ -338,7 +338,7 @@ cmake-utils_use_want() { _use_me_now WANT_ "$@" ; } |
108 |
# |
109 |
# `cmake-utils_use_build foo FOO` echoes -DBUILD_FOO=ON if foo is enabled |
110 |
# and -DBUILD_FOO=OFF if it is disabled. |
111 |
-cmake-utils_use_build() { _use_me_now BUILD_ "$@" ; } |
112 |
+cmake-utils_use_build() { _cmake_use_me_now BUILD_ "$@" ; } |
113 |
|
114 |
# @FUNCTION: cmake-utils_use_has |
115 |
# @USAGE: <USE flag> [flag name] |
116 |
@@ -347,7 +347,7 @@ cmake-utils_use_build() { _use_me_now BUILD_ "$@" ; } |
117 |
# |
118 |
# `cmake-utils_use_has foo FOO` echoes -DHAVE_FOO=ON if foo is enabled |
119 |
# and -DHAVE_FOO=OFF if it is disabled. |
120 |
-cmake-utils_use_has() { _use_me_now HAVE_ "$@" ; } |
121 |
+cmake-utils_use_has() { _cmake_use_me_now HAVE_ "$@" ; } |
122 |
|
123 |
# @FUNCTION: cmake-utils_use_use |
124 |
# @USAGE: <USE flag> [flag name] |
125 |
@@ -356,7 +356,7 @@ cmake-utils_use_has() { _use_me_now HAVE_ "$@" ; } |
126 |
# |
127 |
# `cmake-utils_use_use foo FOO` echoes -DUSE_FOO=ON if foo is enabled |
128 |
# and -DUSE_FOO=OFF if it is disabled. |
129 |
-cmake-utils_use_use() { _use_me_now USE_ "$@" ; } |
130 |
+cmake-utils_use_use() { _cmake_use_me_now USE_ "$@" ; } |
131 |
|
132 |
# @FUNCTION: cmake-utils_use |
133 |
# @USAGE: <USE flag> [flag name] |
134 |
@@ -365,7 +365,7 @@ cmake-utils_use_use() { _use_me_now USE_ "$@" ; } |
135 |
# |
136 |
# `cmake-utils_use foo FOO` echoes -DFOO=ON if foo is enabled |
137 |
# and -DFOO=OFF if it is disabled. |
138 |
-cmake-utils_use() { _use_me_now "" "$@" ; } |
139 |
+cmake-utils_use() { _cmake_use_me_now "" "$@" ; } |
140 |
|
141 |
# @FUNCTION: cmake-utils_useno |
142 |
# @USAGE: <USE flag> [flag name] |
143 |
@@ -374,11 +374,11 @@ cmake-utils_use() { _use_me_now "" "$@" ; } |
144 |
# |
145 |
# `cmake-utils_useno foo NOFOO` echoes -DNOFOO=OFF if foo is enabled |
146 |
# and -DNOFOO=ON if it is disabled. |
147 |
-cmake-utils_useno() { _use_me_now_inverted "" "$@" ; } |
148 |
+cmake-utils_useno() { _cmake_use_me_now_inverted "" "$@" ; } |
149 |
|
150 |
# Internal function for modifying hardcoded definitions. |
151 |
# Removes dangerous definitions that override Gentoo settings. |
152 |
-_modify-cmakelists() { |
153 |
+_cmake_modify-cmakelists() { |
154 |
debug-print-function ${FUNCNAME} "$@" |
155 |
|
156 |
# Only edit the files once |
157 |
@@ -448,7 +448,7 @@ enable_cmake-utils_src_configure() { |
158 |
done |
159 |
fi |
160 |
|
161 |
- _check_build_dir |
162 |
+ _cmake_check_build_dir |
163 |
|
164 |
# check if CMakeLists.txt exist and if no then die |
165 |
if [[ ! -e ${CMAKE_USE_DIR}/CMakeLists.txt ]] ; then |
166 |
@@ -459,7 +459,7 @@ enable_cmake-utils_src_configure() { |
167 |
fi |
168 |
|
169 |
# Remove dangerous things. |
170 |
- _modify-cmakelists |
171 |
+ _cmake_modify-cmakelists |
172 |
|
173 |
# Fix xdg collision with sandbox |
174 |
local -x XDG_CONFIG_HOME="${T}" |
175 |
@@ -592,7 +592,7 @@ enable_cmake-utils_src_configure() { |
176 |
local cmakeargs=( |
177 |
${warn_unused_cli} |
178 |
-C "${common_config}" |
179 |
- -G "$(_generator_to_use)" |
180 |
+ -G "$(_cmake_generator_to_use)" |
181 |
-DCMAKE_INSTALL_PREFIX="${EPREFIX}${PREFIX}" |
182 |
"${mycmakeargs_local[@]}" |
183 |
-DCMAKE_BUILD_TYPE="${CMAKE_BUILD_TYPE}" |
184 |
@@ -641,11 +641,11 @@ _ninjaopts_from_makeopts() { |
185 |
export NINJAOPTS="${ninjaopts[*]}" |
186 |
} |
187 |
|
188 |
-# @FUNCTION: ninja_src_make |
189 |
+# @FUNCTION: _cmake_ninja_src_make |
190 |
# @INTERNAL |
191 |
# @DESCRIPTION: |
192 |
# Build the package using ninja generator |
193 |
-ninja_src_make() { |
194 |
+_cmake_ninja_src_make() { |
195 |
debug-print-function ${FUNCNAME} "$@" |
196 |
|
197 |
[[ -e build.ninja ]] || die "build.ninja not found. Error during configure stage." |
198 |
@@ -662,11 +662,11 @@ ninja_src_make() { |
199 |
"$@" || die |
200 |
} |
201 |
|
202 |
-# @FUNCTION: emake_src_make |
203 |
+# @FUNCTION: _cmake_emake_src_make |
204 |
# @INTERNAL |
205 |
# @DESCRIPTION: |
206 |
# Build the package using make generator |
207 |
-emake_src_make() { |
208 |
+_cmake_emake_src_make() { |
209 |
debug-print-function ${FUNCNAME} "$@" |
210 |
|
211 |
[[ -e Makefile ]] || die "Makefile not found. Error during configure stage." |
212 |
@@ -686,10 +686,10 @@ emake_src_make() { |
213 |
cmake-utils_src_make() { |
214 |
debug-print-function ${FUNCNAME} "$@" |
215 |
|
216 |
- _check_build_dir |
217 |
+ _cmake_check_build_dir |
218 |
pushd "${BUILD_DIR}" > /dev/null || die |
219 |
|
220 |
- ${CMAKE_MAKEFILE_GENERATOR}_src_make "$@" |
221 |
+ _cmake_${CMAKE_MAKEFILE_GENERATOR}_src_make "$@" |
222 |
|
223 |
popd > /dev/null || die |
224 |
} |
225 |
@@ -697,7 +697,7 @@ cmake-utils_src_make() { |
226 |
enable_cmake-utils_src_test() { |
227 |
debug-print-function ${FUNCNAME} "$@" |
228 |
|
229 |
- _check_build_dir |
230 |
+ _cmake_check_build_dir |
231 |
pushd "${BUILD_DIR}" > /dev/null || die |
232 |
[[ -e CTestTestfile.cmake ]] || { echo "No tests found. Skipping."; return 0 ; } |
233 |
|
234 |
@@ -728,7 +728,7 @@ enable_cmake-utils_src_test() { |
235 |
enable_cmake-utils_src_install() { |
236 |
debug-print-function ${FUNCNAME} "$@" |
237 |
|
238 |
- _check_build_dir |
239 |
+ _cmake_check_build_dir |
240 |
pushd "${BUILD_DIR}" > /dev/null || die |
241 |
DESTDIR="${D}" ${CMAKE_MAKEFILE_GENERATOR} install "$@" || die "died running ${CMAKE_MAKEFILE_GENERATOR} install" |
242 |
popd > /dev/null || die |
243 |
@@ -742,7 +742,7 @@ enable_cmake-utils_src_install() { |
244 |
# @DESCRIPTION: |
245 |
# Apply ebuild and user patches. |
246 |
cmake-utils_src_prepare() { |
247 |
- _execute_optionally "src_prepare" "$@" |
248 |
+ _cmake_execute_optionally "src_prepare" "$@" |
249 |
} |
250 |
|
251 |
# @FUNCTION: cmake-utils_src_configure |
252 |
@@ -750,7 +750,7 @@ cmake-utils_src_prepare() { |
253 |
# General function for configuring with cmake. Default behaviour is to start an |
254 |
# out-of-source build. |
255 |
cmake-utils_src_configure() { |
256 |
- _execute_optionally "src_configure" "$@" |
257 |
+ _cmake_execute_optionally "src_configure" "$@" |
258 |
} |
259 |
|
260 |
# @FUNCTION: cmake-utils_src_compile |
261 |
@@ -758,25 +758,25 @@ cmake-utils_src_configure() { |
262 |
# General function for compiling with cmake. |
263 |
# Automatically detects the build type. All arguments are passed to emake. |
264 |
cmake-utils_src_compile() { |
265 |
- _execute_optionally "src_compile" "$@" |
266 |
+ _cmake_execute_optionally "src_compile" "$@" |
267 |
} |
268 |
|
269 |
# @FUNCTION: cmake-utils_src_test |
270 |
# @DESCRIPTION: |
271 |
# Function for testing the package. Automatically detects the build type. |
272 |
cmake-utils_src_test() { |
273 |
- _execute_optionally "src_test" "$@" |
274 |
+ _cmake_execute_optionally "src_test" "$@" |
275 |
} |
276 |
|
277 |
# @FUNCTION: cmake-utils_src_install |
278 |
# @DESCRIPTION: |
279 |
# Function for installing the package. Automatically detects the build type. |
280 |
cmake-utils_src_install() { |
281 |
- _execute_optionally "src_install" "$@" |
282 |
+ _cmake_execute_optionally "src_install" "$@" |
283 |
} |
284 |
|
285 |
# Optionally executes phases based on WANT_CMAKE variable/USE flag. |
286 |
-_execute_optionally() { |
287 |
+_cmake_execute_optionally() { |
288 |
local phase="$1" ; shift |
289 |
if [[ ${WANT_CMAKE} = always ]]; then |
290 |
enable_cmake-utils_${phase} "$@" |