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

Diff of /eclass/multilib.eclass

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

Revision 1.17 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.17 2005/02/03 05:29:07 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
84# 81#
85# Example: 82# Example:
86# 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
87# 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
88 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
89### 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__"
90 105
91# has_multilib_profile() 106# has_multilib_profile()
92has_multilib_profile() { 107has_multilib_profile() {
93 [ -n "${MULTILIB_ABIS}" -a "${MULTILIB_ABIS}" != "${MULTILIB_ABIS/ /}" ] 108 [ -n "${MULTILIB_ABIS}" -a "${MULTILIB_ABIS}" != "${MULTILIB_ABIS/ /}" ]
94} 109}
105# 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,
106# 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
107# 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
108# over CONF_LIBDIR in econf, dolib, etc... 123# over CONF_LIBDIR in econf, dolib, etc...
109get_libdir() { 124get_libdir() {
110 LIBDIR_TEST=$(type econf) 125 local CONF_LIBDIR
111 if [ ! -z "${CONF_LIBDIR_OVERRIDE}" ] ; then 126 if [ -n "${CONF_LIBDIR_OVERRIDE}" ] ; then
112 # if there is an override, we want to use that... always. 127 # if there is an override, we want to use that... always.
113 CONF_LIBDIR="${CONF_LIBDIR_OVERRIDE}" 128 echo ${CONF_LIBDIR_OVERRIDE}
114 elif [ -n "$(get_abi_LIBDIR)" ]; then 129 else
115 CONF_LIBDIR="$(get_abi_LIBDIR)" 130 get_abi_LIBDIR
116 elif [ "${LIBDIR_TEST/CONF_LIBDIR}" == "${LIBDIR_TEST}" ]; then # we don't have CONF_LIBDIR support
117 # will be <portage-2.0.51_pre20
118 CONF_LIBDIR="lib"
119 fi 131 fi
120 # and of course, default to lib if CONF_LIBDIR isnt set
121 echo ${CONF_LIBDIR:=lib}
122 unset LIBDIR_TEST
123} 132}
124 133
125get_multilibdir() { 134get_multilibdir() {
126 if [ -n "$(get_abi_LIBDIR)" ]; then 135 if has_multilib_profile; then
127 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"
128 exit 1 137 exit 1
129 fi 138 fi
130 echo ${CONF_MULTILIBDIR:=lib32} 139 echo ${CONF_MULTILIBDIR:=lib32}
131} 140}
140# 149#
141# get_libdir_override lib64 150# get_libdir_override lib64
142# 151#
143# Travis Tilley <lv@gentoo.org> (31 Aug 2004) 152# Travis Tilley <lv@gentoo.org> (31 Aug 2004)
144get_libdir_override() { 153get_libdir_override() {
145 if [ -n "$(get_abi_LIBDIR)" ]; then 154 if has_multilib_profile; then
146 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"
147 exit 1 156 exit 1
148 fi 157 fi
149 CONF_LIBDIR="$1" 158 CONF_LIBDIR="$1"
150 CONF_LIBDIR_OVERRIDE="$1" 159 CONF_LIBDIR_OVERRIDE="$1"
160 LIBDIR_default="$1"
151} 161}
152 162
153# get_abi_var <VAR> [<ABI>] 163# get_abi_var <VAR> [<ABI>]
154# 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
155# 165#
163# 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.
164# 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.
165# 175#
166# Jeremy Huddleston <eradicator@gentoo.org> 176# Jeremy Huddleston <eradicator@gentoo.org>
167get_abi_var() { 177get_abi_var() {
168 local flag=${1} 178 local flag=$1
169 local abi 179 local abi
170 if [ $# -gt 1 ]; then 180 if [ $# -gt 1 ]; then
171 abi=${2} 181 abi=${2}
172 elif [ -n "${ABI}" ]; then 182 elif [ -n "${ABI}" ]; then
173 abi=${ABI} 183 abi=${ABI}
174 elif [ -n "${DEFAULT_ABI}" ]; then 184 elif [ -n "${DEFAULT_ABI}" ]; then
175 abi=${DEFAULT_ABI} 185 abi=${DEFAULT_ABI}
176 else 186 else
177 return 1 187 abi="default"
178 fi 188 fi
179 189
180 local var="${flag}_${abi}" 190 local var="${flag}_${abi}"
181 echo ${!var} 191 echo ${!var}
182} 192}
183 193
184get_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 "$@"; }
185get_abi_CDEFINE() { get_abi_var CDEFINE ${@}; } 199get_abi_CDEFINE() { get_abi_var CDEFINE "$@"; }
186get_abi_LIBDIR() { get_abi_var LIBDIR ${@}; } 200get_abi_LIBDIR() { get_abi_var LIBDIR "$@"; }
187 201
188# 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
189# the last one in the list being the default. 203# the last one in the list being the default.
190get_abi_order() {
191 ewarn "Please update your ebuild to use get_install_abis instead of get_abi_order"
192 get_install_abis ${@}
193}
194
195get_install_abis() { 204get_install_abis() {
196 local order="" 205 local order=""
197 206
198 if [ -z "${MULTILIB_ABIS}" ]; then 207 if [[ -z ${MULTILIB_ABIS} ]] ; then
199 echo "NOMULTILIB" 208 echo "default"
200 return 1 209 return 0
201 fi 210 fi
202 211
203 if hasq multilib-pkg-force ${RESTRICT} || 212 if hasq multilib-pkg-force ${RESTRICT} ||
204 { hasq multilib-pkg ${FEATURES} && hasq multilib-pkg ${RESTRICT}; }; then 213 { hasq multilib-pkg ${FEATURES} && hasq multilib-pkg ${RESTRICT}; }; then
205 for x in ${MULTILIB_ABIS}; do 214 for x in ${MULTILIB_ABIS} ; do
206 if [ "${x}" != "${DEFAULT_ABI}" ]; then 215 if [[ ${x} != "${DEFAULT_ABI}" ]] ; then
207 hasq ${x} ${ABI_DENY} || ordera="${ordera} ${x}" 216 hasq ${x} ${ABI_DENY} || ordera="${ordera} ${x}"
208 fi 217 fi
209 done 218 done
210 hasq ${DEFAULT_ABI} ${ABI_DENY} || order="${ordera} ${DEFAULT_ABI}" 219 hasq ${DEFAULT_ABI} ${ABI_DENY} || order="${ordera} ${DEFAULT_ABI}"
211 220
212 if [ -n "${ABI_ALLOW}" ]; then 221 if [[ -n ${ABI_ALLOW} ]] ; then
213 local ordera="" 222 local ordera=""
214 for x in ${order}; do 223 for x in ${order} ; do
215 if hasq ${x} ${ABI_ALLOW}; then 224 if hasq ${x} ${ABI_ALLOW} ; then
216 ordera="${ordera} ${x}" 225 ordera="${ordera} ${x}"
217 fi 226 fi
218 done 227 done
219 order="${ordera}" 228 order=${ordera}
220 fi 229 fi
221 else 230 else
222 order="${DEFAULT_ABI}" 231 order=${DEFAULT_ABI}
223 fi 232 fi
224 233
225 if [ -z "${order}" ]; then 234 if [[ -z ${order} ]] ; then
226 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."
227 fi 236 fi
228 237
229 echo ${order} 238 echo ${order}
230 return 0 239 return 0
234# the last one in the list being the default. 243# the last one in the list being the default.
235get_all_abis() { 244get_all_abis() {
236 local order="" 245 local order=""
237 246
238 if [ -z "${MULTILIB_ABIS}" ]; then 247 if [ -z "${MULTILIB_ABIS}" ]; then
239 echo "NOMULTILIB" 248 echo "default"
240 return 1 249 return 0
241 fi 250 fi
242 251
243 for x in ${MULTILIB_ABIS}; do 252 for x in ${MULTILIB_ABIS}; do
244 if [ "${x}" != "${DEFAULT_ABI}" ]; then 253 if [ "${x}" != "${DEFAULT_ABI}" ]; then
245 order="${order:+${order }}${x}" 254 order="${order:+${order }}${x}"
262 if has_multilib_profile; then 271 if has_multilib_profile; then
263 for abi in ${MULTILIB_ABIS}; do 272 for abi in ${MULTILIB_ABIS}; do
264 [ "$(get_abi_LIBDIR ${abi})" != "lib" ] && libdirs="${libdirs} $(get_abi_LIBDIR ${abi})" 273 [ "$(get_abi_LIBDIR ${abi})" != "lib" ] && libdirs="${libdirs} $(get_abi_LIBDIR ${abi})"
265 done 274 done
266 elif [ -n "${CONF_LIBDIR}" ]; then 275 elif [ -n "${CONF_LIBDIR}" ]; then
267 for dir in ${CONF_LIBDIR} ${CONF_MULTILIBDIR:=lib32}; do 276 for dir in ${CONF_LIBDIR} ${CONF_MULTILIBDIR:-lib32}; do
268 [ "${dir}" != "lib" ] && libdirs="${libdirs} ${dir}" 277 [ "${dir}" != "lib" ] && libdirs="${libdirs} ${dir}"
269 done 278 done
270 fi 279 fi
271 280
272 echo "${libdirs}" 281 echo "${libdirs}"
274 283
275# 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
276# using the new multilib configuration. This can be used to determine 285# using the new multilib configuration. This can be used to determine
277# 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}
278is_final_abi() { 287is_final_abi() {
279 ! has_multilib_profile && return 0 288 has_multilib_profile || return 0
280 local ALL_ABIS=$(get_abi_order) 289 local ALL_ABIS=$(get_install_abis)
281 local LAST_ABI=${ALL_ABIS/* /} 290 local LAST_ABI=${ALL_ABIS/* /}
282 [ "${LAST_ABI}" = "${ABI}" ] 291 [[ ${LAST_ABI} == ${ABI} ]]
283} 292}
284 293
285# echo the number of ABIs we will be installing for 294# echo the number of ABIs we will be installing for
286number_abis() { 295number_abis() {
287 get_abi_order | wc -w 296 get_install_abis | wc -w
288} 297}
289 298
290# get_ml_incdir [<include dir> [<ABI>]] 299# get_ml_incdir [<include dir> [<ABI>]]
291# include dir defaults to /usr/include 300# include dir defaults to /usr/include
292# ABI defaults to ${ABI} or ${DEFAULT_ABI} 301# ABI defaults to ${ABI} or ${DEFAULT_ABI}
293get_ml_incdir() { 302get_ml_incdir() {
294 local dir=/usr/include 303 local dir=/usr/include
295 304
296 if [[ ${#} -gt 0 ]]; then 305 if [[ $# -gt 0 ]]; then
297 incdir=${1} 306 incdir=$1
298 shift 307 shift
299 fi 308 fi
300 309
301 if [[ -z "${MULTILIB_ABIS}" ]]; then 310 if [[ -z "${MULTILIB_ABIS}" ]]; then
302 echo ${incdir} 311 echo ${incdir}
303 return 0 312 return 0
304 fi 313 fi
305 314
306 local abi=${ABI:-${DEFAULT_ABI}} 315 local abi=${ABI-${DEFAULT_ABI}}
307 if [[ ${#} -gt 0 ]]; then 316 if [[ $# -gt 0 ]]; then
308 abi=${1} 317 abi=$1
309 shift 318 shift
310 fi 319 fi
311 320
312 if [[ -d "${dir}/gentoo-multilib/${abi}" ]]; then 321 if [[ -d "${dir}/gentoo-multilib/${abi}" ]]; then
313 echo ${dir}/gentoo-multilib/${abi} 322 echo ${dir}/gentoo-multilib/${abi}
330# ... 339# ...
331# prep_ml_includes /usr/qt/3/include 340# prep_ml_includes /usr/qt/3/include
332# } 341# }
333 342
334prep_ml_includes() { 343prep_ml_includes() {
335 if [ $(number_abis) -gt 1 ]; then 344 if [[ $(number_abis) -gt 1 ]] ; then
336 local dir 345 local dir
337 local dirs 346 local dirs
338 local base 347 local base
339 348
340 if [ ${#} -eq 0 ]; then 349 if [[ $# -eq 0 ]] ; then
341 dirs="/usr/include" 350 dirs=/usr/include
342 else 351 else
343 dirs="${@}" 352 dirs="$@"
344 fi 353 fi
345 354
346 for dir in ${dirs}; do 355 for dir in ${dirs} ; do
347 base=${T}/gentoo-multilib/${dir}/gentoo-multilib 356 base=${T}/gentoo-multilib/${dir}/gentoo-multilib
348 mkdir -p ${base} 357 mkdir -p "${base}"
349 [ -d ${base}/${ABI} ] && rm -rf ${base}/${ABI} 358 [[ -d ${base}/${ABI} ]] && rm -rf "${base}/${ABI}"
350 mv ${D}/${dir} ${base}/${ABI} 359 mv "${D}/${dir}" "${base}/${ABI}"
351 done 360 done
352 361
353 if is_final_abi; then 362 if is_final_abi; then
354 base=${T}/gentoo-multilib 363 base=${T}/gentoo-multilib
355 pushd ${base} 364 pushd "${base}"
356 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}
357 popd 366 popd
358 367
368 # This 'set' stuff is required by mips profiles to properly pass
369 # CDEFINE's (which have spaces) to sub-functions
370 set --
359 for dir in ${dirs}; do 371 for dir in ${dirs} ; do
360 local args=${dir} 372 set -- "$@" "${dir}"
361 local abi 373 local abi
362 for abi in $(get_abi_order); do 374 for abi in $(get_install_abis); do
363 args="${args} $(get_abi_CDEFINE ${abi}):${dir}/gentoo-multilib/${abi}" 375 set -- "$@" "$(get_abi_CDEFINE ${abi}):${dir}/gentoo-multilib/${abi}"
364 done 376 done
365 create_ml_includes ${args} 377 create_ml_includes "$@"
366 done 378 done
367 fi 379 fi
368 fi 380 fi
369} 381}
370 382
377# 389#
378# Example: 390# Example:
379# 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
380# 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
381create_ml_includes() { 393create_ml_includes() {
382 local dest="${1}" 394 local dest=$1
383 shift 395 shift
384 local mlinfo="${@}"
385 local basedirs=$(create_ml_includes-listdirs ${mlinfo}) 396 local basedirs=$(create_ml_includes-listdirs "$@")
386 397
387 create_ml_includes-makedestdirs ${dest} ${basedirs} 398 create_ml_includes-makedestdirs ${dest} ${basedirs}
388 399
389 local file 400 local file
390 for file in $(create_ml_includes-allfiles ${basedirs}); do 401 for file in $(create_ml_includes-allfiles ${basedirs}) ; do
391 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')
392 { 403 (
393 echo "/* Common header file autogenerated by create_ml_includes in multilib.eclass */" 404 echo "/* Autogenerated by create_ml_includes() in multilib.eclass */"
394 #echo "#ifndef __CREATE_ML_INCLUDES_STUB_${name}__"
395 #echo "#define __CREATE_ML_INCLUDES_STUB_${name}__"
396 #echo ""
397 405
398 local dir 406 local dir
399 for dir in ${basedirs}; do 407 for dir in ${basedirs}; do
400 if [ -f "${D}/${dir}/${file}" ]; then 408 if [[ -f ${D}/${dir}/${file} ]] ; then
401 echo "#ifdef $(create_ml_includes-sym_for_dir ${dir} ${mlinfo})"
402 echo "#include \"$(create_ml_includes-relative_between ${dest}/$(dirname ${file}) ${dir}/${file})\""
403 echo "#endif /* $(create_ml_includes-sym_for_dir ${dir} ${mlinfo}) */"
404 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} */"
405 fi 420 fi
406 done 421 done
407 422
408 #echo "#endif /* __CREATE_ML_INCLUDES_STUB_${name}__ */" 423 #echo "#endif /* __CREATE_ML_INCLUDES_STUB_${name}__ */"
409 } > ${D}/${dest}/${file} 424 ) > "${D}/${dest}/${file}"
410 done 425 done
411} 426}
412 427
413# Helper function for create_ml_includes 428# Helper function for create_ml_includes
414create_ml_includes-relative_between() { 429create_ml_includes-absolute() {
415 local src="$(create_ml_includes-tidy_path ${1})"
416 local dst="$(create_ml_includes-tidy_path ${2})" 430 local dst="$(create_ml_includes-tidy_path $1)"
417 431
418 src=(${src//\// })
419 dst=(${dst//\// }) 432 dst=(${dst//\// })
420 433
421 local i 434 local i
422 for ((i=0; i<${#src[*]}; i++)); do 435 for ((i=0; i<${#dst[*]}; i++)); do
423 [ "${dst[i]}" != "${src[i]}" ] && break 436 [ "${dst[i]}" == "include" ] && break
424 done 437 done
425 438
426 local common=$i 439 local strip_upto=$i
427 440
428 for ((i=${#src[*]}; i>common; i--)); do
429 echo -n ../
430 done
431
432 for ((i=common; i<${#dst[*]}-1; i++)); do 441 for ((i=strip_upto+1; i<${#dst[*]}-1; i++)); do
433 echo -n ${dst[i]}/ 442 echo -n ${dst[i]}/
434 done 443 done
435 444
436 echo -n ${dst[i]} 445 echo -n ${dst[i]}
437} 446}
438 447
439# Helper function for create_ml_includes 448# Helper function for create_ml_includes
440create_ml_includes-tidy_path() { 449create_ml_includes-tidy_path() {
441 local removed="${1}" 450 local removed=$1
442 451
443 if [ -n "${removed}" ]; then 452 if [ -n "${removed}" ]; then
444 # Remove multiple slashes 453 # Remove multiple slashes
445 while [ "${removed}" != "${removed/\/\//\/}" ]; do 454 while [ "${removed}" != "${removed/\/\//\/}" ]; do
446 removed=${removed/\/\//\/} 455 removed=${removed/\/\//\/}
463 # Remove trailing .. 472 # Remove trailing ..
464 [ "${removed##*/}" = ".." ] && removed=${removed%/*/*} 473 [ "${removed##*/}" = ".." ] && removed=${removed%/*/*}
465 474
466 # Remove trailing / 475 # Remove trailing /
467 [ "${removed##*/}" = "" ] && removed=${removed%/*} 476 [ "${removed##*/}" = "" ] && removed=${removed%/*}
468 477
469 echo ${removed} 478 echo ${removed}
470 fi 479 fi
471} 480}
472 481
473# Helper function for create_ml_includes 482# Helper function for create_ml_includes
474create_ml_includes-listdirs() { 483create_ml_includes-listdirs() {
475 local dirs 484 local dirs
476 local data 485 local data
477 for data in ${@}; do 486 for data in "$@"; do
478 dirs="${dirs} ${data/*:/}" 487 dirs="${dirs} ${data/*:/}"
479 done 488 done
480 echo ${dirs:1} 489 echo ${dirs:1}
481} 490}
482 491
483# Helper function for create_ml_includes 492# Helper function for create_ml_includes
484create_ml_includes-makedestdirs() { 493create_ml_includes-makedestdirs() {
485 local dest=${1} 494 local dest=$1
486 shift 495 shift
487 local basedirs=${@} 496 local basedirs=$@
488 497
489 dodir ${dest} 498 dodir ${dest}
490 499
491 local basedir 500 local basedir
492 for basedir in ${basedirs}; do 501 for basedir in ${basedirs}; do
497 done 506 done
498} 507}
499 508
500# Helper function for create_ml_includes 509# Helper function for create_ml_includes
501create_ml_includes-allfiles() { 510create_ml_includes-allfiles() {
502 local basedirs=${@}
503
504 local basedir 511 local basedir file
505 for basedir in ${basedirs}; do 512 for basedir in "$@" ; do
506 local file
507 for file in $(find ${D}/${basedir} -type f); do 513 for file in $(find "${D}"/${basedir} -type f); do
508 echo ${file/${D}\/${basedir}\//} 514 echo ${file/${D}\/${basedir}\//}
509 done 515 done
510 done | sort | uniq 516 done | sort | uniq
511} 517}
512 518
513# Helper function for create_ml_includes 519# Helper function for create_ml_includes
514create_ml_includes-sym_for_dir() { 520create_ml_includes-sym_for_dir() {
515 local dir="${1}" 521 local dir=$1
516 shift 522 shift
517 local data 523 local data
518 for data in ${@}; do 524 for data in "$@"; do
519 if [ "${dir}" = "${data/*:/}" ]; then 525 if [[ ${data} == *:${dir} ]] ; then
520 echo ${data/:*/} 526 echo ${data/:*/}
521 return 0 527 return 0
522 fi 528 fi
523 done 529 done
524 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 $@"
525 # exit because we'll likely be called from a subshell 531 # exit because we'll likely be called from a subshell
526 exit 1 532 exit 1
527} 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.17  
changed lines
  Added in v.1.38

  ViewVC Help
Powered by ViewVC 1.1.20