| 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.23 2005/02/28 22:34:36 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 | export ABI=${ABI:-"default"} |
|
|
95 | export CFLAGS_default |
|
|
96 | export LDFLAGS_default |
|
|
97 | export CHOST_default=${CHOST_default:-${CHOST}} |
|
|
98 | export LIBDIR_default=${CONF_LIBDIR:-"lib"} |
|
|
99 | export CDEFINE_default="__unix__" |
|
|
100 | |
|
|
101 | # has_multilib_profile() |
|
|
102 | has_multilib_profile() { |
|
|
103 | [ -n "${MULTILIB_ABIS}" -a "${MULTILIB_ABIS}" != "${MULTILIB_ABIS/ /}" ] |
|
|
104 | } |
| 16 | |
105 | |
| 17 | # This function simply returns the desired lib directory. With portage |
106 | # This function simply returns the desired lib directory. With portage |
| 18 | # 2.0.51, we now have support for installing libraries to lib32/lib64 |
107 | # 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 |
108 | # 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 |
109 | # 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, |
115 | # 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 |
116 | # 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 |
117 | # depend on a newer version of portage (not yet released) which uses these |
| 29 | # over CONF_LIBDIR in econf, dolib, etc... |
118 | # over CONF_LIBDIR in econf, dolib, etc... |
| 30 | get_libdir() { |
119 | get_libdir() { |
| 31 | LIBDIR_TEST=$(type econf) |
120 | local CONF_LIBDIR |
| 32 | if [ ! -z "${CONF_LIBDIR_OVERRIDE}" ] ; then |
121 | if [ -n "${CONF_LIBDIR_OVERRIDE}" ] ; then |
| 33 | # if there is an override, we want to use that... always. |
122 | # if there is an override, we want to use that... always. |
| 34 | CONF_LIBDIR="${CONF_LIBDIR_OVERRIDE}" |
123 | echo ${CONF_LIBDIR_OVERRIDE} |
| 35 | elif [ -n "$(get_abi_LIBDIR)" ]; then |
124 | else |
| 36 | CONF_LIBDIR="$(get_abi_LIBDIR)" |
125 | 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 |
126 | fi |
| 41 | # and of course, default to lib if CONF_LIBDIR isnt set |
|
|
| 42 | echo ${CONF_LIBDIR:=lib} |
|
|
| 43 | unset LIBDIR_TEST |
|
|
| 44 | } |
127 | } |
| 45 | |
128 | |
| 46 | get_multilibdir() { |
129 | get_multilibdir() { |
| 47 | if [ -n "$(get_abi_LIBDIR)" ]; then |
130 | 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" |
131 | 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 |
132 | exit 1 |
| 50 | fi |
133 | fi |
| 51 | echo ${CONF_MULTILIBDIR:=lib32} |
134 | echo ${CONF_MULTILIBDIR:=lib32} |
| 52 | } |
135 | } |
| … | |
… | |
| 61 | # |
144 | # |
| 62 | # get_libdir_override lib64 |
145 | # get_libdir_override lib64 |
| 63 | # |
146 | # |
| 64 | # Travis Tilley <lv@gentoo.org> (31 Aug 2004) |
147 | # Travis Tilley <lv@gentoo.org> (31 Aug 2004) |
| 65 | get_libdir_override() { |
148 | get_libdir_override() { |
| 66 | if [ -n "$(get_abi_LIBDIR)" ]; then |
149 | 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" |
150 | 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 |
151 | exit 1 |
| 69 | fi |
152 | fi |
| 70 | CONF_LIBDIR="$1" |
153 | CONF_LIBDIR="$1" |
| 71 | CONF_LIBDIR_OVERRIDE="$1" |
154 | CONF_LIBDIR_OVERRIDE="$1" |
|
|
155 | LIBDIR_default="$1" |
| 72 | } |
156 | } |
| 73 | |
157 | |
| 74 | # get_abi_var <VAR> [<ABI>] |
158 | # get_abi_var <VAR> [<ABI>] |
| 75 | # returns the value of ${<VAR>_<ABI>} which should be set in make.defaults |
159 | # returns the value of ${<VAR>_<ABI>} which should be set in make.defaults |
| 76 | # |
160 | # |
| … | |
… | |
| 93 | elif [ -n "${ABI}" ]; then |
177 | elif [ -n "${ABI}" ]; then |
| 94 | abi=${ABI} |
178 | abi=${ABI} |
| 95 | elif [ -n "${DEFAULT_ABI}" ]; then |
179 | elif [ -n "${DEFAULT_ABI}" ]; then |
| 96 | abi=${DEFAULT_ABI} |
180 | abi=${DEFAULT_ABI} |
| 97 | else |
181 | else |
| 98 | return 1 |
182 | abi="default" |
| 99 | fi |
183 | fi |
| 100 | |
184 | |
| 101 | local var="${flag}_${abi}" |
185 | local var="${flag}_${abi}" |
| 102 | echo ${!var} |
186 | echo ${!var} |
| 103 | } |
187 | } |
| 104 | |
188 | |
| 105 | get_abi_CFLAGS() { get_abi_var CFLAGS ${@}; } |
189 | get_abi_CFLAGS() { get_abi_var CFLAGS "${@}"; } |
|
|
190 | get_abi_LDFLAGS() { get_abi_var LDFLAGS "${@}"; } |
|
|
191 | get_abi_CHOST() { get_abi_var CHOST "${@}"; } |
|
|
192 | get_abi_CTARGET_ALIASES() { get_abi_var CTARGET_ALIASES "${@}"; } |
| 106 | get_abi_CDEFINE() { get_abi_var CDEFINE ${@}; } |
193 | get_abi_CDEFINE() { get_abi_var CDEFINE "${@}"; } |
| 107 | get_abi_LIBDIR() { get_abi_var LIBDIR ${@}; } |
194 | get_abi_LIBDIR() { get_abi_var LIBDIR "${@}"; } |
| 108 | |
195 | |
| 109 | # Return a list of the ABIs we want to install for with |
196 | # Return a list of the ABIs we want to install for with |
| 110 | # the last one in the list being the default. |
197 | # the last one in the list being the default. |
| 111 | get_abi_order() { |
198 | get_install_abis() { |
| 112 | local order="" |
199 | local order="" |
| 113 | |
200 | |
| 114 | if [ -z "${MULTILIB_ABIS}" ]; then |
201 | if [ -z "${MULTILIB_ABIS}" ]; then |
| 115 | echo "NOMULTILIB" |
202 | echo "default" |
| 116 | return 1 |
203 | return 0 |
| 117 | fi |
204 | fi |
| 118 | |
205 | |
| 119 | if hasq multilib-pkg-force ${RESTRICT} || |
206 | if hasq multilib-pkg-force ${RESTRICT} || |
| 120 | { hasq multilib-pkg ${FEATURES} && hasq multilib-pkg ${RESTRICT}; }; then |
207 | { hasq multilib-pkg ${FEATURES} && hasq multilib-pkg ${RESTRICT}; }; then |
| 121 | for x in ${MULTILIB_ABIS}; do |
208 | for x in ${MULTILIB_ABIS}; do |
| … | |
… | |
| 144 | |
231 | |
| 145 | echo ${order} |
232 | echo ${order} |
| 146 | return 0 |
233 | return 0 |
| 147 | } |
234 | } |
| 148 | |
235 | |
|
|
236 | # Return a list of the ABIs supported by this profile. |
|
|
237 | # the last one in the list being the default. |
|
|
238 | get_all_abis() { |
|
|
239 | local order="" |
|
|
240 | |
|
|
241 | if [ -z "${MULTILIB_ABIS}" ]; then |
|
|
242 | echo "default" |
|
|
243 | return 0 |
|
|
244 | fi |
|
|
245 | |
|
|
246 | for x in ${MULTILIB_ABIS}; do |
|
|
247 | if [ "${x}" != "${DEFAULT_ABI}" ]; then |
|
|
248 | order="${order:+${order }}${x}" |
|
|
249 | fi |
|
|
250 | done |
|
|
251 | order="${order:+${order} }${DEFAULT_ABI}" |
|
|
252 | |
|
|
253 | echo ${order} |
|
|
254 | return 0 |
|
|
255 | } |
|
|
256 | |
| 149 | # get_all_libdir() |
257 | # get_all_libdirs() |
| 150 | # Returns a list of all the libdirs used by this profile. This includes |
258 | # Returns a list of all the libdirs used by this profile. This includes |
| 151 | # those that might not be touched by the current ebuild. |
259 | # those that might not be touched by the current ebuild. |
| 152 | get_all_libdirs() { |
260 | get_all_libdirs() { |
| 153 | local libdirs="lib" |
261 | local libdirs="lib" |
| 154 | local abi |
262 | local abi |
| 155 | local dir |
263 | local dir |
| 156 | |
264 | |
| 157 | if [ -n "${MULTILIB_ABIS}" ]; then |
265 | if has_multilib_profile; then |
| 158 | for abi in ${MULTILIB_ABIS}; do |
266 | for abi in ${MULTILIB_ABIS}; do |
| 159 | [ "$(get_abi_LIBDIR ${abi})" != "lib" ] && libdirs="${libdirs} $(get_abi_LIBDIR ${abi})" |
267 | [ "$(get_abi_LIBDIR ${abi})" != "lib" ] && libdirs="${libdirs} $(get_abi_LIBDIR ${abi})" |
| 160 | done |
268 | done |
| 161 | elif [ -n "${CONF_LIBDIR}" ]; then |
269 | elif [ -n "${CONF_LIBDIR}" ]; then |
| 162 | for dir in ${CONF_LIBDIR} ${CONF_MULTILIBDIR:=lib32}; do |
270 | for dir in ${CONF_LIBDIR} ${CONF_MULTILIBDIR:-lib32}; do |
| 163 | [ "${dir}" != "lib" ] && libdirs="${libdirs} ${dir}" |
271 | [ "${dir}" != "lib" ] && libdirs="${libdirs} ${dir}" |
| 164 | done |
272 | done |
| 165 | fi |
273 | fi |
| 166 | |
274 | |
| 167 | echo "${libdirs}" |
275 | echo "${libdirs}" |
| … | |
… | |
| 169 | |
277 | |
| 170 | # Return true if ${ABI} is the last ABI on our list (or if we're not |
278 | # 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 |
279 | # 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} |
280 | # if we're in the last (or only) run through src_{unpack,compile,install} |
| 173 | is_final_abi() { |
281 | is_final_abi() { |
| 174 | [ -z "${ABI}" ] && return 0 |
282 | has_multilib_profile || return 0 |
| 175 | local ALL_ABIS=$(get_abi_order) |
283 | local ALL_ABIS=$(get_install_abis) |
| 176 | local LAST_ABI=${ALL_ABIS/* /} |
284 | local LAST_ABI=${ALL_ABIS/* /} |
| 177 | [ "${LAST_ABI}" = "${ABI}" ] |
285 | [[ "${LAST_ABI}" == "${ABI}" ]] |
| 178 | } |
286 | } |
| 179 | |
287 | |
| 180 | # echo the number of ABIs we will be installing for |
288 | # echo the number of ABIs we will be installing for |
| 181 | number_abis() { |
289 | number_abis() { |
| 182 | get_abi_order | wc -w |
290 | get_install_abis | wc -w |
|
|
291 | } |
|
|
292 | |
|
|
293 | # get_ml_incdir [<include dir> [<ABI>]] |
|
|
294 | # include dir defaults to /usr/include |
|
|
295 | # ABI defaults to ${ABI} or ${DEFAULT_ABI} |
|
|
296 | get_ml_incdir() { |
|
|
297 | local dir=/usr/include |
|
|
298 | |
|
|
299 | if [[ ${#} -gt 0 ]]; then |
|
|
300 | incdir=${1} |
|
|
301 | shift |
|
|
302 | fi |
|
|
303 | |
|
|
304 | if [[ -z "${MULTILIB_ABIS}" ]]; then |
|
|
305 | echo ${incdir} |
|
|
306 | return 0 |
|
|
307 | fi |
|
|
308 | |
|
|
309 | local abi=${ABI:-${DEFAULT_ABI}} |
|
|
310 | if [[ ${#} -gt 0 ]]; then |
|
|
311 | abi=${1} |
|
|
312 | shift |
|
|
313 | fi |
|
|
314 | |
|
|
315 | if [[ -d "${dir}/gentoo-multilib/${abi}" ]]; then |
|
|
316 | echo ${dir}/gentoo-multilib/${abi} |
|
|
317 | else |
|
|
318 | echo ${dir} |
|
|
319 | fi |
| 183 | } |
320 | } |
| 184 | |
321 | |
| 185 | # prep_ml_includes: |
322 | # prep_ml_includes: |
| 186 | # |
323 | # |
| 187 | # Some includes (include/asm, glibc, etc) are ABI dependent. In this case, |
324 | # Some includes (include/asm, glibc, etc) are ABI dependent. In this case, |
| … | |
… | |
| 196 | # ... |
333 | # ... |
| 197 | # prep_ml_includes /usr/qt/3/include |
334 | # prep_ml_includes /usr/qt/3/include |
| 198 | # } |
335 | # } |
| 199 | |
336 | |
| 200 | prep_ml_includes() { |
337 | 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 |
338 | if [ $(number_abis) -gt 1 ]; then |
| 209 | local dir |
339 | local dir |
|
|
340 | local dirs |
|
|
341 | local base |
|
|
342 | |
|
|
343 | if [ ${#} -eq 0 ]; then |
|
|
344 | dirs="/usr/include" |
|
|
345 | else |
|
|
346 | dirs="${@}" |
|
|
347 | fi |
|
|
348 | |
| 210 | for dir in ${dirs}; do |
349 | for dir in ${dirs}; do |
|
|
350 | base=${T}/gentoo-multilib/${dir}/gentoo-multilib |
|
|
351 | mkdir -p ${base} |
|
|
352 | [ -d ${base}/${ABI} ] && rm -rf ${base}/${ABI} |
| 211 | mv ${D}/${dir} ${D}/${dir}.${ABI} |
353 | mv ${D}/${dir} ${base}/${ABI} |
| 212 | done |
354 | done |
| 213 | |
355 | |
| 214 | if is_final_abi; then |
356 | if is_final_abi; then |
|
|
357 | base=${T}/gentoo-multilib |
|
|
358 | pushd ${base} |
|
|
359 | find . | tar -c -T - -f - | tar -x --no-same-owner -f - -C ${D} |
|
|
360 | popd |
|
|
361 | |
| 215 | for dir in ${dirs}; do |
362 | for dir in ${dirs}; do |
| 216 | local args="${dir}" |
363 | local args=${dir} |
| 217 | local abi |
364 | local abi |
| 218 | for abi in $(get_abi_order); do |
365 | for abi in $(get_install_abis); do |
| 219 | args="${args} $(get_abi_CDEFINE ${abi}):${dir}.${abi}" |
366 | args="${args} $(get_abi_CDEFINE ${abi}):${dir}/gentoo-multilib/${abi}" |
| 220 | done |
367 | done |
| 221 | create_ml_includes ${args} |
368 | create_ml_includes ${args} |
| 222 | done |
369 | done |
| 223 | fi |
370 | fi |
| 224 | fi |
371 | fi |
| … | |
… | |
| 245 | local file |
392 | local file |
| 246 | for file in $(create_ml_includes-allfiles ${basedirs}); do |
393 | for file in $(create_ml_includes-allfiles ${basedirs}); do |
| 247 | local name="$(echo $file | tr a-z A-Z | sed 's:[^A-Z]:_:g')" |
394 | local name="$(echo $file | tr a-z A-Z | sed 's:[^A-Z]:_:g')" |
| 248 | { |
395 | { |
| 249 | echo "/* Common header file autogenerated by create_ml_includes in multilib.eclass */" |
396 | 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 | |
397 | |
| 254 | local dir |
398 | local dir |
| 255 | for dir in ${basedirs}; do |
399 | for dir in ${basedirs}; do |
| 256 | if [ -f "${D}/${dir}/${file}" ]; then |
400 | if [ -f "${D}/${dir}/${file}" ]; then |
| 257 | echo "#ifdef $(create_ml_includes-sym_for_dir ${dir} ${mlinfo})" |
401 | local sym=$(create_ml_includes-sym_for_dir ${dir} ${mlinfo}) |
|
|
402 | if [[ ${sym::1} == "!" ]]; then |
|
|
403 | echo "#ifndef ${sym:1}" |
|
|
404 | else |
|
|
405 | echo "#ifdef ${sym}" |
|
|
406 | fi |
| 258 | echo "#include \"$(create_ml_includes-relative_between ${dest}/$(dirname ${file}) ${dir}/${file})\"" |
407 | echo "#include \"$(create_ml_includes-relative_between ${dest}/$(dirname ${file}) ${dir}/${file})\"" |
| 259 | echo "#endif /* $(create_ml_includes-sym_for_dir ${dir} ${mlinfo}) */" |
408 | echo "#endif /* ${sym} */" |
| 260 | echo "" |
409 | echo "" |
| 261 | fi |
410 | fi |
| 262 | done |
411 | done |
| 263 | |
412 | |
| 264 | #echo "#endif /* __CREATE_ML_INCLUDES_STUB_${name}__ */" |
413 | #echo "#endif /* __CREATE_ML_INCLUDES_STUB_${name}__ */" |
| … | |
… | |
| 294 | |
443 | |
| 295 | # Helper function for create_ml_includes |
444 | # Helper function for create_ml_includes |
| 296 | create_ml_includes-tidy_path() { |
445 | create_ml_includes-tidy_path() { |
| 297 | local removed="${1}" |
446 | local removed="${1}" |
| 298 | |
447 | |
| 299 | if [ -n "${1}" ]; then |
448 | if [ -n "${removed}" ]; then |
| 300 | # Remove multiple slashes |
449 | # Remove multiple slashes |
| 301 | while [ "${removed}" != "${removed/\/\//\/}" ]; do |
450 | while [ "${removed}" != "${removed/\/\//\/}" ]; do |
| 302 | removed=${removed/\/\//\/} |
451 | removed=${removed/\/\//\/} |
| 303 | done |
452 | done |
| 304 | |
453 | |
| … | |
… | |
| 307 | removed=${removed//\/.\//\/} |
456 | removed=${removed//\/.\//\/} |
| 308 | done |
457 | done |
| 309 | [ "${removed##*/}" = "." ] && removed=${removed%/*} |
458 | [ "${removed##*/}" = "." ] && removed=${removed%/*} |
| 310 | |
459 | |
| 311 | # Removed .. directories |
460 | # Removed .. directories |
| 312 | # I wonder if there's a non-trivial bashism for this one... |
461 | while [ "${removed}" != "${removed//\/..\/}" ]; do |
| 313 | while [ "${removed}" != "$(echo ${removed} | sed -e 's:[^/]*/\.\./::')" ]; do |
462 | local p1="${removed%%\/..\/*}" |
| 314 | removed=$(echo ${removed} | sed -e 's:[^/]*/\.\./::') |
463 | local p2="${removed#*\/..\/}" |
|
|
464 | |
|
|
465 | removed="${p1%\/*}/${p2}" |
| 315 | done |
466 | done |
| 316 | |
467 | |
| 317 | # Remove trailing .. |
468 | # Remove trailing .. |
| 318 | removed=$(echo ${removed} | sed -e 's:/[^/]*/\.\.$::') |
469 | [ "${removed##*/}" = ".." ] && removed=${removed%/*/*} |
| 319 | |
470 | |
| 320 | # Remove trailing / |
471 | # Remove trailing / |
| 321 | [ "${removed##*/}" = "" ] && removed=${removed%/*} |
472 | [ "${removed##*/}" = "" ] && removed=${removed%/*} |
| 322 | |
473 | |
| 323 | echo ${removed} |
474 | echo ${removed} |
| … | |
… | |
| 353 | |
504 | |
| 354 | # Helper function for create_ml_includes |
505 | # Helper function for create_ml_includes |
| 355 | create_ml_includes-allfiles() { |
506 | create_ml_includes-allfiles() { |
| 356 | local basedirs=${@} |
507 | local basedirs=${@} |
| 357 | |
508 | |
| 358 | local files |
509 | local basedir |
| 359 | for basedir in ${basedirs}; do |
510 | for basedir in ${basedirs}; do |
| 360 | local file |
511 | local file |
| 361 | for file in $(find ${D}/${basedir} -type f); do |
512 | for file in $(find ${D}/${basedir} -type f); do |
| 362 | echo ${file/${D}\/${basedir}\//} |
513 | echo ${file/${D}\/${basedir}\//} |
| 363 | done |
514 | done |
| … | |
… | |
| 373 | if [ "${dir}" = "${data/*:/}" ]; then |
524 | if [ "${dir}" = "${data/*:/}" ]; then |
| 374 | echo ${data/:*/} |
525 | echo ${data/:*/} |
| 375 | return 0 |
526 | return 0 |
| 376 | fi |
527 | fi |
| 377 | done |
528 | done |
| 378 | echo "Should be here -- create_ml_includes-sym_for_dir ${1} ${@}" |
529 | echo "Shouldn't be here -- create_ml_includes-sym_for_dir ${1} ${@}" |
| 379 | # exit because we'll likely be called from a subshell |
530 | # exit because we'll likely be called from a subshell |
| 380 | exit 1 |
531 | exit 1 |
| 381 | } |
532 | } |