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

Diff of /eclass/multilib.eclass

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

Revision 1.16 Revision 1.38
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.16 2005/01/31 06:37:31 eradicator Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/multilib.eclass,v 1.38 2005/10/07 02:24:47 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.
9
10ECLASS=multilib
11INHERITED="$INHERITED $ECLASS"
12 9
13DESCRIPTION="Based on the ${ECLASS} eclass" 10DESCRIPTION="Based on the ${ECLASS} eclass"
14 11
15# has_multilib_profile: 12# has_multilib_profile:
16# Return true if the current profile is a multilib profile and lists more than 13# Return true if the current profile is a multilib profile and lists more than
23# on our last run through a src_* function. 20# on our last run through a src_* function.
24 21
25# number_abis: 22# number_abis:
26# echo the number of ABIs we will be installing for 23# echo the number of ABIs we will be installing for
27 24
28# get_abi_order: 25# get_install_abis:
29# Return a list of the ABIs we want to install for with 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.
30# the last one in the list being the default. 31# the last one in the list being the default.
31 32
32# get_all_libdirs: 33# get_all_libdirs:
33# Returns a list of all the libdirs used by this profile. This includes 34# Returns a list of all the libdirs used by this profile. This includes
34# those that might not be touched by the current ebuild and always includes 35# those that might not be touched by the current ebuild and always includes
80# 81#
81# Example: 82# Example:
82# create_ml_includes /usr/include/asm __sparc__:/usr/include/asm-sparc __sparc64__:/usr/include/asm-sparc64 83# create_ml_includes /usr/include/asm __sparc__:/usr/include/asm-sparc __sparc64__:/usr/include/asm-sparc64
83# create_ml_includes /usr/include/asm __i386__:/usr/include/asm-i386 __x86_64__:/usr/include/asm-x86_64 84# create_ml_includes /usr/include/asm __i386__:/usr/include/asm-i386 __x86_64__:/usr/include/asm-x86_64
84 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
85### END DOCUMENTATION ### 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}}
103export LIBDIR_default=${CONF_LIBDIR:-"lib"}
104export CDEFINE_default="__unix__"
86 105
87# has_multilib_profile() 106# has_multilib_profile()
88has_multilib_profile() { 107has_multilib_profile() {
89 [ -n "${MULTILIB_ABIS}" -a "${MULTILIB_ABIS}" != "${MULTILIB_ABIS/ /}" ] 108 [ -n "${MULTILIB_ABIS}" -a "${MULTILIB_ABIS}" != "${MULTILIB_ABIS/ /}" ]
90} 109}
101# Added support for ${ABI} and ${DEFAULT_ABI}. If they're both not set, 120# Added support for ${ABI} and ${DEFAULT_ABI}. If they're both not set,
102# fall back on old behavior. Any profile that has these set should also 121# fall back on old behavior. Any profile that has these set should also
103# depend on a newer version of portage (not yet released) which uses these 122# depend on a newer version of portage (not yet released) which uses these
104# over CONF_LIBDIR in econf, dolib, etc... 123# over CONF_LIBDIR in econf, dolib, etc...
105get_libdir() { 124get_libdir() {
106 LIBDIR_TEST=$(type econf) 125 local CONF_LIBDIR
107 if [ ! -z "${CONF_LIBDIR_OVERRIDE}" ] ; then 126 if [ -n "${CONF_LIBDIR_OVERRIDE}" ] ; then
108 # if there is an override, we want to use that... always. 127 # if there is an override, we want to use that... always.
109 CONF_LIBDIR="${CONF_LIBDIR_OVERRIDE}" 128 echo ${CONF_LIBDIR_OVERRIDE}
110 elif [ -n "$(get_abi_LIBDIR)" ]; then 129 else
111 CONF_LIBDIR="$(get_abi_LIBDIR)" 130 get_abi_LIBDIR
112 elif [ "${LIBDIR_TEST/CONF_LIBDIR}" == "${LIBDIR_TEST}" ]; then # we don't have CONF_LIBDIR support
113 # will be <portage-2.0.51_pre20
114 CONF_LIBDIR="lib"
115 fi 131 fi
116 # and of course, default to lib if CONF_LIBDIR isnt set
117 echo ${CONF_LIBDIR:=lib}
118 unset LIBDIR_TEST
119} 132}
120 133
121get_multilibdir() { 134get_multilibdir() {
122 if [ -n "$(get_abi_LIBDIR)" ]; then 135 if has_multilib_profile; then
123 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" 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"
124 exit 1 137 exit 1
125 fi 138 fi
126 echo ${CONF_MULTILIBDIR:=lib32} 139 echo ${CONF_MULTILIBDIR:=lib32}
127} 140}
136# 149#
137# get_libdir_override lib64 150# get_libdir_override lib64
138# 151#
139# Travis Tilley <lv@gentoo.org> (31 Aug 2004) 152# Travis Tilley <lv@gentoo.org> (31 Aug 2004)
140get_libdir_override() { 153get_libdir_override() {
141 if [ -n "$(get_abi_LIBDIR)" ]; then 154 if has_multilib_profile; then
142 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" 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"
143 exit 1 156 exit 1
144 fi 157 fi
145 CONF_LIBDIR="$1" 158 CONF_LIBDIR="$1"
146 CONF_LIBDIR_OVERRIDE="$1" 159 CONF_LIBDIR_OVERRIDE="$1"
160 LIBDIR_default="$1"
147} 161}
148 162
149# get_abi_var <VAR> [<ABI>] 163# get_abi_var <VAR> [<ABI>]
150# returns the value of ${<VAR>_<ABI>} which should be set in make.defaults 164# returns the value of ${<VAR>_<ABI>} which should be set in make.defaults
151# 165#
159# If <ABI> is not specified and ${ABI} is not defined, ${DEFAULT_ABI} is used. 173# If <ABI> is not specified and ${ABI} is not defined, ${DEFAULT_ABI} is used.
160# If <ABI> is not specified and ${ABI} and ${DEFAULT_ABI} are not defined, we return an empty string. 174# If <ABI> is not specified and ${ABI} and ${DEFAULT_ABI} are not defined, we return an empty string.
161# 175#
162# Jeremy Huddleston <eradicator@gentoo.org> 176# Jeremy Huddleston <eradicator@gentoo.org>
163get_abi_var() { 177get_abi_var() {
164 local flag=${1} 178 local flag=$1
165 local abi 179 local abi
166 if [ $# -gt 1 ]; then 180 if [ $# -gt 1 ]; then
167 abi=${2} 181 abi=${2}
168 elif [ -n "${ABI}" ]; then 182 elif [ -n "${ABI}" ]; then
169 abi=${ABI} 183 abi=${ABI}
170 elif [ -n "${DEFAULT_ABI}" ]; then 184 elif [ -n "${DEFAULT_ABI}" ]; then
171 abi=${DEFAULT_ABI} 185 abi=${DEFAULT_ABI}
172 else 186 else
173 return 1 187 abi="default"
174 fi 188 fi
175 189
176 local var="${flag}_${abi}" 190 local var="${flag}_${abi}"
177 echo ${!var} 191 echo ${!var}
178} 192}
179 193
180get_abi_CFLAGS() { get_abi_var CFLAGS ${@}; } 194get_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 "$@"; }
181get_abi_CDEFINE() { get_abi_var CDEFINE ${@}; } 199get_abi_CDEFINE() { get_abi_var CDEFINE "$@"; }
182get_abi_LIBDIR() { get_abi_var LIBDIR ${@}; } 200get_abi_LIBDIR() { get_abi_var LIBDIR "$@"; }
183 201
184# Return a list of the ABIs we want to install for with 202# Return a list of the ABIs we want to install for with
185# the last one in the list being the default. 203# the last one in the list being the default.
186get_abi_order() { 204get_install_abis() {
187 local order="" 205 local order=""
188 206
189 if [ -z "${MULTILIB_ABIS}" ]; then 207 if [[ -z ${MULTILIB_ABIS} ]] ; then
190 echo "NOMULTILIB" 208 echo "default"
191 return 1 209 return 0
192 fi 210 fi
193 211
194 if hasq multilib-pkg-force ${RESTRICT} || 212 if hasq multilib-pkg-force ${RESTRICT} ||
195 { hasq multilib-pkg ${FEATURES} && hasq multilib-pkg ${RESTRICT}; }; then 213 { hasq multilib-pkg ${FEATURES} && hasq multilib-pkg ${RESTRICT}; }; then
196 for x in ${MULTILIB_ABIS}; do 214 for x in ${MULTILIB_ABIS} ; do
197 if [ "${x}" != "${DEFAULT_ABI}" ]; then 215 if [[ ${x} != "${DEFAULT_ABI}" ]] ; then
198 hasq ${x} ${ABI_DENY} || ordera="${ordera} ${x}" 216 hasq ${x} ${ABI_DENY} || ordera="${ordera} ${x}"
199 fi 217 fi
200 done 218 done
201 hasq ${DEFAULT_ABI} ${ABI_DENY} || order="${ordera} ${DEFAULT_ABI}" 219 hasq ${DEFAULT_ABI} ${ABI_DENY} || order="${ordera} ${DEFAULT_ABI}"
202 220
203 if [ -n "${ABI_ALLOW}" ]; then 221 if [[ -n ${ABI_ALLOW} ]] ; then
204 local ordera="" 222 local ordera=""
205 for x in ${order}; do 223 for x in ${order} ; do
206 if hasq ${x} ${ABI_ALLOW}; then 224 if hasq ${x} ${ABI_ALLOW} ; then
207 ordera="${ordera} ${x}" 225 ordera="${ordera} ${x}"
208 fi 226 fi
209 done 227 done
210 order="${ordera}" 228 order=${ordera}
211 fi 229 fi
212 else 230 else
213 order="${DEFAULT_ABI}" 231 order=${DEFAULT_ABI}
214 fi 232 fi
215 233
216 if [ -z "${order}" ]; then 234 if [[ -z ${order} ]] ; then
217 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." 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."
218 fi 236 fi
237
238 echo ${order}
239 return 0
240}
241
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}"
219 258
220 echo ${order} 259 echo ${order}
221 return 0 260 return 0
222} 261}
223 262
232 if has_multilib_profile; then 271 if has_multilib_profile; then
233 for abi in ${MULTILIB_ABIS}; do 272 for abi in ${MULTILIB_ABIS}; do
234 [ "$(get_abi_LIBDIR ${abi})" != "lib" ] && libdirs="${libdirs} $(get_abi_LIBDIR ${abi})" 273 [ "$(get_abi_LIBDIR ${abi})" != "lib" ] && libdirs="${libdirs} $(get_abi_LIBDIR ${abi})"
235 done 274 done
236 elif [ -n "${CONF_LIBDIR}" ]; then 275 elif [ -n "${CONF_LIBDIR}" ]; then
237 for dir in ${CONF_LIBDIR} ${CONF_MULTILIBDIR:=lib32}; do 276 for dir in ${CONF_LIBDIR} ${CONF_MULTILIBDIR:-lib32}; do
238 [ "${dir}" != "lib" ] && libdirs="${libdirs} ${dir}" 277 [ "${dir}" != "lib" ] && libdirs="${libdirs} ${dir}"
239 done 278 done
240 fi 279 fi
241 280
242 echo "${libdirs}" 281 echo "${libdirs}"
244 283
245# Return true if ${ABI} is the last ABI on our list (or if we're not 284# Return true if ${ABI} is the last ABI on our list (or if we're not
246# using the new multilib configuration. This can be used to determine 285# using the new multilib configuration. This can be used to determine
247# if we're in the last (or only) run through src_{unpack,compile,install} 286# if we're in the last (or only) run through src_{unpack,compile,install}
248is_final_abi() { 287is_final_abi() {
249 ! has_multilib_profile && return 0 288 has_multilib_profile || return 0
250 local ALL_ABIS=$(get_abi_order) 289 local ALL_ABIS=$(get_install_abis)
251 local LAST_ABI=${ALL_ABIS/* /} 290 local LAST_ABI=${ALL_ABIS/* /}
252 [ "${LAST_ABI}" = "${ABI}" ] 291 [[ ${LAST_ABI} == ${ABI} ]]
253} 292}
254 293
255# echo the number of ABIs we will be installing for 294# echo the number of ABIs we will be installing for
256number_abis() { 295number_abis() {
257 get_abi_order | wc -w 296 get_install_abis | wc -w
258} 297}
259 298
260# get_ml_incdir [<include dir> [<ABI>]] 299# get_ml_incdir [<include dir> [<ABI>]]
261# include dir defaults to /usr/include 300# include dir defaults to /usr/include
262# ABI defaults to ${ABI} or ${DEFAULT_ABI} 301# ABI defaults to ${ABI} or ${DEFAULT_ABI}
263get_ml_incdir() { 302get_ml_incdir() {
264 local dir=/usr/include 303 local dir=/usr/include
265 304
266 if [[ ${#} -gt 0 ]]; then 305 if [[ $# -gt 0 ]]; then
267 incdir=${1} 306 incdir=$1
268 shift 307 shift
269 fi 308 fi
270 309
271 if [[ -z "${MULTILIB_ABIS}" ]]; then 310 if [[ -z "${MULTILIB_ABIS}" ]]; then
272 echo ${incdir} 311 echo ${incdir}
273 return 0 312 return 0
274 fi 313 fi
275 314
276 local abi=${ABI:-${DEFAULT_ABI}} 315 local abi=${ABI-${DEFAULT_ABI}}
277 if [[ ${#} -gt 0 ]]; then 316 if [[ $# -gt 0 ]]; then
278 abi=${1} 317 abi=$1
279 shift 318 shift
280 fi 319 fi
281 320
282 if [[ -d "${dir}/gentoo-multilib/${abi}" ]]; then 321 if [[ -d "${dir}/gentoo-multilib/${abi}" ]]; then
283 echo ${dir}/gentoo-multilib/${abi} 322 echo ${dir}/gentoo-multilib/${abi}
300# ... 339# ...
301# prep_ml_includes /usr/qt/3/include 340# prep_ml_includes /usr/qt/3/include
302# } 341# }
303 342
304prep_ml_includes() { 343prep_ml_includes() {
305 if [ $(number_abis) -gt 1 ]; then 344 if [[ $(number_abis) -gt 1 ]] ; then
306 local dir 345 local dir
307 local dirs 346 local dirs
308 local base 347 local base
309 348
310 if [ ${#} -eq 0 ]; then 349 if [[ $# -eq 0 ]] ; then
311 dirs="/usr/include" 350 dirs=/usr/include
312 else 351 else
313 dirs="${@}" 352 dirs="$@"
314 fi 353 fi
315 354
316 for dir in ${dirs}; do 355 for dir in ${dirs} ; do
317 base=${T}/gentoo-multilib/${dir}/gentoo-multilib 356 base=${T}/gentoo-multilib/${dir}/gentoo-multilib
318 mkdir -p ${base} 357 mkdir -p "${base}"
319 [ -d ${base}/${ABI} ] && rm -rf ${base}/${ABI} 358 [[ -d ${base}/${ABI} ]] && rm -rf "${base}/${ABI}"
320 mv ${D}/${dir} ${base}/${ABI} 359 mv "${D}/${dir}" "${base}/${ABI}"
321 done 360 done
322 361
323 if is_final_abi; then 362 if is_final_abi; then
324 base=${T}/gentoo-multilib 363 base=${T}/gentoo-multilib
325 pushd ${base} 364 pushd "${base}"
326 find . | tar -c -T - -f - | tar -x --no-same-owner -f - -C ${D} 365 find . | tar -c -T - -f - | tar -x --no-same-owner -f - -C ${D}
327 popd 366 popd
328 367
368 # This 'set' stuff is required by mips profiles to properly pass
369 # CDEFINE's (which have spaces) to sub-functions
370 set --
329 for dir in ${dirs}; do 371 for dir in ${dirs} ; do
330 local args=${dir} 372 set -- "$@" "${dir}"
331 local abi 373 local abi
332 for abi in $(get_abi_order); do 374 for abi in $(get_install_abis); do
333 args="${args} $(get_abi_CDEFINE ${abi}):${dir}/gentoo-multilib/${abi}" 375 set -- "$@" "$(get_abi_CDEFINE ${abi}):${dir}/gentoo-multilib/${abi}"
334 done 376 done
335 create_ml_includes ${args} 377 create_ml_includes "$@"
336 done 378 done
337 fi 379 fi
338 fi 380 fi
339} 381}
340 382
347# 389#
348# Example: 390# Example:
349# create_ml_includes /usr/include/asm __sparc__:/usr/include/asm-sparc __sparc64__:/usr/include/asm-sparc64 391# create_ml_includes /usr/include/asm __sparc__:/usr/include/asm-sparc __sparc64__:/usr/include/asm-sparc64
350# create_ml_includes /usr/include/asm __i386__:/usr/include/asm-i386 __x86_64__:/usr/include/asm-x86_64 392# create_ml_includes /usr/include/asm __i386__:/usr/include/asm-i386 __x86_64__:/usr/include/asm-x86_64
351create_ml_includes() { 393create_ml_includes() {
352 local dest="${1}" 394 local dest=$1
353 shift 395 shift
354 local mlinfo="${@}"
355 local basedirs=$(create_ml_includes-listdirs ${mlinfo}) 396 local basedirs=$(create_ml_includes-listdirs "$@")
356 397
357 create_ml_includes-makedestdirs ${dest} ${basedirs} 398 create_ml_includes-makedestdirs ${dest} ${basedirs}
358 399
359 local file 400 local file
360 for file in $(create_ml_includes-allfiles ${basedirs}); do 401 for file in $(create_ml_includes-allfiles ${basedirs}) ; do
361 local name="$(echo $file | tr a-z A-Z | sed 's:[^A-Z]:_:g')" 402 #local name=$(echo ${file} | tr '[:lower:]' '[:upper:]' | sed 's:[^[:upper:]]:_:g')
362 { 403 (
363 echo "/* Common header file autogenerated by create_ml_includes in multilib.eclass */" 404 echo "/* Autogenerated by create_ml_includes() in multilib.eclass */"
364 #echo "#ifndef __CREATE_ML_INCLUDES_STUB_${name}__"
365 #echo "#define __CREATE_ML_INCLUDES_STUB_${name}__"
366 #echo ""
367 405
368 local dir 406 local dir
369 for dir in ${basedirs}; do 407 for dir in ${basedirs}; do
370 if [ -f "${D}/${dir}/${file}" ]; then 408 if [[ -f ${D}/${dir}/${file} ]] ; then
371 echo "#ifdef $(create_ml_includes-sym_for_dir ${dir} ${mlinfo})"
372 echo "#include \"$(create_ml_includes-relative_between ${dest}/$(dirname ${file}) ${dir}/${file})\""
373 echo "#endif /* $(create_ml_includes-sym_for_dir ${dir} ${mlinfo}) */"
374 echo "" 409 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} */"
375 fi 420 fi
376 done 421 done
377 422
378 #echo "#endif /* __CREATE_ML_INCLUDES_STUB_${name}__ */" 423 #echo "#endif /* __CREATE_ML_INCLUDES_STUB_${name}__ */"
379 } > ${D}/${dest}/${file} 424 ) > "${D}/${dest}/${file}"
380 done 425 done
381} 426}
382 427
383# Helper function for create_ml_includes 428# Helper function for create_ml_includes
384create_ml_includes-relative_between() { 429create_ml_includes-absolute() {
385 local src="$(create_ml_includes-tidy_path ${1})"
386 local dst="$(create_ml_includes-tidy_path ${2})" 430 local dst="$(create_ml_includes-tidy_path $1)"
387 431
388 src=(${src//\// })
389 dst=(${dst//\// }) 432 dst=(${dst//\// })
390 433
391 local i 434 local i
392 for ((i=0; i<${#src[*]}; i++)); do 435 for ((i=0; i<${#dst[*]}; i++)); do
393 [ "${dst[i]}" != "${src[i]}" ] && break 436 [ "${dst[i]}" == "include" ] && break
394 done 437 done
395 438
396 local common=$i 439 local strip_upto=$i
397 440
398 for ((i=${#src[*]}; i>common; i--)); do
399 echo -n ../
400 done
401
402 for ((i=common; i<${#dst[*]}-1; i++)); do 441 for ((i=strip_upto+1; i<${#dst[*]}-1; i++)); do
403 echo -n ${dst[i]}/ 442 echo -n ${dst[i]}/
404 done 443 done
405 444
406 echo -n ${dst[i]} 445 echo -n ${dst[i]}
407} 446}
408 447
409# Helper function for create_ml_includes 448# Helper function for create_ml_includes
410create_ml_includes-tidy_path() { 449create_ml_includes-tidy_path() {
411 local removed="${1}" 450 local removed=$1
412 451
413 if [ -n "${removed}" ]; then 452 if [ -n "${removed}" ]; then
414 # Remove multiple slashes 453 # Remove multiple slashes
415 while [ "${removed}" != "${removed/\/\//\/}" ]; do 454 while [ "${removed}" != "${removed/\/\//\/}" ]; do
416 removed=${removed/\/\//\/} 455 removed=${removed/\/\//\/}
433 # Remove trailing .. 472 # Remove trailing ..
434 [ "${removed##*/}" = ".." ] && removed=${removed%/*/*} 473 [ "${removed##*/}" = ".." ] && removed=${removed%/*/*}
435 474
436 # Remove trailing / 475 # Remove trailing /
437 [ "${removed##*/}" = "" ] && removed=${removed%/*} 476 [ "${removed##*/}" = "" ] && removed=${removed%/*}
438 477
439 echo ${removed} 478 echo ${removed}
440 fi 479 fi
441} 480}
442 481
443# Helper function for create_ml_includes 482# Helper function for create_ml_includes
444create_ml_includes-listdirs() { 483create_ml_includes-listdirs() {
445 local dirs 484 local dirs
446 local data 485 local data
447 for data in ${@}; do 486 for data in "$@"; do
448 dirs="${dirs} ${data/*:/}" 487 dirs="${dirs} ${data/*:/}"
449 done 488 done
450 echo ${dirs:1} 489 echo ${dirs:1}
451} 490}
452 491
453# Helper function for create_ml_includes 492# Helper function for create_ml_includes
454create_ml_includes-makedestdirs() { 493create_ml_includes-makedestdirs() {
455 local dest=${1} 494 local dest=$1
456 shift 495 shift
457 local basedirs=${@} 496 local basedirs=$@
458 497
459 dodir ${dest} 498 dodir ${dest}
460 499
461 local basedir 500 local basedir
462 for basedir in ${basedirs}; do 501 for basedir in ${basedirs}; do
467 done 506 done
468} 507}
469 508
470# Helper function for create_ml_includes 509# Helper function for create_ml_includes
471create_ml_includes-allfiles() { 510create_ml_includes-allfiles() {
472 local basedirs=${@}
473
474 local basedir 511 local basedir file
475 for basedir in ${basedirs}; do 512 for basedir in "$@" ; do
476 local file
477 for file in $(find ${D}/${basedir} -type f); do 513 for file in $(find "${D}"/${basedir} -type f); do
478 echo ${file/${D}\/${basedir}\//} 514 echo ${file/${D}\/${basedir}\//}
479 done 515 done
480 done | sort | uniq 516 done | sort | uniq
481} 517}
482 518
483# Helper function for create_ml_includes 519# Helper function for create_ml_includes
484create_ml_includes-sym_for_dir() { 520create_ml_includes-sym_for_dir() {
485 local dir="${1}" 521 local dir=$1
486 shift 522 shift
487 local data 523 local data
488 for data in ${@}; do 524 for data in "$@"; do
489 if [ "${dir}" = "${data/*:/}" ]; then 525 if [[ ${data} == *:${dir} ]] ; then
490 echo ${data/:*/} 526 echo ${data/:*/}
491 return 0 527 return 0
492 fi 528 fi
493 done 529 done
494 echo "Shouldn't be here -- create_ml_includes-sym_for_dir ${1} ${@}" 530 echo "Shouldn't be here -- create_ml_includes-sym_for_dir $1 $@"
495 # exit because we'll likely be called from a subshell 531 # exit because we'll likely be called from a subshell
496 exit 1 532 exit 1
497} 533}
534
535get_libname() {
536 local ver=$1
537 if use userland_Darwin ; then
538 if [ -z ${ver} ] ; then
539 echo ".dylib"
540 else
541 echo ".${ver}.dylib"
542 fi
543 else
544 if [ -z ${ver} ] ; then
545 echo ".so"
546 else
547 echo ".so.${ver}"
548 fi
549 fi
550}
551
552# This is for the toolchain to setup profile variables when pulling in
553# a crosscompiler (and thus they aren't set in the profile)
554multilib_env() {
555 local CTARGET=$1
556 local CTARGET_post=${CTARGET#*-}
557
558 case ${CTARGET} in
559 x86_64*)
560 export CFLAGS_x86=${CFLAGS_x86--m32}
561 export CHOST_x86=i686-${CTARGET_post}
562 export CTARGET_x86=i686-${CTARGET_post}
563 export CDEFINE_x86="__i386__"
564 export LIBDIR_x86="lib"
565
566 export CFLAGS_amd64=${CFLAGS_amd64--m64}
567 export CHOST_amd64=x86_64-${CTARGET_post}
568 export CTARGET_amd64=x86_64-${CTARGET_post}
569 export CDEFINE_amd64="__x86_64__"
570 export LIBDIR_amd64="lib64"
571
572 export MULTILIB_ABIS="amd64 x86"
573 export DEFAULT_ABI="amd64"
574 ;;
575 mips64*)
576 export CFLAGS_o32=${CFLAGS_o32--mabi=32}
577 export CHOST_o32=mips-${CTARGET_post}
578 export CTARGET_o32=mips-${CTARGET_post}
579 export CDEFINE_o32="_MIPS_SIM == _ABIO32"
580 export LIBDIR_o32="lib"
581
582 export CFLAGS_n32=${CFLAGS_n32--mabi=n32}
583 export CHOST_n32=mips64-${CTARGET_post}
584 export CTARGET_n32=mips64-${CTARGET_post}
585 export CDEFINE_n32="_MIPS_SIM == _ABIN32"
586 export LIBDIR_n32="lib32"
587
588 export CFLAGS_n64=${CFLAGS_n64--mabi=64}
589 export CHOST_n64=mips64-${CTARGET_post}
590 export CTARGET_n64=mips64-${CTARGET_post}
591 export CDEFINE_n64="_MIPS_SIM == _ABI64"
592 export LIBDIR_n64="lib64"
593
594 export MULTILIB_ABIS="n64 n32 o32"
595 export DEFAULT_ABI="n32"
596 ;;
597 powerpc64*)
598 export CFLAGS_ppc=${CFLAGS_ppc--m32}
599 export CHOST_ppc=powerpc-${CTARGET_post}
600 export CTARGET_ppc=powerpc-${CTARGET_post}
601 export CDEFINE_ppc="!__powerpc64__"
602 export LIBDIR_ppc="lib"
603
604 export CFLAGS_ppc64=${CFLAGS_ppc64--m64}
605 export CHOST_ppc64=powerpc64-${CTARGET_post}
606 export CTARGET_ppc64=powerpc64-${CTARGET_post}
607 export CDEFINE_ppc64="__powerpc64__"
608 export LIBDIR_ppc64="lib64"
609
610 export MULTILIB_ABIS="ppc64 ppc"
611 export DEFAULT_ABI="ppc64"
612 ;;
613 sparc64*)
614 export CFLAGS_sparc32=${CFLAGS_sparc32--m32}
615 export CHOST_sparc32=sparc-${CTARGET_post}
616 export CTARGET_sparc32=sparc-${CTARGET_post}
617 export CDEFINE_sparc32="!__arch64__"
618 export LIBDIR_sparc32="lib"
619
620 export CFLAGS_sparc64=${CFLAGS_sparc64--m64}
621 export CHOST_sparc64=sparc64-${CTARGET_post}
622 export CTARGET_sparc64=sparc64-${CTARGET_post}
623 export CDEFINE_sparc64="__arch64__"
624 export LIBDIR_sparc64="lib64"
625
626 export MULTILIB_ABIS="sparc64 sparc32"
627 export DEFAULT_ABI="sparc64"
628 ;;
629 *)
630 export MULTILIB_ABIS="default"
631 export DEFAULT_ABI="default"
632 ;;
633 esac
634}

Legend:
Removed from v.1.16  
changed lines
  Added in v.1.38

  ViewVC Help
Powered by ViewVC 1.1.20