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

Diff of /eclass/multilib.eclass

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

Revision 1.32 Revision 1.35
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.32 2005/08/22 16:20:30 swegener Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/multilib.eclass,v 1.35 2005/10/06 20:33:21 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.
100# This causes econf to set --libdir=/usr/lib where it didn't before 100# This causes econf to set --libdir=/usr/lib where it didn't before
101#export ABI=${ABI:-"default"} 101#export ABI=${ABI:-"default"}
102export CFLAGS_default 102export CFLAGS_default
103export LDFLAGS_default 103export LDFLAGS_default
104export CHOST_default=${CHOST_default:-${CHOST}} 104export CHOST_default=${CHOST_default:-${CHOST}}
105export CTARGET_default=${CTARGET_default:-${CTARGET}}
105export LIBDIR_default=${CONF_LIBDIR:-"lib"} 106export LIBDIR_default=${CONF_LIBDIR:-"lib"}
106export CDEFINE_default="__unix__" 107export CDEFINE_default="__unix__"
107 108
108# has_multilib_profile() 109# has_multilib_profile()
109has_multilib_profile() { 110has_multilib_profile() {
175# If <ABI> is not specified and ${ABI} is not defined, ${DEFAULT_ABI} is used. 176# If <ABI> is not specified and ${ABI} is not defined, ${DEFAULT_ABI} is used.
176# If <ABI> is not specified and ${ABI} and ${DEFAULT_ABI} are not defined, we return an empty string. 177# If <ABI> is not specified and ${ABI} and ${DEFAULT_ABI} are not defined, we return an empty string.
177# 178#
178# Jeremy Huddleston <eradicator@gentoo.org> 179# Jeremy Huddleston <eradicator@gentoo.org>
179get_abi_var() { 180get_abi_var() {
180 local flag=${1} 181 local flag=$1
181 local abi 182 local abi
182 if [ $# -gt 1 ]; then 183 if [ $# -gt 1 ]; then
183 abi=${2} 184 abi=${2}
184 elif [ -n "${ABI}" ]; then 185 elif [ -n "${ABI}" ]; then
185 abi=${ABI} 186 abi=${ABI}
191 192
192 local var="${flag}_${abi}" 193 local var="${flag}_${abi}"
193 echo ${!var} 194 echo ${!var}
194} 195}
195 196
196get_abi_CFLAGS() { get_abi_var CFLAGS "${@}"; } 197get_abi_CFLAGS() { get_abi_var CFLAGS "$@"; }
197get_abi_LDFLAGS() { get_abi_var LDFLAGS "${@}"; } 198get_abi_LDFLAGS() { get_abi_var LDFLAGS "$@"; }
198get_abi_CHOST() { get_abi_var CHOST "${@}"; } 199get_abi_CHOST() { get_abi_var CHOST "$@"; }
199get_abi_FAKE_TARGETS() { get_abi_var FAKE_TARGETS "${@}"; } 200get_abi_FAKE_TARGETS() { get_abi_var FAKE_TARGETS "$@"; }
200get_abi_CDEFINE() { get_abi_var CDEFINE "${@}"; } 201get_abi_CDEFINE() { get_abi_var CDEFINE "$@"; }
201get_abi_LIBDIR() { get_abi_var LIBDIR "${@}"; } 202get_abi_LIBDIR() { get_abi_var LIBDIR "$@"; }
202 203
203# Return a list of the ABIs we want to install for with 204# Return a list of the ABIs we want to install for with
204# the last one in the list being the default. 205# the last one in the list being the default.
205get_install_abis() { 206get_install_abis() {
206 local order="" 207 local order=""
207 208
208 if [ -z "${MULTILIB_ABIS}" ]; then 209 if [[ -z ${MULTILIB_ABIS} ]] ; then
209 echo "default" 210 echo "default"
210 return 0 211 return 0
211 fi 212 fi
212 213
213 if hasq multilib-pkg-force ${RESTRICT} || 214 if hasq multilib-pkg-force ${RESTRICT} ||
214 { hasq multilib-pkg ${FEATURES} && hasq multilib-pkg ${RESTRICT}; }; then 215 { hasq multilib-pkg ${FEATURES} && hasq multilib-pkg ${RESTRICT}; }; then
215 for x in ${MULTILIB_ABIS}; do 216 for x in ${MULTILIB_ABIS} ; do
216 if [ "${x}" != "${DEFAULT_ABI}" ]; then 217 if [[ ${x} != "${DEFAULT_ABI}" ]] ; then
217 hasq ${x} ${ABI_DENY} || ordera="${ordera} ${x}" 218 hasq ${x} ${ABI_DENY} || ordera="${ordera} ${x}"
218 fi 219 fi
219 done 220 done
220 hasq ${DEFAULT_ABI} ${ABI_DENY} || order="${ordera} ${DEFAULT_ABI}" 221 hasq ${DEFAULT_ABI} ${ABI_DENY} || order="${ordera} ${DEFAULT_ABI}"
221 222
222 if [ -n "${ABI_ALLOW}" ]; then 223 if [[ -n ${ABI_ALLOW} ]] ; then
223 local ordera="" 224 local ordera=""
224 for x in ${order}; do 225 for x in ${order} ; do
225 if hasq ${x} ${ABI_ALLOW}; then 226 if hasq ${x} ${ABI_ALLOW} ; then
226 ordera="${ordera} ${x}" 227 ordera="${ordera} ${x}"
227 fi 228 fi
228 done 229 done
229 order="${ordera}" 230 order=${ordera}
230 fi 231 fi
231 else 232 else
232 order="${DEFAULT_ABI}" 233 order=${DEFAULT_ABI}
233 fi 234 fi
234 235
235 if [ -z "${order}" ]; then 236 if [[ -z ${order} ]] ; then
236 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." 237 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."
237 fi 238 fi
238 239
239 echo ${order} 240 echo ${order}
240 return 0 241 return 0
301# include dir defaults to /usr/include 302# include dir defaults to /usr/include
302# ABI defaults to ${ABI} or ${DEFAULT_ABI} 303# ABI defaults to ${ABI} or ${DEFAULT_ABI}
303get_ml_incdir() { 304get_ml_incdir() {
304 local dir=/usr/include 305 local dir=/usr/include
305 306
306 if [[ ${#} -gt 0 ]]; then 307 if [[ $# -gt 0 ]]; then
307 incdir=${1} 308 incdir=$1
308 shift 309 shift
309 fi 310 fi
310 311
311 if [[ -z "${MULTILIB_ABIS}" ]]; then 312 if [[ -z "${MULTILIB_ABIS}" ]]; then
312 echo ${incdir} 313 echo ${incdir}
313 return 0 314 return 0
314 fi 315 fi
315 316
316 local abi=${ABI-${DEFAULT_ABI}} 317 local abi=${ABI-${DEFAULT_ABI}}
317 if [[ ${#} -gt 0 ]]; then 318 if [[ $# -gt 0 ]]; then
318 abi=${1} 319 abi=$1
319 shift 320 shift
320 fi 321 fi
321 322
322 if [[ -d "${dir}/gentoo-multilib/${abi}" ]]; then 323 if [[ -d "${dir}/gentoo-multilib/${abi}" ]]; then
323 echo ${dir}/gentoo-multilib/${abi} 324 echo ${dir}/gentoo-multilib/${abi}
340# ... 341# ...
341# prep_ml_includes /usr/qt/3/include 342# prep_ml_includes /usr/qt/3/include
342# } 343# }
343 344
344prep_ml_includes() { 345prep_ml_includes() {
345 if [ $(number_abis) -gt 1 ]; then 346 if [[ $(number_abis) -gt 1 ]] ; then
346 local dir 347 local dir
347 local dirs 348 local dirs
348 local base 349 local base
349 350
350 if [ ${#} -eq 0 ]; then 351 if [[ $# -eq 0 ]] ; then
351 dirs="/usr/include" 352 dirs=/usr/include
352 else 353 else
353 dirs="${@}" 354 dirs="$@"
354 fi 355 fi
355 356
356 for dir in ${dirs}; do 357 for dir in ${dirs} ; do
357 base=${T}/gentoo-multilib/${dir}/gentoo-multilib 358 base=${T}/gentoo-multilib/${dir}/gentoo-multilib
358 mkdir -p ${base} 359 mkdir -p "${base}"
359 [ -d ${base}/${ABI} ] && rm -rf ${base}/${ABI} 360 [[ -d ${base}/${ABI} ]] && rm -rf "${base}/${ABI}"
360 mv ${D}/${dir} ${base}/${ABI} 361 mv "${D}/${dir}" "${base}/${ABI}"
361 done 362 done
362 363
363 if is_final_abi; then 364 if is_final_abi; then
364 base=${T}/gentoo-multilib 365 base=${T}/gentoo-multilib
365 pushd ${base} 366 pushd "${base}"
366 find . | tar -c -T - -f - | tar -x --no-same-owner -f - -C ${D} 367 find . | tar -c -T - -f - | tar -x --no-same-owner -f - -C ${D}
367 popd 368 popd
368 369
370 # This 'set' stuff is required by mips profiles to properly pass
371 # CDEFINE's (which have spaces) to sub-functions
372 set --
369 for dir in ${dirs}; do 373 for dir in ${dirs} ; do
370 local args=${dir} 374 set -- "$@" "${dir}"
371 local abi 375 local abi
372 for abi in $(get_install_abis); do 376 for abi in $(get_install_abis); do
373 args="${args} $(get_abi_CDEFINE ${abi}):${dir}/gentoo-multilib/${abi}" 377 set -- "$@" "$(get_abi_CDEFINE ${abi}):${dir}/gentoo-multilib/${abi}"
374 done 378 done
375 create_ml_includes ${args} 379 create_ml_includes "$@"
376 done 380 done
377 fi 381 fi
378 fi 382 fi
379} 383}
380 384
387# 391#
388# Example: 392# Example:
389# create_ml_includes /usr/include/asm __sparc__:/usr/include/asm-sparc __sparc64__:/usr/include/asm-sparc64 393# create_ml_includes /usr/include/asm __sparc__:/usr/include/asm-sparc __sparc64__:/usr/include/asm-sparc64
390# create_ml_includes /usr/include/asm __i386__:/usr/include/asm-i386 __x86_64__:/usr/include/asm-x86_64 394# create_ml_includes /usr/include/asm __i386__:/usr/include/asm-i386 __x86_64__:/usr/include/asm-x86_64
391create_ml_includes() { 395create_ml_includes() {
392 local dest="${1}" 396 local dest=$1
393 shift 397 shift
394 local mlinfo="${@}"
395 local basedirs=$(create_ml_includes-listdirs ${mlinfo}) 398 local basedirs=$(create_ml_includes-listdirs "$@")
396 399
397 create_ml_includes-makedestdirs ${dest} ${basedirs} 400 create_ml_includes-makedestdirs ${dest} ${basedirs}
398 401
399 local file 402 local file
400 for file in $(create_ml_includes-allfiles ${basedirs}); do 403 for file in $(create_ml_includes-allfiles ${basedirs}) ; do
401 local name="$(echo $file | tr a-z A-Z | sed 's:[^A-Z]:_:g')" 404 #local name=$(echo ${file} | tr '[:lower:]' '[:upper:]' | sed 's:[^[:upper:]]:_:g')
402 { 405 (
403 echo "/* Common header file autogenerated by create_ml_includes in multilib.eclass */" 406 echo "/* Autogenerated by create_ml_includes() in multilib.eclass */"
404 407
405 local dir 408 local dir
406 for dir in ${basedirs}; do 409 for dir in ${basedirs}; do
407 if [ -f "${D}/${dir}/${file}" ]; then 410 if [[ -f ${D}/${dir}/${file} ]] ; then
411 echo ""
408 local sym=$(create_ml_includes-sym_for_dir ${dir} ${mlinfo}) 412 local sym=$(create_ml_includes-sym_for_dir ${dir} "$@")
413 if [[ ${sym/=} != "${sym}" ]] ; then
414 echo "#if ${sym}"
409 if [[ ${sym::1} == "!" ]]; then 415 elif [[ ${sym::1} == "!" ]] ; then
410 echo "#ifndef ${sym:1}" 416 echo "#ifndef ${sym:1}"
411 else 417 else
412 echo "#ifdef ${sym}" 418 echo "#ifdef ${sym}"
413 fi 419 fi
414 echo "#include <$(create_ml_includes-absolute ${dir}/${file})>" 420 echo "# include <$(create_ml_includes-absolute ${dir}/${file})>"
415 echo "#endif /* ${sym} */" 421 echo "#endif /* ${sym} */"
416 echo ""
417 fi 422 fi
418 done 423 done
419 424
420 #echo "#endif /* __CREATE_ML_INCLUDES_STUB_${name}__ */" 425 #echo "#endif /* __CREATE_ML_INCLUDES_STUB_${name}__ */"
421 } > ${D}/${dest}/${file} 426 ) > "${D}/${dest}/${file}"
422 done 427 done
423} 428}
424 429
425# Helper function for create_ml_includes 430# Helper function for create_ml_includes
426create_ml_includes-absolute() { 431create_ml_includes-absolute() {
427 local dst="$(create_ml_includes-tidy_path ${1})" 432 local dst="$(create_ml_includes-tidy_path $1)"
428 433
429 dst=(${dst//\// }) 434 dst=(${dst//\// })
430 435
431 local i 436 local i
432 for ((i=0; i<${#dst[*]}; i++)); do 437 for ((i=0; i<${#dst[*]}; i++)); do
442 echo -n ${dst[i]} 447 echo -n ${dst[i]}
443} 448}
444 449
445# Helper function for create_ml_includes 450# Helper function for create_ml_includes
446create_ml_includes-tidy_path() { 451create_ml_includes-tidy_path() {
447 local removed="${1}" 452 local removed=$1
448 453
449 if [ -n "${removed}" ]; then 454 if [ -n "${removed}" ]; then
450 # Remove multiple slashes 455 # Remove multiple slashes
451 while [ "${removed}" != "${removed/\/\//\/}" ]; do 456 while [ "${removed}" != "${removed/\/\//\/}" ]; do
452 removed=${removed/\/\//\/} 457 removed=${removed/\/\//\/}
478 483
479# Helper function for create_ml_includes 484# Helper function for create_ml_includes
480create_ml_includes-listdirs() { 485create_ml_includes-listdirs() {
481 local dirs 486 local dirs
482 local data 487 local data
483 for data in ${@}; do 488 for data in "$@"; do
484 dirs="${dirs} ${data/*:/}" 489 dirs="${dirs} ${data/*:/}"
485 done 490 done
486 echo ${dirs:1} 491 echo ${dirs:1}
487} 492}
488 493
489# Helper function for create_ml_includes 494# Helper function for create_ml_includes
490create_ml_includes-makedestdirs() { 495create_ml_includes-makedestdirs() {
491 local dest=${1} 496 local dest=$1
492 shift 497 shift
493 local basedirs=${@} 498 local basedirs=$@
494 499
495 dodir ${dest} 500 dodir ${dest}
496 501
497 local basedir 502 local basedir
498 for basedir in ${basedirs}; do 503 for basedir in ${basedirs}; do
503 done 508 done
504} 509}
505 510
506# Helper function for create_ml_includes 511# Helper function for create_ml_includes
507create_ml_includes-allfiles() { 512create_ml_includes-allfiles() {
508 local basedirs=${@}
509
510 local basedir 513 local basedir file
511 for basedir in ${basedirs}; do 514 for basedir in "$@" ; do
512 local file
513 for file in $(find ${D}/${basedir} -type f); do 515 for file in $(find "${D}"/${basedir} -type f); do
514 echo ${file/${D}\/${basedir}\//} 516 echo ${file/${D}\/${basedir}\//}
515 done 517 done
516 done | sort | uniq 518 done | sort | uniq
517} 519}
518 520
519# Helper function for create_ml_includes 521# Helper function for create_ml_includes
520create_ml_includes-sym_for_dir() { 522create_ml_includes-sym_for_dir() {
521 local dir="${1}" 523 local dir=$1
522 shift 524 shift
523 local data 525 local data
524 for data in ${@}; do 526 for data in "$@"; do
525 if [ "${dir}" = "${data/*:/}" ]; then 527 if [[ ${data} == *:${dir} ]] ; then
526 echo ${data/:*/} 528 echo ${data/:*/}
527 return 0 529 return 0
528 fi 530 fi
529 done 531 done
530 echo "Shouldn't be here -- create_ml_includes-sym_for_dir ${1} ${@}" 532 echo "Shouldn't be here -- create_ml_includes-sym_for_dir $1 $@"
531 # exit because we'll likely be called from a subshell 533 # exit because we'll likely be called from a subshell
532 exit 1 534 exit 1
533} 535}
534 536
535get_libname() { 537get_libname() {
547 echo ".so.${ver}" 549 echo ".so.${ver}"
548 fi 550 fi
549 fi 551 fi
550} 552}
551 553
554# This is for the toolchain to setup profile variables when pulling in
555# a crosscompiler (and thus they aren't set in the profile)
556multilib_env() {
557 local CTARGET=$1
558 local CTARGET_post=${CTARGET#*-}
559
560 case $(tc-arch ${CTARGET}) in
561 amd64)
562 export CFLAGS_x86=${CFLAGS_x86--m32}
563 export CHOST_x86=i686-${CTARGET_post}
564 export CTARGET_x86=i686-${CTARGET_post}
565 export CDEFINE_x86="__i386__"
566 export LIBDIR_x86="lib"
567
568 export CFLAGS_amd64=${CFLAGS_amd64--m64}
569 export CHOST_amd64=x86_64-${CTARGET_post}
570 export CTARGET_amd64=x86_64-${CTARGET_post}
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 mips)
578 export CFLAGS_o32=${CFLAGS_o32--mabi=32}
579 export CHOST_o32=mips-${CTARGET_post}
580 export CTARGET_o32=mips-${CTARGET_post}
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=mips64-${CTARGET_post}
586 export CTARGET_n32=mips64-${CTARGET_post}
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=mips64-${CTARGET_post}
592 export CTARGET_n64=mips64-${CTARGET_post}
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 ppc64)
600 export CFLAGS_ppc=${CFLAGS_ppc--m32}
601 export CHOST_ppc=powerpc-${CTARGET_post}
602 export CTARGET_ppc=powerpc-${CTARGET_post}
603 export CDEFINE_ppc="!__powerpc64__"
604 export LIBDIR_ppc="lib"
605
606 export CFLAGS_ppc64=${CFLAGS_ppc64--m64}
607 export CHOST_ppc64=powerpc64-${CTARGET_post}
608 export CTARGET_ppc64=powerpc64-${CTARGET_post}
609 export CDEFINE_ppc64="__powerpc64__"
610 export LIBDIR_ppc64="lib64"
611
612 export MULTILIB_ABIS="ppc64 ppc"
613 export DEFAULT_ABI="ppc64"
614 ;;
615 sparc)
616 export CFLAGS_sparc32=${CFLAGS_sparc32--m32}
617 export CHOST_sparc32=sparc-${CTARGET_post}
618 export CTARGET_sparc32=sparc-${CTARGET_post}
619 export CDEFINE_sparc32="!__arch64__"
620 export LIBDIR_sparc32="lib"
621
622 export CFLAGS_sparc64=${CFLAGS_sparc64--m64}
623 export CHOST_sparc64=sparc64-${CTARGET_post}
624 export CTARGET_sparc64=sparc64-${CTARGET_post}
625 export CDEFINE_sparc64="__arch64__"
626 export LIBDIR_sparc64="lib64"
627
628 export MULTILIB_ABIS="sparc64 sparc32"
629 export DEFAULT_ABI="sparc64"
630 ;;
631 *)
632 export MULTILIB_ABIS="default"
633 export DEFAULT_ABI="default"
634 esac
635}

Legend:
Removed from v.1.32  
changed lines
  Added in v.1.35

  ViewVC Help
Powered by ViewVC 1.1.20