/[gentoo-x86]/eclass/multilib.eclass
Gentoo

Diff of /eclass/multilib.eclass

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

Revision 1.1.1.1 Revision 1.8
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.1.1.1 2005/11/30 09:59:17 chriswhite Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/multilib.eclass,v 1.8 2005/01/13 19:30:41 vapier 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.
9 9
10ECLASS=multilib
11INHERITED="$INHERITED $ECLASS"
12
10DESCRIPTION="Based on the ${ECLASS} eclass" 13DESCRIPTION="Based on the ${ECLASS} eclass"
11
12# has_multilib_profile:
13# Return true if the current profile is a multilib profile and lists more than
14# one abi in ${MULTILIB_ABIS}. You might want to use this like
15# 'use multilib || has_multilib_profile' until all profiles utilizing the
16# 'multilib' use flag are removed from portage
17
18# is_final_abi:
19# Return true if ${ABI} is the final abi to be installed (and thus we are
20# on our last run through a src_* function.
21
22# number_abis:
23# echo the number of ABIs we will be installing for
24
25# get_install_abis:
26# Return a list of the ABIs we want to install for with
27# the last one in the list being the default.
28
29# get_all_abis:
30# Return a list of the ABIs supported by this profile.
31# the last one in the list being the default.
32
33# get_all_libdirs:
34# Returns a list of all the libdirs used by this profile. This includes
35# those that might not be touched by the current ebuild and always includes
36# "lib".
37
38# get_libdir:
39# Returns the libdir for the selected ABI. This is backwards compatible
40# and simply calls get_abi_LIBDIR() on newer profiles. You should use this
41# to determine where to install shared objects (ex: /usr/$(get_libdir))
42
43# get_abi_var <VAR> [<ABI>]:
44# returns the value of ${<VAR>_<ABI>} which should be set in make.defaults
45#
46# get_abi_CFLAGS:
47# get_abi_CDEFINE:
48# get_abi_LIBDIR:
49# Aliases for 'get_abi_var CFLAGS', etc.
50
51# get_ml_incdir [<include dir> [<ABI>]]
52# include dir defaults to /usr/include
53# ABI defaults to ${ABI} or ${DEFAULT_ABI}
54#
55# If a multilib include dir is associated with the passed include dir, then
56# we return it, otherwise, we just echo back the include dir. This is
57# neccessary when a built script greps header files rather than testing them
58# via #include (like perl) to figure out features.
59
60# prep_ml_includes:
61# Some includes (include/asm, glibc, etc) are ABI dependent. In this case,
62# We can install them in different locations for each ABI and create a common
63# header which includes the right one based on CDEFINE_${ABI}. If your
64# package installs ABI-specific headers, just add 'prep_ml_includes' to the
65# end of your src_install(). It takes a list of directories that include
66# files are installed in (default is /usr/include if none are passed).
67#
68# Example:
69# src_install() {
70# ...
71# prep_ml_includes /usr/qt/3/include
72# }
73
74# create_ml_includes <include dir> <symbol 1>:<dir 1> [<symbol 2>:<dir 2> ...]
75# If you need more control than prep_ml_includes can offer (like linux-headers
76# for the asm-* dirs, then use create_ml_includes. The firs argument is the
77# common dir. The remaining args are of the form <symbol>:<dir> where
78# <symbol> is what is put in the #ifdef for choosing that dir.
79#
80# Ideas for this code came from debian's sparc-linux headers package.
81#
82# Example:
83# create_ml_includes /usr/include/asm __sparc__:/usr/include/asm-sparc __sparc64__:/usr/include/asm-sparc64
84# create_ml_includes /usr/include/asm __i386__:/usr/include/asm-i386 __x86_64__:/usr/include/asm-x86_64
85
86# get_libname [version]
87# returns libname with proper suffix {.so,.dylib} and optionally supplied version
88# for ELF/MACH-O shared objects
89#
90# Example:
91# get_libname libfoo ${PV}
92# Returns: libfoo.so.${PV} (ELF) || libfoo.${PV}.dylib (MACH)
93
94### END DOCUMENTATION ###
95
96# Defaults:
97export MULTILIB_ABIS=${MULTILIB_ABIS:-"default"}
98export DEFAULT_ABI=${DEFAULT_ABI:-"default"}
99export CFLAGS_default
100export LDFLAGS_default
101export CHOST_default=${CHOST_default:-${CHOST}}
102export CTARGET_default=${CTARGET_default:-${CTARGET:-${CHOST_default}}}
103export LIBDIR_default=${CONF_LIBDIR:-"lib"}
104export CDEFINE_default="__unix__"
105
106# has_multilib_profile()
107has_multilib_profile() {
108 [ -n "${MULTILIB_ABIS}" -a "${MULTILIB_ABIS}" != "${MULTILIB_ABIS/ /}" ]
109}
110 14
111# This function simply returns the desired lib directory. With portage 15# This function simply returns the desired lib directory. With portage
112# 2.0.51, we now have support for installing libraries to lib32/lib64 16# 2.0.51, we now have support for installing libraries to lib32/lib64
113# to accomidate the needs of multilib systems. It's no longer a good idea 17# to accomidate the needs of multilib systems. It's no longer a good idea
114# to assume all libraries will end up in lib. Replace any (sane) instances 18# to assume all libraries will end up in lib. Replace any (sane) instances
… …
120# Added support for ${ABI} and ${DEFAULT_ABI}. If they're both not set, 24# Added support for ${ABI} and ${DEFAULT_ABI}. If they're both not set,
121# fall back on old behavior. Any profile that has these set should also 25# fall back on old behavior. Any profile that has these set should also
122# depend on a newer version of portage (not yet released) which uses these 26# depend on a newer version of portage (not yet released) which uses these
123# over CONF_LIBDIR in econf, dolib, etc... 27# over CONF_LIBDIR in econf, dolib, etc...
124get_libdir() { 28get_libdir() {
125 local CONF_LIBDIR 29 LIBDIR_TEST=$(type econf)
126 if [ -n "${CONF_LIBDIR_OVERRIDE}" ] ; then 30 if [ ! -z "${CONF_LIBDIR_OVERRIDE}" ] ; then
127 # if there is an override, we want to use that... always. 31 # if there is an override, we want to use that... always.
128 echo ${CONF_LIBDIR_OVERRIDE} 32 CONF_LIBDIR="${CONF_LIBDIR_OVERRIDE}"
129 else 33 elif [ -n "$(get_abi_LIBDIR)" ]; then
130 get_abi_LIBDIR 34 CONF_LIBDIR="$(get_abi_LIBDIR)"
35 elif [ "${LIBDIR_TEST/CONF_LIBDIR}" == "${LIBDIR_TEST}" ]; then # we don't have CONF_LIBDIR support
36 # will be <portage-2.0.51_pre20
37 CONF_LIBDIR="lib"
131 fi 38 fi
39 # and of course, default to lib if CONF_LIBDIR isnt set
40 echo ${CONF_LIBDIR:=lib}
41 unset LIBDIR_TEST
132} 42}
133 43
134get_multilibdir() { 44get_multilibdir() {
135 if has_multilib_profile; then 45 if [ -n "$(get_abi_LIBDIR)" ]; then
136 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" 46 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"
137 exit 1 47 exit 1
138 fi 48 fi
139 echo ${CONF_MULTILIBDIR:=lib32} 49 echo ${CONF_MULTILIBDIR:=lib32}
140} 50}
… …
149# 59#
150# get_libdir_override lib64 60# get_libdir_override lib64
151# 61#
152# Travis Tilley <lv@gentoo.org> (31 Aug 2004) 62# Travis Tilley <lv@gentoo.org> (31 Aug 2004)
153get_libdir_override() { 63get_libdir_override() {
154 if has_multilib_profile; then 64 if [ -n "$(get_abi_LIBDIR)" ]; then
155 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" 65 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"
156 exit 1 66 exit 1
157 fi 67 fi
158 CONF_LIBDIR="$1" 68 CONF_LIBDIR="$1"
159 CONF_LIBDIR_OVERRIDE="$1" 69 CONF_LIBDIR_OVERRIDE="$1"
160 LIBDIR_default="$1"
161} 70}
162 71
163# get_abi_var <VAR> [<ABI>] 72# get_abi_var <VAR> [<ABI>]
164# returns the value of ${<VAR>_<ABI>} which should be set in make.defaults 73# returns the value of ${<VAR>_<ABI>} which should be set in make.defaults
165# 74#
… …
173# If <ABI> is not specified and ${ABI} is not defined, ${DEFAULT_ABI} is used. 82# If <ABI> is not specified and ${ABI} is not defined, ${DEFAULT_ABI} is used.
174# If <ABI> is not specified and ${ABI} and ${DEFAULT_ABI} are not defined, we return an empty string. 83# If <ABI> is not specified and ${ABI} and ${DEFAULT_ABI} are not defined, we return an empty string.
175# 84#
176# Jeremy Huddleston <eradicator@gentoo.org> 85# Jeremy Huddleston <eradicator@gentoo.org>
177get_abi_var() { 86get_abi_var() {
178 local flag=$1 87 local flag=${1}
179 local abi 88 local abi
180 if [ $# -gt 1 ]; then 89 if [ $# -gt 1 ]; then
181 abi=${2} 90 abi=${2}
182 elif [ -n "${ABI}" ]; then 91 elif [ -n "${ABI}" ]; then
183 abi=${ABI} 92 abi=${ABI}
184 elif [ -n "${DEFAULT_ABI}" ]; then 93 elif [ -n "${DEFAULT_ABI}" ]; then
185 abi=${DEFAULT_ABI} 94 abi=${DEFAULT_ABI}
186 else 95 else
187 abi="default" 96 return 1
188 fi 97 fi
189 98
190 local var="${flag}_${abi}" 99 local var="${flag}_${abi}"
191 echo ${!var} 100 echo ${!var}
192} 101}
193 102
194get_abi_CFLAGS() { get_abi_var CFLAGS "$@"; } 103get_abi_CFLAGS() { get_abi_var CFLAGS ${@}; }
195get_abi_LDFLAGS() { get_abi_var LDFLAGS "$@"; }
196get_abi_CHOST() { get_abi_var CHOST "$@"; }
197get_abi_CTARGET() { get_abi_var CTARGET "$@"; }
198get_abi_FAKE_TARGETS() { get_abi_var FAKE_TARGETS "$@"; }
199get_abi_CDEFINE() { get_abi_var CDEFINE "$@"; } 104get_abi_CDEFINE() { get_abi_var CDEFINE ${@}; }
200get_abi_LIBDIR() { get_abi_var LIBDIR "$@"; } 105get_abi_LIBDIR() { get_abi_var LIBDIR ${@}; }
201 106
202# Return a list of the ABIs we want to install for with 107# Return a list of the ABIs we want to install for with
203# the last one in the list being the default. 108# the last one in the list being the default.
204get_install_abis() { 109get_abi_order() {
205 local order="" 110 local order=""
206 111
207 if [[ -z ${MULTILIB_ABIS} ]] ; then 112 if [ -z "${MULTILIB_ABIS}" ]; then
208 echo "default" 113 echo "NOMULTILIB"
209 return 0 114 return 1
210 fi 115 fi
211 116
212 if hasq multilib-pkg-force ${RESTRICT} || 117 if hasq multilib-pkg-force ${RESTRICT} ||
213 { hasq multilib-pkg ${FEATURES} && hasq multilib-pkg ${RESTRICT}; }; then 118 { hasq multilib-pkg ${FEATURES} && hasq multilib-pkg ${RESTRICT}; }; then
214 for x in ${MULTILIB_ABIS} ; do 119 for x in ${MULTILIB_ABIS}; do
215 if [[ ${x} != "${DEFAULT_ABI}" ]] ; then 120 if [ "${x}" != "${DEFAULT_ABI}" ]; then
216 hasq ${x} ${ABI_DENY} || ordera="${ordera} ${x}" 121 hasq ${x} ${ABI_DENY} || ordera="${ordera} ${x}"
217 fi 122 fi
218 done 123 done
219 hasq ${DEFAULT_ABI} ${ABI_DENY} || order="${ordera} ${DEFAULT_ABI}" 124 hasq ${DEFAULT_ABI} ${ABI_DENY} || order="${ordera} ${DEFAULT_ABI}"
220 125
221 if [[ -n ${ABI_ALLOW} ]] ; then 126 if [ -n "${ABI_ALLOW}" ]; then
222 local ordera="" 127 local ordera=""
223 for x in ${order} ; do 128 for x in ${order}; do
224 if hasq ${x} ${ABI_ALLOW} ; then 129 if hasq ${x} ${ABI_ALLOW}; then
225 ordera="${ordera} ${x}" 130 ordera="${ordera} ${x}"
226 fi 131 fi
227 done 132 done
228 order=${ordera} 133 order="${ordera}"
229 fi 134 fi
230 else 135 else
231 order=${DEFAULT_ABI} 136 order="${DEFAULT_ABI}"
232 fi 137 fi
233 138
234 if [[ -z ${order} ]] ; then 139 if [ -z "${order}" ]; then
235 die "The ABI list is empty. Are you using a proper multilib profile? Perhaps your USE flags or MULTILIB_ABIS are too restrictive for this package." 140 die "The ABI list is empty. Are you using a proper multilib profile? Perhaps your USE flags or MULTILIB_ABIS are too restrictive for this package."
236 fi 141 fi
237 142
238 echo ${order} 143 echo ${order}
239 return 0 144 return 0
240} 145}
241 146
242# Return a list of the ABIs supported by this profile.
243# the last one in the list being the default.
244get_all_abis() {
245 local order=""
246
247 if [[ -z ${MULTILIB_ABIS} ]] ; then
248 echo "default"
249 return 0
250 fi
251
252 for x in ${MULTILIB_ABIS}; do
253 if [[ ${x} != ${DEFAULT_ABI} ]] ; then
254 order="${order:+${order} }${x}"
255 fi
256 done
257 order="${order:+${order} }${DEFAULT_ABI}"
258
259 echo ${order}
260 return 0
261}
262
263# get_all_libdirs() 147# get_all_libdir()
264# Returns a list of all the libdirs used by this profile. This includes 148# Returns a list of all the libdirs used by this profile. This includes
265# those that might not be touched by the current ebuild. 149# those that might not be touched by the current ebuild.
266get_all_libdirs() { 150get_all_libdirs() {
267 local libdirs="lib" 151 local libdirs="lib"
268 local abi 152 local abi
269 local dir 153 local dir
270 154
271 if has_multilib_profile; then 155 if [ -n "${MULTILIB_ABIS}" ]; then
272 for abi in ${MULTILIB_ABIS}; do 156 for abi in ${MULTILIB_ABIS}; do
273 [ "$(get_abi_LIBDIR ${abi})" != "lib" ] && libdirs="${libdirs} $(get_abi_LIBDIR ${abi})" 157 [ "$(get_abi_LIBDIR ${abi})" != "lib" ] && libdirs="${libdirs} $(get_abi_LIBDIR ${abi})"
274 done 158 done
275 elif [ -n "${CONF_LIBDIR}" ]; then 159 elif [ -n "${CONF_LIBDIR}" ]; then
276 for dir in ${CONF_LIBDIR} ${CONF_MULTILIBDIR:-lib32}; do 160 for dir in ${CONF_LIBDIR} ${CONF_MULTILIBDIR:=lib32}; do
277 [ "${dir}" != "lib" ] && libdirs="${libdirs} ${dir}" 161 [ "${dir}" != "lib" ] && libdirs="${libdirs} ${dir}"
278 done 162 done
279 fi 163 fi
280 164
281 echo "${libdirs}" 165 echo "${libdirs}"
… …
283 167
284# Return true if ${ABI} is the last ABI on our list (or if we're not 168# Return true if ${ABI} is the last ABI on our list (or if we're not
285# using the new multilib configuration. This can be used to determine 169# using the new multilib configuration. This can be used to determine
286# if we're in the last (or only) run through src_{unpack,compile,install} 170# if we're in the last (or only) run through src_{unpack,compile,install}
287is_final_abi() { 171is_final_abi() {
288 has_multilib_profile || return 0 172 [ -z "${ABI}" ] && return 0
289 local ALL_ABIS=$(get_install_abis) 173 local ALL_ABIS=$(get_abi_order)
290 local LAST_ABI=${ALL_ABIS/* /} 174 local LAST_ABI=${ALL_ABIS/* /}
291 [[ ${LAST_ABI} == ${ABI} ]] 175 [ "${LAST_ABI}" = "${ABI}" ]
292} 176}
293 177
294# echo the number of ABIs we will be installing for 178# echo the number of ABIs we will be installing for
295number_abis() { 179number_abis() {
296 get_install_abis | wc -w 180 get_abi_order | wc -w
297}
298
299# get_ml_incdir [<include dir> [<ABI>]]
300# include dir defaults to /usr/include
301# ABI defaults to ${ABI} or ${DEFAULT_ABI}
302get_ml_incdir() {
303 local dir=/usr/include
304
305 if [[ $# -gt 0 ]]; then
306 incdir=$1
307 shift
308 fi
309
310 if [[ -z "${MULTILIB_ABIS}" ]]; then
311 echo ${incdir}
312 return 0
313 fi
314
315 local abi=${ABI-${DEFAULT_ABI}}
316 if [[ $# -gt 0 ]]; then
317 abi=$1
318 shift
319 fi
320
321 if [[ -d "${dir}/gentoo-multilib/${abi}" ]]; then
322 echo ${dir}/gentoo-multilib/${abi}
323 else
324 echo ${dir}
325 fi
326} 181}
327 182
328# prep_ml_includes: 183# prep_ml_includes:
329# 184#
330# Some includes (include/asm, glibc, etc) are ABI dependent. In this case, 185# Some includes (include/asm, glibc, etc) are ABI dependent. In this case,
… …
339# ... 194# ...
340# prep_ml_includes /usr/qt/3/include 195# prep_ml_includes /usr/qt/3/include
341# } 196# }
342 197
343prep_ml_includes() { 198prep_ml_includes() {
199 local dirs
200 if [ ${#} -eq 0 ]; then
201 dirs="/usr/include"
202 else
203 dirs="${@}"
204 fi
205
344 if [[ $(number_abis) -gt 1 ]] ; then 206 if [ $(number_abis) -gt 1 ]; then
345 local dir 207 local dir
346 local dirs
347 local base
348
349 if [[ $# -eq 0 ]] ; then
350 dirs=/usr/include
351 else
352 dirs="$@"
353 fi
354
355 for dir in ${dirs} ; do 208 for dir in ${dirs}; do
356 base=${T}/gentoo-multilib/${dir}/gentoo-multilib
357 mkdir -p "${base}"
358 [[ -d ${base}/${ABI} ]] && rm -rf "${base}/${ABI}"
359 mv "${D}/${dir}" "${base}/${ABI}" 209 mv ${D}/${dir} ${D}/${dir}.${ABI}
360 done 210 done
361 211
362 if is_final_abi; then 212 if is_final_abi; then
363 base=${T}/gentoo-multilib
364 pushd "${base}"
365 find . | tar -c -T - -f - | tar -x --no-same-owner -f - -C ${D}
366 popd
367
368 # This 'set' stuff is required by mips profiles to properly pass
369 # CDEFINE's (which have spaces) to sub-functions
370 set --
371 for dir in ${dirs} ; do 213 for dir in ${dirs}; do
372 set -- "$@" "${dir}" 214 local args="${dir}"
373 local abi 215 local abi
374 for abi in $(get_install_abis); do 216 for abi in $(get_abi_order); do
375 set -- "$@" "$(get_abi_CDEFINE ${abi}):${dir}/gentoo-multilib/${abi}" 217 args="${args} $(get_abi_CDEFINE ${abi}):${dir}.${abi}"
376 done 218 done
377 create_ml_includes "$@" 219 create_ml_includes ${args}
378 done 220 done
379 fi 221 fi
380 fi 222 fi
381} 223}
382 224
… …
389# 231#
390# Example: 232# Example:
391# create_ml_includes /usr/include/asm __sparc__:/usr/include/asm-sparc __sparc64__:/usr/include/asm-sparc64 233# create_ml_includes /usr/include/asm __sparc__:/usr/include/asm-sparc __sparc64__:/usr/include/asm-sparc64
392# create_ml_includes /usr/include/asm __i386__:/usr/include/asm-i386 __x86_64__:/usr/include/asm-x86_64 234# create_ml_includes /usr/include/asm __i386__:/usr/include/asm-i386 __x86_64__:/usr/include/asm-x86_64
393create_ml_includes() { 235create_ml_includes() {
394 local dest=$1 236 local dest="${1}"
395 shift 237 shift
238 local mlinfo="${@}"
396 local basedirs=$(create_ml_includes-listdirs "$@") 239 local basedirs=$(create_ml_includes-listdirs ${mlinfo})
397 240
398 create_ml_includes-makedestdirs ${dest} ${basedirs} 241 create_ml_includes-makedestdirs ${dest} ${basedirs}
399 242
400 local file 243 local file
401 for file in $(create_ml_includes-allfiles ${basedirs}) ; do 244 for file in $(create_ml_includes-allfiles ${basedirs}); do
402 #local name=$(echo ${file} | tr '[:lower:]' '[:upper:]' | sed 's:[^[:upper:]]:_:g') 245 local name="$(echo $file | tr a-z A-Z | sed 's:[^A-Z]:_:g')"
403 ( 246 {
404 echo "/* Autogenerated by create_ml_includes() in multilib.eclass */" 247 echo "/* Common header file autogenerated by create_ml_includes in multilib.eclass */"
248 #echo "#ifndef __CREATE_ML_INCLUDES_STUB_${name}__"
249 #echo "#define __CREATE_ML_INCLUDES_STUB_${name}__"
250 #echo ""
405 251
406 local dir 252 local dir
407 for dir in ${basedirs}; do 253 for dir in ${basedirs}; do
408 if [[ -f ${D}/${dir}/${file} ]] ; then 254 if [ -f "${D}/${dir}/${file}" ]; then
255 echo "#ifdef $(create_ml_includes-sym_for_dir ${dir} ${mlinfo})"
256 echo "#include \"$(create_ml_includes-relative_between ${dest}/$(dirname ${file}) ${dir}/${file})\""
257 echo "#endif /* $(create_ml_includes-sym_for_dir ${dir} ${mlinfo}) */"
409 echo "" 258 echo ""
410 local sym=$(create_ml_includes-sym_for_dir ${dir} "$@")
411 if [[ ${sym/=} != "${sym}" ]] ; then
412 echo "#if ${sym}"
413 elif [[ ${sym::1} == "!" ]] ; then
414 echo "#ifndef ${sym:1}"
415 else
416 echo "#ifdef ${sym}"
417 fi
418 echo "# include <$(create_ml_includes-absolute ${dir}/${file})>"
419 echo "#endif /* ${sym} */"
420 fi 259 fi
421 done 260 done
422 261
423 #echo "#endif /* __CREATE_ML_INCLUDES_STUB_${name}__ */" 262 #echo "#endif /* __CREATE_ML_INCLUDES_STUB_${name}__ */"
424 ) > "${D}/${dest}/${file}" 263 } > ${D}/${dest}/${file}
425 done 264 done
426} 265}
427 266
428# Helper function for create_ml_includes 267# Helper function for create_ml_includes
429create_ml_includes-absolute() { 268create_ml_includes-relative_between() {
269 local src="$(create_ml_includes-tidy_path ${1})"
430 local dst="$(create_ml_includes-tidy_path $1)" 270 local dst="$(create_ml_includes-tidy_path ${2})"
431 271
272 src=(${src//\// })
432 dst=(${dst//\// }) 273 dst=(${dst//\// })
433 274
434 local i 275 local i
435 for ((i=0; i<${#dst[*]}; i++)); do 276 for ((i=0; i<${#src[*]}; i++)); do
436 [ "${dst[i]}" == "include" ] && break 277 [ "${dst[i]}" != "${src[i]}" ] && break
437 done 278 done
438 279
439 local strip_upto=$i 280 local common=$i
440 281
282 for ((i=${#src[*]}; i>common; i--)); do
283 echo -n ../
284 done
285
441 for ((i=strip_upto+1; i<${#dst[*]}-1; i++)); do 286 for ((i=common; i<${#dst[*]}-1; i++)); do
442 echo -n ${dst[i]}/ 287 echo -n ${dst[i]}/
443 done 288 done
444 289
445 echo -n ${dst[i]} 290 echo -n ${dst[i]}
446} 291}
447 292
448# Helper function for create_ml_includes 293# Helper function for create_ml_includes
449create_ml_includes-tidy_path() { 294create_ml_includes-tidy_path() {
450 local removed=$1 295 local removed="${1}"
451 296
452 if [ -n "${removed}" ]; then 297 if [ -n "${removed}" ]; then
453 # Remove multiple slashes 298 # Remove multiple slashes
454 while [ "${removed}" != "${removed/\/\//\/}" ]; do 299 while [ "${removed}" != "${removed/\/\//\/}" ]; do
455 removed=${removed/\/\//\/} 300 removed=${removed/\/\//\/}
… …
472 # Remove trailing .. 317 # Remove trailing ..
473 [ "${removed##*/}" = ".." ] && removed=${removed%/*/*} 318 [ "${removed##*/}" = ".." ] && removed=${removed%/*/*}
474 319
475 # Remove trailing / 320 # Remove trailing /
476 [ "${removed##*/}" = "" ] && removed=${removed%/*} 321 [ "${removed##*/}" = "" ] && removed=${removed%/*}
477 322
478 echo ${removed} 323 echo ${removed}
479 fi 324 fi
480} 325}
481 326
482# Helper function for create_ml_includes 327# Helper function for create_ml_includes
483create_ml_includes-listdirs() { 328create_ml_includes-listdirs() {
484 local dirs 329 local dirs
485 local data 330 local data
486 for data in "$@"; do 331 for data in ${@}; do
487 dirs="${dirs} ${data/*:/}" 332 dirs="${dirs} ${data/*:/}"
488 done 333 done
489 echo ${dirs:1} 334 echo ${dirs:1}
490} 335}
491 336
492# Helper function for create_ml_includes 337# Helper function for create_ml_includes
493create_ml_includes-makedestdirs() { 338create_ml_includes-makedestdirs() {
494 local dest=$1 339 local dest=${1}
495 shift 340 shift
496 local basedirs=$@ 341 local basedirs=${@}
497 342
498 dodir ${dest} 343 dodir ${dest}
499 344
500 local basedir 345 local basedir
501 for basedir in ${basedirs}; do 346 for basedir in ${basedirs}; do
… …
506 done 351 done
507} 352}
508 353
509# Helper function for create_ml_includes 354# Helper function for create_ml_includes
510create_ml_includes-allfiles() { 355create_ml_includes-allfiles() {
356 local basedirs=${@}
357
511 local basedir file 358 local basedir
512 for basedir in "$@" ; do 359 for basedir in ${basedirs}; do
360 local file
513 for file in $(find "${D}"/${basedir} -type f); do 361 for file in $(find ${D}/${basedir} -type f); do
514 echo ${file/${D}\/${basedir}\//} 362 echo ${file/${D}\/${basedir}\//}
515 done 363 done
516 done | sort | uniq 364 done | sort | uniq
517} 365}
518 366
519# Helper function for create_ml_includes 367# Helper function for create_ml_includes
520create_ml_includes-sym_for_dir() { 368create_ml_includes-sym_for_dir() {
521 local dir=$1 369 local dir="${1}"
522 shift 370 shift
523 local data 371 local data
524 for data in "$@"; do 372 for data in ${@}; do
525 if [[ ${data} == *:${dir} ]] ; then 373 if [ "${dir}" = "${data/*:/}" ]; then
526 echo ${data/:*/} 374 echo ${data/:*/}
527 return 0 375 return 0
528 fi 376 fi
529 done 377 done
530 echo "Shouldn't be here -- create_ml_includes-sym_for_dir $1 $@" 378 echo "Shouldn't be here -- create_ml_includes-sym_for_dir ${1} ${@}"
531 # exit because we'll likely be called from a subshell 379 # exit because we'll likely be called from a subshell
532 exit 1 380 exit 1
533} 381}
534
535get_libname() {
536 local libname
537 local ver=$1
538 case ${CHOST} in
539 *-darwin*) libname="dylib";;
540 *) libname="so";;
541 esac
542
543 if [[ -z $@ ]] ; then
544 echo ".${libname}"
545 else
546 for ver in "$@" ; do
547 case ${CHOST} in
548 *-darwin*) echo ".${ver}.${libname}";;
549 *) echo ".${libname}.${ver}";;
550 esac
551 done
552 fi
553}
554
555# This is for the toolchain to setup profile variables when pulling in
556# a crosscompiler (and thus they aren't set in the profile)
557multilib_env() {
558 local CTARGET=${1:-${CTARGET}}
559
560 case ${CTARGET} in
561 x86_64*)
562 export CFLAGS_x86=${CFLAGS_x86--m32}
563 export CHOST_x86=${CTARGET/x86_64/i686}
564 export CTARGET_x86=${CHOST_x86}
565 export CDEFINE_x86="__i386__"
566 export LIBDIR_x86="lib"
567
568 export CFLAGS_amd64=${CFLAGS_amd64--m64}
569 export CHOST_amd64=${CTARGET}
570 export CTARGET_amd64=${CTARGET_amd64}
571 export CDEFINE_amd64="__x86_64__"
572 export LIBDIR_amd64="lib64"
573
574 export MULTILIB_ABIS="amd64 x86"
575 export DEFAULT_ABI="amd64"
576 ;;
577 mips64*)
578 export CFLAGS_o32=${CFLAGS_o32--mabi=32}
579 export CHOST_o32=${CTARGET/mips64/mips}
580 export CTARGET_o32=${CHOST_o32}
581 export CDEFINE_o32="_MIPS_SIM == _ABIO32"
582 export LIBDIR_o32="lib"
583
584 export CFLAGS_n32=${CFLAGS_n32--mabi=n32}
585 export CHOST_n32=${CTARGET}
586 export CTARGET_n32=${CHOST_n32}
587 export CDEFINE_n32="_MIPS_SIM == _ABIN32"
588 export LIBDIR_n32="lib32"
589
590 export CFLAGS_n64=${CFLAGS_n64--mabi=64}
591 export CHOST_n64=${CTARGET}
592 export CTARGET_n64=${CHOST_n64}
593 export CDEFINE_n64="_MIPS_SIM == _ABI64"
594 export LIBDIR_n64="lib64"
595
596 export MULTILIB_ABIS="n64 n32 o32"
597 export DEFAULT_ABI="n32"
598 ;;
599 powerpc64*)
600 export CFLAGS_ppc=${CFLAGS_ppc--m32}
601 export CHOST_ppc=${CTARGET/powerpc64/powerpc}
602 export CTARGET_ppc=${CHOST_ppc}
603 export CDEFINE_ppc="!__powerpc64__"
604 export LIBDIR_ppc="lib"
605
606 export CFLAGS_ppc64=${CFLAGS_ppc64--m64}
607 export CHOST_ppc64=${CTARGET}
608 export CTARGET_ppc64=${CHOST_ppc64}
609 export CDEFINE_ppc64="__powerpc64__"
610 export LIBDIR_ppc64="lib64"
611
612 export MULTILIB_ABIS="ppc64 ppc"
613 export DEFAULT_ABI="ppc64"
614 ;;
615 s390x*)
616 export CFLAGS_s390=${CFLAGS_s390--m31} # the 31 is not a typo
617 export CHOST_s390=${CTARGET/s390x/s390}
618 export CTARGET_s390=${CHOST_s390}
619 export CDEFINE_s390="!__s390x__"
620 export LIBDIR_s390="lib"
621
622 export CFLAGS_s390x=${CFLAGS_s390x--m64}
623 export CHOST_s390x=${CTARGET}
624 export CTARGET_s390x=${CHOST_s390x}
625 export CDEFINE_s390x="__s390x__"
626 export LIBDIR_s390x="lib64"
627
628 export MULTILIB_ABIS="s390x s390"
629 export DEFAULT_ABI="s390x"
630 ;;
631 sparc64*)
632 export CFLAGS_sparc32=${CFLAGS_sparc32--m32}
633 export CHOST_sparc32=${CTARGET/sparc64/sparc}
634 export CTARGET_sparc32=${CHOST_sparc32}
635 export CDEFINE_sparc32="!__arch64__"
636 export LIBDIR_sparc32="lib"
637
638 export CFLAGS_sparc64=${CFLAGS_sparc64--m64}
639 export CHOST_sparc64=${CTARGET}
640 export CTARGET_sparc64=${CHOST_sparc64}
641 export CDEFINE_sparc64="__arch64__"
642 export LIBDIR_sparc64="lib64"
643
644 export MULTILIB_ABIS="sparc64 sparc32"
645 export DEFAULT_ABI="sparc64"
646 ;;
647 *)
648 export MULTILIB_ABIS="default"
649 export DEFAULT_ABI="default"
650 ;;
651 esac
652}
Legend:
Removed from v.1.1.1.1  
changed lines
  Added in v.1.8
  ViewVC Help
Powered by ViewVC 1.1.17