| 1 | # Copyright 1999-2004 Gentoo Foundation |
1 | # Copyright 1999-2004 Gentoo Foundation |
| 2 | # Distributed under the terms of the GNU General Public License v2 |
2 | # Distributed under the terms of the GNU General Public License v2 |
| 3 | # $Header: /var/cvsroot/gentoo-x86/eclass/multilib.eclass,v 1.5 2005/01/12 22:39:44 eradicator Exp $ |
3 | # $Header: /var/cvsroot/gentoo-x86/eclass/multilib.eclass,v 1.25 2005/03/08 11:55:55 eradicator Exp $ |
| 4 | # |
4 | # |
| 5 | # Author: Jeremy Huddleston <eradicator@gentoo.org> |
5 | # Author: Jeremy Huddleston <eradicator@gentoo.org> |
| 6 | # |
6 | # |
| 7 | # This eclass is for all functions pertaining to handling multilib. |
7 | # This eclass is for all functions pertaining to handling multilib. |
| 8 | # configurations. |
8 | # configurations. |
| … | |
… | |
| 10 | ECLASS=multilib |
10 | ECLASS=multilib |
| 11 | INHERITED="$INHERITED $ECLASS" |
11 | INHERITED="$INHERITED $ECLASS" |
| 12 | |
12 | |
| 13 | DESCRIPTION="Based on the ${ECLASS} eclass" |
13 | DESCRIPTION="Based on the ${ECLASS} eclass" |
| 14 | |
14 | |
| 15 | DEPEND="!build? ( sys-apps/sed sys-apps/findutils sys-apps/coreutils )" |
15 | # has_multilib_profile: |
|
|
16 | # Return true if the current profile is a multilib profile and lists more than |
|
|
17 | # one abi in ${MULTILIB_ABIS}. You might want to use this like |
|
|
18 | # 'use multilib || has_multilib_profile' until all profiles utilizing the |
|
|
19 | # 'multilib' use flag are removed from portage |
|
|
20 | |
|
|
21 | # is_final_abi: |
|
|
22 | # Return true if ${ABI} is the final abi to be installed (and thus we are |
|
|
23 | # on our last run through a src_* function. |
|
|
24 | |
|
|
25 | # number_abis: |
|
|
26 | # echo the number of ABIs we will be installing for |
|
|
27 | |
|
|
28 | # get_install_abis: |
|
|
29 | # Return a list of the ABIs we want to install for with |
|
|
30 | # the last one in the list being the default. |
|
|
31 | |
|
|
32 | # get_all_abis: |
|
|
33 | # Return a list of the ABIs supported by this profile. |
|
|
34 | # the last one in the list being the default. |
|
|
35 | |
|
|
36 | # get_all_libdirs: |
|
|
37 | # Returns a list of all the libdirs used by this profile. This includes |
|
|
38 | # those that might not be touched by the current ebuild and always includes |
|
|
39 | # "lib". |
|
|
40 | |
|
|
41 | # get_libdir: |
|
|
42 | # Returns the libdir for the selected ABI. This is backwards compatible |
|
|
43 | # and simply calls get_abi_LIBDIR() on newer profiles. You should use this |
|
|
44 | # to determine where to install shared objects (ex: /usr/$(get_libdir)) |
|
|
45 | |
|
|
46 | # get_abi_var <VAR> [<ABI>]: |
|
|
47 | # returns the value of ${<VAR>_<ABI>} which should be set in make.defaults |
|
|
48 | # |
|
|
49 | # get_abi_CFLAGS: |
|
|
50 | # get_abi_CDEFINE: |
|
|
51 | # get_abi_LIBDIR: |
|
|
52 | # Aliases for 'get_abi_var CFLAGS', etc. |
|
|
53 | |
|
|
54 | # get_ml_incdir [<include dir> [<ABI>]] |
|
|
55 | # include dir defaults to /usr/include |
|
|
56 | # ABI defaults to ${ABI} or ${DEFAULT_ABI} |
|
|
57 | # |
|
|
58 | # If a multilib include dir is associated with the passed include dir, then |
|
|
59 | # we return it, otherwise, we just echo back the include dir. This is |
|
|
60 | # neccessary when a built script greps header files rather than testing them |
|
|
61 | # via #include (like perl) to figure out features. |
|
|
62 | |
|
|
63 | # prep_ml_includes: |
|
|
64 | # Some includes (include/asm, glibc, etc) are ABI dependent. In this case, |
|
|
65 | # We can install them in different locations for each ABI and create a common |
|
|
66 | # header which includes the right one based on CDEFINE_${ABI}. If your |
|
|
67 | # package installs ABI-specific headers, just add 'prep_ml_includes' to the |
|
|
68 | # end of your src_install(). It takes a list of directories that include |
|
|
69 | # files are installed in (default is /usr/include if none are passed). |
|
|
70 | # |
|
|
71 | # Example: |
|
|
72 | # src_install() { |
|
|
73 | # ... |
|
|
74 | # prep_ml_includes /usr/qt/3/include |
|
|
75 | # } |
|
|
76 | |
|
|
77 | # create_ml_includes <include dir> <symbol 1>:<dir 1> [<symbol 2>:<dir 2> ...] |
|
|
78 | # If you need more control than prep_ml_includes can offer (like linux-headers |
|
|
79 | # for the asm-* dirs, then use create_ml_includes. The firs argument is the |
|
|
80 | # common dir. The remaining args are of the form <symbol>:<dir> where |
|
|
81 | # <symbol> is what is put in the #ifdef for choosing that dir. |
|
|
82 | # |
|
|
83 | # Ideas for this code came from debian's sparc-linux headers package. |
|
|
84 | # |
|
|
85 | # Example: |
|
|
86 | # create_ml_includes /usr/include/asm __sparc__:/usr/include/asm-sparc __sparc64__:/usr/include/asm-sparc64 |
|
|
87 | # create_ml_includes /usr/include/asm __i386__:/usr/include/asm-i386 __x86_64__:/usr/include/asm-x86_64 |
|
|
88 | |
|
|
89 | ### END DOCUMENTATION ### |
|
|
90 | |
|
|
91 | # Defaults: |
|
|
92 | export MULTILIB_ABIS=${MULTILIB_ABIS:-"default"} |
|
|
93 | export DEFAULT_ABI=${DEFAULT_ABI:-"default"} |
|
|
94 | # This causes econf to set --libdir=/usr/lib where it didn't before |
|
|
95 | #export ABI=${ABI:-"default"} |
|
|
96 | export CFLAGS_default |
|
|
97 | export LDFLAGS_default |
|
|
98 | export CHOST_default=${CHOST_default:-${CHOST}} |
|
|
99 | export LIBDIR_default=${CONF_LIBDIR:-"lib"} |
|
|
100 | export CDEFINE_default="__unix__" |
|
|
101 | |
|
|
102 | # has_multilib_profile() |
|
|
103 | has_multilib_profile() { |
|
|
104 | [ -n "${MULTILIB_ABIS}" -a "${MULTILIB_ABIS}" != "${MULTILIB_ABIS/ /}" ] |
|
|
105 | } |
| 16 | |
106 | |
| 17 | # This function simply returns the desired lib directory. With portage |
107 | # This function simply returns the desired lib directory. With portage |
| 18 | # 2.0.51, we now have support for installing libraries to lib32/lib64 |
108 | # 2.0.51, we now have support for installing libraries to lib32/lib64 |
| 19 | # to accomidate the needs of multilib systems. It's no longer a good idea |
109 | # to accomidate the needs of multilib systems. It's no longer a good idea |
| 20 | # to assume all libraries will end up in lib. Replace any (sane) instances |
110 | # to assume all libraries will end up in lib. Replace any (sane) instances |
| … | |
… | |
| 26 | # Added support for ${ABI} and ${DEFAULT_ABI}. If they're both not set, |
116 | # Added support for ${ABI} and ${DEFAULT_ABI}. If they're both not set, |
| 27 | # fall back on old behavior. Any profile that has these set should also |
117 | # fall back on old behavior. Any profile that has these set should also |
| 28 | # depend on a newer version of portage (not yet released) which uses these |
118 | # depend on a newer version of portage (not yet released) which uses these |
| 29 | # over CONF_LIBDIR in econf, dolib, etc... |
119 | # over CONF_LIBDIR in econf, dolib, etc... |
| 30 | get_libdir() { |
120 | get_libdir() { |
| 31 | LIBDIR_TEST=$(type econf) |
121 | local CONF_LIBDIR |
| 32 | if [ ! -z "${CONF_LIBDIR_OVERRIDE}" ] ; then |
122 | if [ -n "${CONF_LIBDIR_OVERRIDE}" ] ; then |
| 33 | # if there is an override, we want to use that... always. |
123 | # if there is an override, we want to use that... always. |
| 34 | CONF_LIBDIR="${CONF_LIBDIR_OVERRIDE}" |
124 | echo ${CONF_LIBDIR_OVERRIDE} |
| 35 | elif [ -n "$(get_abi_LIBDIR)" ]; then |
125 | else |
| 36 | CONF_LIBDIR="$(get_abi_LIBDIR)" |
126 | get_abi_LIBDIR |
| 37 | elif [ "${LIBDIR_TEST/CONF_LIBDIR}" == "${LIBDIR_TEST}" ]; then # we don't have CONF_LIBDIR support |
|
|
| 38 | # will be <portage-2.0.51_pre20 |
|
|
| 39 | CONF_LIBDIR="lib" |
|
|
| 40 | fi |
127 | fi |
| 41 | # and of course, default to lib if CONF_LIBDIR isnt set |
|
|
| 42 | echo ${CONF_LIBDIR:=lib} |
|
|
| 43 | unset LIBDIR_TEST |
|
|
| 44 | } |
128 | } |
| 45 | |
129 | |
| 46 | get_multilibdir() { |
130 | get_multilibdir() { |
| 47 | if [ -n "$(get_abi_LIBDIR)" ]; then |
131 | if has_multilib_profile; then |
| 48 | eerror "get_multilibdir called, but it shouldn't be needed with the new multilib approach. Please file a bug at http://bugs.gentoo.org and assign it to eradicator@gentoo.org" |
132 | eerror "get_multilibdir called, but it shouldn't be needed with the new multilib approach. Please file a bug at http://bugs.gentoo.org and assign it to eradicator@gentoo.org" |
| 49 | exit 1 |
133 | exit 1 |
| 50 | fi |
134 | fi |
| 51 | echo ${CONF_MULTILIBDIR:=lib32} |
135 | echo ${CONF_MULTILIBDIR:=lib32} |
| 52 | } |
136 | } |
| … | |
… | |
| 61 | # |
145 | # |
| 62 | # get_libdir_override lib64 |
146 | # get_libdir_override lib64 |
| 63 | # |
147 | # |
| 64 | # Travis Tilley <lv@gentoo.org> (31 Aug 2004) |
148 | # Travis Tilley <lv@gentoo.org> (31 Aug 2004) |
| 65 | get_libdir_override() { |
149 | get_libdir_override() { |
| 66 | if [ -n "$(get_abi_LIBDIR)" ]; then |
150 | if has_multilib_profile; then |
| 67 | eerror "get_libdir_override called, but it shouldn't be needed with the new multilib approach. Please file a bug at http://bugs.gentoo.org and assign it to eradicator@gentoo.org" |
151 | eerror "get_libdir_override called, but it shouldn't be needed with the new multilib approach. Please file a bug at http://bugs.gentoo.org and assign it to eradicator@gentoo.org" |
| 68 | exit 1 |
152 | exit 1 |
| 69 | fi |
153 | fi |
| 70 | CONF_LIBDIR="$1" |
154 | CONF_LIBDIR="$1" |
| 71 | CONF_LIBDIR_OVERRIDE="$1" |
155 | CONF_LIBDIR_OVERRIDE="$1" |
|
|
156 | LIBDIR_default="$1" |
| 72 | } |
157 | } |
| 73 | |
158 | |
| 74 | # get_abi_var <VAR> [<ABI>] |
159 | # get_abi_var <VAR> [<ABI>] |
| 75 | # returns the value of ${<VAR>_<ABI>} which should be set in make.defaults |
160 | # returns the value of ${<VAR>_<ABI>} which should be set in make.defaults |
| 76 | # |
161 | # |
| … | |
… | |
| 88 | get_abi_var() { |
173 | get_abi_var() { |
| 89 | local flag=${1} |
174 | local flag=${1} |
| 90 | local abi |
175 | local abi |
| 91 | if [ $# -gt 1 ]; then |
176 | if [ $# -gt 1 ]; then |
| 92 | abi=${2} |
177 | abi=${2} |
| 93 | elif [ -n "${ABI}" ]; then |
|
|
| 94 | abi=${ABI} |
|
|
| 95 | elif [ -n "${DEFAULT_ABI}" ]; then |
178 | elif [ -n "${DEFAULT_ABI}" ]; then |
| 96 | abi=${DEFAULT_ABI} |
179 | abi=${DEFAULT_ABI} |
| 97 | else |
180 | else |
| 98 | return 1 |
181 | abi="default" |
| 99 | fi |
182 | fi |
| 100 | |
183 | |
| 101 | local var="${flag}_${abi}" |
184 | local var="${flag}_${abi}" |
| 102 | echo ${!var} |
185 | echo ${!var} |
| 103 | } |
186 | } |
| 104 | |
187 | |
| 105 | get_abi_CFLAGS() { get_abi_var CFLAGS ${@}; } |
188 | get_abi_CFLAGS() { get_abi_var CFLAGS "${@}"; } |
|
|
189 | get_abi_LDFLAGS() { get_abi_var LDFLAGS "${@}"; } |
|
|
190 | get_abi_CHOST() { get_abi_var CHOST "${@}"; } |
|
|
191 | get_abi_FAKE_TARGETS() { get_abi_var FAKE_TARGETS "${@}"; } |
| 106 | get_abi_CDEFINE() { get_abi_var CDEFINE ${@}; } |
192 | get_abi_CDEFINE() { get_abi_var CDEFINE "${@}"; } |
| 107 | get_abi_LIBDIR() { get_abi_var LIBDIR ${@}; } |
193 | get_abi_LIBDIR() { get_abi_var LIBDIR "${@}"; } |
| 108 | |
194 | |
| 109 | # Return a list of the ABIs we want to install for with |
195 | # Return a list of the ABIs we want to install for with |
| 110 | # the last one in the list being the default. |
196 | # the last one in the list being the default. |
| 111 | get_abi_order() { |
197 | get_install_abis() { |
| 112 | local order="" |
198 | local order="" |
| 113 | |
199 | |
| 114 | if [ -z "${MULTILIB_ABIS}" ]; then |
200 | if [ -z "${MULTILIB_ABIS}" ]; then |
| 115 | echo "NOMULTILIB" |
201 | echo "default" |
| 116 | return 1 |
202 | return 0 |
| 117 | fi |
203 | fi |
| 118 | |
204 | |
| 119 | if hasq multilib-pkg-force ${RESTRICT} || |
205 | if hasq multilib-pkg-force ${RESTRICT} || |
| 120 | { hasq multilib-pkg ${FEATURES} && hasq multilib-pkg ${RESTRICT}; }; then |
206 | { hasq multilib-pkg ${FEATURES} && hasq multilib-pkg ${RESTRICT}; }; then |
| 121 | for x in ${MULTILIB_ABIS}; do |
207 | for x in ${MULTILIB_ABIS}; do |
| … | |
… | |
| 144 | |
230 | |
| 145 | echo ${order} |
231 | echo ${order} |
| 146 | return 0 |
232 | return 0 |
| 147 | } |
233 | } |
| 148 | |
234 | |
|
|
235 | # Return a list of the ABIs supported by this profile. |
|
|
236 | # the last one in the list being the default. |
|
|
237 | get_all_abis() { |
|
|
238 | local order="" |
|
|
239 | |
|
|
240 | if [ -z "${MULTILIB_ABIS}" ]; then |
|
|
241 | echo "default" |
|
|
242 | return 0 |
|
|
243 | fi |
|
|
244 | |
|
|
245 | for x in ${MULTILIB_ABIS}; do |
|
|
246 | if [ "${x}" != "${DEFAULT_ABI}" ]; then |
|
|
247 | order="${order:+${order }}${x}" |
|
|
248 | fi |
|
|
249 | done |
|
|
250 | order="${order:+${order} }${DEFAULT_ABI}" |
|
|
251 | |
|
|
252 | echo ${order} |
|
|
253 | return 0 |
|
|
254 | } |
|
|
255 | |
| 149 | # get_all_libdir() |
256 | # get_all_libdirs() |
| 150 | # Returns a list of all the libdirs used by this profile. This includes |
257 | # Returns a list of all the libdirs used by this profile. This includes |
| 151 | # those that might not be touched by the current ebuild. |
258 | # those that might not be touched by the current ebuild. |
| 152 | get_all_libdirs() { |
259 | get_all_libdirs() { |
| 153 | local libdirs="lib" |
260 | local libdirs="lib" |
| 154 | local abi |
261 | local abi |
| 155 | local dir |
262 | local dir |
| 156 | |
263 | |
| 157 | if [ -n "${MULTILIB_ABIS}" ]; then |
264 | if has_multilib_profile; then |
| 158 | for abi in ${MULTILIB_ABIS}; do |
265 | for abi in ${MULTILIB_ABIS}; do |
| 159 | [ "$(get_abi_LIBDIR ${abi})" != "lib" ] && libdirs="${libdirs} $(get_abi_LIBDIR ${abi})" |
266 | [ "$(get_abi_LIBDIR ${abi})" != "lib" ] && libdirs="${libdirs} $(get_abi_LIBDIR ${abi})" |
| 160 | done |
267 | done |
| 161 | elif [ -n "${CONF_LIBDIR}" ]; then |
268 | elif [ -n "${CONF_LIBDIR}" ]; then |
| 162 | for dir in ${CONF_LIBDIR} ${CONF_MULTILIBDIR:=lib32}; do |
269 | for dir in ${CONF_LIBDIR} ${CONF_MULTILIBDIR:-lib32}; do |
| 163 | [ "${dir}" != "lib" ] && libdirs="${libdirs} ${dir}" |
270 | [ "${dir}" != "lib" ] && libdirs="${libdirs} ${dir}" |
| 164 | done |
271 | done |
| 165 | fi |
272 | fi |
| 166 | |
273 | |
| 167 | echo "${libdirs}" |
274 | echo "${libdirs}" |
| … | |
… | |
| 169 | |
276 | |
| 170 | # Return true if ${ABI} is the last ABI on our list (or if we're not |
277 | # Return true if ${ABI} is the last ABI on our list (or if we're not |
| 171 | # using the new multilib configuration. This can be used to determine |
278 | # using the new multilib configuration. This can be used to determine |
| 172 | # if we're in the last (or only) run through src_{unpack,compile,install} |
279 | # if we're in the last (or only) run through src_{unpack,compile,install} |
| 173 | is_final_abi() { |
280 | is_final_abi() { |
| 174 | [ -z "${ABI}" ] && return 0 |
281 | has_multilib_profile || return 0 |
| 175 | local ALL_ABIS=$(get_abi_order) |
282 | local ALL_ABIS=$(get_install_abis) |
| 176 | local LAST_ABI=${ALL_ABIS/* /} |
283 | local LAST_ABI=${ALL_ABIS/* /} |
| 177 | [ "${LAST_ABI}" = "${ABI}" ] |
284 | [[ ${LAST_ABI} == ${ABI} ]] |
| 178 | } |
285 | } |
| 179 | |
286 | |
| 180 | # echo the number of ABIs we will be installing for |
287 | # echo the number of ABIs we will be installing for |
| 181 | number_abis() { |
288 | number_abis() { |
| 182 | get_abi_order | wc -w |
289 | get_install_abis | wc -w |
|
|
290 | } |
|
|
291 | |
|
|
292 | # get_ml_incdir [<include dir> [<ABI>]] |
|
|
293 | # include dir defaults to /usr/include |
|
|
294 | # ABI defaults to ${ABI} or ${DEFAULT_ABI} |
|
|
295 | get_ml_incdir() { |
|
|
296 | local dir=/usr/include |
|
|
297 | |
|
|
298 | if [[ ${#} -gt 0 ]]; then |
|
|
299 | incdir=${1} |
|
|
300 | shift |
|
|
301 | fi |
|
|
302 | |
|
|
303 | if [[ -z "${MULTILIB_ABIS}" ]]; then |
|
|
304 | echo ${incdir} |
|
|
305 | return 0 |
|
|
306 | fi |
|
|
307 | |
|
|
308 | local abi=${ABI-${DEFAULT_ABI}} |
|
|
309 | if [[ ${#} -gt 0 ]]; then |
|
|
310 | abi=${1} |
|
|
311 | shift |
|
|
312 | fi |
|
|
313 | |
|
|
314 | if [[ -d "${dir}/gentoo-multilib/${abi}" ]]; then |
|
|
315 | echo ${dir}/gentoo-multilib/${abi} |
|
|
316 | else |
|
|
317 | echo ${dir} |
|
|
318 | fi |
| 183 | } |
319 | } |
| 184 | |
320 | |
| 185 | # prep_ml_includes: |
321 | # prep_ml_includes: |
| 186 | # |
322 | # |
| 187 | # Some includes (include/asm, glibc, etc) are ABI dependent. In this case, |
323 | # Some includes (include/asm, glibc, etc) are ABI dependent. In this case, |
| … | |
… | |
| 196 | # ... |
332 | # ... |
| 197 | # prep_ml_includes /usr/qt/3/include |
333 | # prep_ml_includes /usr/qt/3/include |
| 198 | # } |
334 | # } |
| 199 | |
335 | |
| 200 | prep_ml_includes() { |
336 | prep_ml_includes() { |
| 201 | local dirs |
|
|
| 202 | if [ ${#} -eq 0 ]; then |
|
|
| 203 | dirs="/usr/include" |
|
|
| 204 | else |
|
|
| 205 | dirs="${@}" |
|
|
| 206 | fi |
|
|
| 207 | |
|
|
| 208 | if [ $(number_abis) -gt 1 ]; then |
337 | if [ $(number_abis) -gt 1 ]; then |
| 209 | local dir |
338 | local dir |
|
|
339 | local dirs |
|
|
340 | local base |
|
|
341 | |
|
|
342 | if [ ${#} -eq 0 ]; then |
|
|
343 | dirs="/usr/include" |
|
|
344 | else |
|
|
345 | dirs="${@}" |
|
|
346 | fi |
|
|
347 | |
| 210 | for dir in ${dirs}; do |
348 | for dir in ${dirs}; do |
|
|
349 | base=${T}/gentoo-multilib/${dir}/gentoo-multilib |
|
|
350 | mkdir -p ${base} |
|
|
351 | [ -d ${base}/${ABI} ] && rm -rf ${base}/${ABI} |
| 211 | mv ${D}/${dir} ${D}/${dir}.${ABI} |
352 | mv ${D}/${dir} ${base}/${ABI} |
| 212 | done |
353 | done |
| 213 | |
354 | |
| 214 | if is_final_abi; then |
355 | if is_final_abi; then |
|
|
356 | base=${T}/gentoo-multilib |
|
|
357 | pushd ${base} |
|
|
358 | find . | tar -c -T - -f - | tar -x --no-same-owner -f - -C ${D} |
|
|
359 | popd |
|
|
360 | |
| 215 | for dir in ${dirs}; do |
361 | for dir in ${dirs}; do |
| 216 | local args="${dir}" |
362 | local args=${dir} |
| 217 | local abi |
363 | local abi |
| 218 | for abi in $(get_abi_order); do |
364 | for abi in $(get_install_abis); do |
| 219 | args="${args} $(get_abi_CDEFINE ${abi}):${dir}.${abi}" |
365 | args="${args} $(get_abi_CDEFINE ${abi}):${dir}/gentoo-multilib/${abi}" |
| 220 | done |
366 | done |
| 221 | create_ml_includes ${args} |
367 | create_ml_includes ${args} |
| 222 | done |
368 | done |
| 223 | fi |
369 | fi |
| 224 | fi |
370 | fi |
| … | |
… | |
| 245 | local file |
391 | local file |
| 246 | for file in $(create_ml_includes-allfiles ${basedirs}); do |
392 | for file in $(create_ml_includes-allfiles ${basedirs}); do |
| 247 | local name="$(echo $file | tr a-z A-Z | sed 's:[^A-Z]:_:g')" |
393 | local name="$(echo $file | tr a-z A-Z | sed 's:[^A-Z]:_:g')" |
| 248 | { |
394 | { |
| 249 | echo "/* Common header file autogenerated by create_ml_includes in multilib.eclass */" |
395 | echo "/* Common header file autogenerated by create_ml_includes in multilib.eclass */" |
| 250 | #echo "#ifndef __CREATE_ML_INCLUDES_STUB_${name}__" |
|
|
| 251 | #echo "#define __CREATE_ML_INCLUDES_STUB_${name}__" |
|
|
| 252 | #echo "" |
|
|
| 253 | |
396 | |
| 254 | local dir |
397 | local dir |
| 255 | for dir in ${basedirs}; do |
398 | for dir in ${basedirs}; do |
| 256 | if [ -f "${D}/${dir}/${file}" ]; then |
399 | if [ -f "${D}/${dir}/${file}" ]; then |
| 257 | echo "#ifdef $(create_ml_includes-sym_for_dir ${dir} ${mlinfo})" |
400 | local sym=$(create_ml_includes-sym_for_dir ${dir} ${mlinfo}) |
|
|
401 | if [[ ${sym::1} == "!" ]]; then |
|
|
402 | echo "#ifndef ${sym:1}" |
|
|
403 | else |
|
|
404 | echo "#ifdef ${sym}" |
|
|
405 | fi |
| 258 | echo "#include \"$(create_ml_includes-relative_between ${dest}/$(dirname ${file}) ${dir}/${file})\"" |
406 | echo "#include \"$(create_ml_includes-relative_between ${dest}/$(dirname ${file}) ${dir}/${file})\"" |
| 259 | echo "#endif /* $(create_ml_includes-sym_for_dir ${dir} ${mlinfo}) */" |
407 | echo "#endif /* ${sym} */" |
| 260 | echo "" |
408 | echo "" |
| 261 | fi |
409 | fi |
| 262 | done |
410 | done |
| 263 | |
411 | |
| 264 | #echo "#endif /* __CREATE_ML_INCLUDES_STUB_${name}__ */" |
412 | #echo "#endif /* __CREATE_ML_INCLUDES_STUB_${name}__ */" |
| … | |
… | |
| 294 | |
442 | |
| 295 | # Helper function for create_ml_includes |
443 | # Helper function for create_ml_includes |
| 296 | create_ml_includes-tidy_path() { |
444 | create_ml_includes-tidy_path() { |
| 297 | local removed="${1}" |
445 | local removed="${1}" |
| 298 | |
446 | |
| 299 | if [ -n "${1}" ]; then |
447 | if [ -n "${removed}" ]; then |
| 300 | # Remove multiple slashes |
448 | # Remove multiple slashes |
| 301 | while [ "${removed}" != "${removed/\/\//\/}" ]; do |
449 | while [ "${removed}" != "${removed/\/\//\/}" ]; do |
| 302 | removed=${removed/\/\//\/} |
450 | removed=${removed/\/\//\/} |
| 303 | done |
451 | done |
| 304 | |
452 | |
| … | |
… | |
| 307 | removed=${removed//\/.\//\/} |
455 | removed=${removed//\/.\//\/} |
| 308 | done |
456 | done |
| 309 | [ "${removed##*/}" = "." ] && removed=${removed%/*} |
457 | [ "${removed##*/}" = "." ] && removed=${removed%/*} |
| 310 | |
458 | |
| 311 | # Removed .. directories |
459 | # Removed .. directories |
| 312 | # I wonder if there's a non-trivial bashism for this one... |
460 | while [ "${removed}" != "${removed//\/..\/}" ]; do |
| 313 | while [ "${removed}" != "$(echo ${removed} | sed -e 's:[^/]*/\.\./::')" ]; do |
461 | local p1="${removed%%\/..\/*}" |
| 314 | removed=$(echo ${removed} | sed -e 's:[^/]*/\.\./::') |
462 | local p2="${removed#*\/..\/}" |
|
|
463 | |
|
|
464 | removed="${p1%\/*}/${p2}" |
| 315 | done |
465 | done |
| 316 | |
466 | |
| 317 | # Remove trailing .. |
467 | # Remove trailing .. |
| 318 | removed=$(echo ${removed} | sed -e 's:/[^/]*/\.\.$::') |
468 | [ "${removed##*/}" = ".." ] && removed=${removed%/*/*} |
| 319 | |
469 | |
| 320 | # Remove trailing / |
470 | # Remove trailing / |
| 321 | [ "${removed##*/}" = "" ] && removed=${removed%/*} |
471 | [ "${removed##*/}" = "" ] && removed=${removed%/*} |
| 322 | |
472 | |
| 323 | echo ${removed} |
473 | echo ${removed} |
| … | |
… | |
| 353 | |
503 | |
| 354 | # Helper function for create_ml_includes |
504 | # Helper function for create_ml_includes |
| 355 | create_ml_includes-allfiles() { |
505 | create_ml_includes-allfiles() { |
| 356 | local basedirs=${@} |
506 | local basedirs=${@} |
| 357 | |
507 | |
| 358 | local files |
508 | local basedir |
| 359 | for basedir in ${basedirs}; do |
509 | for basedir in ${basedirs}; do |
| 360 | local file |
510 | local file |
| 361 | for file in $(find ${D}/${basedir} -type f); do |
511 | for file in $(find ${D}/${basedir} -type f); do |
| 362 | echo ${file/${D}\/${basedir}\//} |
512 | echo ${file/${D}\/${basedir}\//} |
| 363 | done |
513 | done |
| … | |
… | |
| 373 | if [ "${dir}" = "${data/*:/}" ]; then |
523 | if [ "${dir}" = "${data/*:/}" ]; then |
| 374 | echo ${data/:*/} |
524 | echo ${data/:*/} |
| 375 | return 0 |
525 | return 0 |
| 376 | fi |
526 | fi |
| 377 | done |
527 | done |
| 378 | echo "Should be here -- create_ml_includes-sym_for_dir ${1} ${@}" |
528 | echo "Shouldn't be here -- create_ml_includes-sym_for_dir ${1} ${@}" |
| 379 | # exit because we'll likely be called from a subshell |
529 | # exit because we'll likely be called from a subshell |
| 380 | exit 1 |
530 | exit 1 |
| 381 | } |
531 | } |