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

Diff of /eclass/multilib.eclass

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

Revision 1.31 Revision 1.40
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.31 2005/08/08 20:07:43 kito Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/multilib.eclass,v 1.40 2005/10/07 05:37:16 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
10 9
11DESCRIPTION="Based on the ${ECLASS} eclass" 10DESCRIPTION="Based on the ${ECLASS} eclass"
12 11
13# has_multilib_profile: 12# has_multilib_profile:
14# 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
… …
83# Example: 82# Example:
84# 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
85# 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
86 85
87# get_libname [version] 86# get_libname [version]
88# returns libname with proper suffix {.so,.dylib} and optionally supplied version 87# returns libname with proper suffix {.so,.dylib} and optionally supplied version
89# for ELF/MACH-O shared objects 88# for ELF/MACH-O shared objects
90# 89#
91# Example: 90# Example:
92# get_libname libfoo ${PV} 91# get_libname libfoo ${PV}
93# Returns: libfoo.so.${PV} (ELF) || libfoo.${PV}.dylib (MACH) 92# Returns: libfoo.so.${PV} (ELF) || libfoo.${PV}.dylib (MACH)
… …
95### END DOCUMENTATION ### 94### END DOCUMENTATION ###
96 95
97# Defaults: 96# Defaults:
98export MULTILIB_ABIS=${MULTILIB_ABIS:-"default"} 97export MULTILIB_ABIS=${MULTILIB_ABIS:-"default"}
99export DEFAULT_ABI=${DEFAULT_ABI:-"default"} 98export DEFAULT_ABI=${DEFAULT_ABI:-"default"}
100# This causes econf to set --libdir=/usr/lib where it didn't before
101#export ABI=${ABI:-"default"}
102export CFLAGS_default 99export CFLAGS_default
103export LDFLAGS_default 100export LDFLAGS_default
104export CHOST_default=${CHOST_default:-${CHOST}} 101export CHOST_default=${CHOST_default:-${CHOST}}
102export CTARGET_default=${CTARGET_default:-${CTARGET:-${CHOST_default}}}
105export LIBDIR_default=${CONF_LIBDIR:-"lib"} 103export LIBDIR_default=${CONF_LIBDIR:-"lib"}
106export CDEFINE_default="__unix__" 104export CDEFINE_default="__unix__"
107 105
108# has_multilib_profile() 106# has_multilib_profile()
109has_multilib_profile() { 107has_multilib_profile() {
… …
175# 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.
176# 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.
177# 175#
178# Jeremy Huddleston <eradicator@gentoo.org> 176# Jeremy Huddleston <eradicator@gentoo.org>
179get_abi_var() { 177get_abi_var() {
180 local flag=${1} 178 local flag=$1
181 local abi 179 local abi
182 if [ $# -gt 1 ]; then 180 if [ $# -gt 1 ]; then
183 abi=${2} 181 abi=${2}
184 elif [ -n "${ABI}" ]; then 182 elif [ -n "${ABI}" ]; then
185 abi=${ABI} 183 abi=${ABI}
… …
191 189
192 local var="${flag}_${abi}" 190 local var="${flag}_${abi}"
193 echo ${!var} 191 echo ${!var}
194} 192}
195 193
196get_abi_CFLAGS() { get_abi_var CFLAGS "${@}"; } 194get_abi_CFLAGS() { get_abi_var CFLAGS "$@"; }
197get_abi_LDFLAGS() { get_abi_var LDFLAGS "${@}"; } 195get_abi_LDFLAGS() { get_abi_var LDFLAGS "$@"; }
198get_abi_CHOST() { get_abi_var CHOST "${@}"; } 196get_abi_CHOST() { get_abi_var CHOST "$@"; }
197get_abi_CTARGET() { get_abi_var CTARGET "$@"; }
199get_abi_FAKE_TARGETS() { get_abi_var FAKE_TARGETS "${@}"; } 198get_abi_FAKE_TARGETS() { get_abi_var FAKE_TARGETS "$@"; }
200get_abi_CDEFINE() { get_abi_var CDEFINE "${@}"; } 199get_abi_CDEFINE() { get_abi_var CDEFINE "$@"; }
201get_abi_LIBDIR() { get_abi_var LIBDIR "${@}"; } 200get_abi_LIBDIR() { get_abi_var LIBDIR "$@"; }
202 201
203# 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
204# the last one in the list being the default. 203# the last one in the list being the default.
205get_install_abis() { 204get_install_abis() {
206 local order="" 205 local order=""
207 206
208 if [ -z "${MULTILIB_ABIS}" ]; then 207 if [[ -z ${MULTILIB_ABIS} ]] ; then
209 echo "default" 208 echo "default"
210 return 0 209 return 0
211 fi 210 fi
212 211
213 if hasq multilib-pkg-force ${RESTRICT} || 212 if hasq multilib-pkg-force ${RESTRICT} ||
214 { hasq multilib-pkg ${FEATURES} && hasq multilib-pkg ${RESTRICT}; }; then 213 { hasq multilib-pkg ${FEATURES} && hasq multilib-pkg ${RESTRICT}; }; then
215 for x in ${MULTILIB_ABIS}; do 214 for x in ${MULTILIB_ABIS} ; do
216 if [ "${x}" != "${DEFAULT_ABI}" ]; then 215 if [[ ${x} != "${DEFAULT_ABI}" ]] ; then
217 hasq ${x} ${ABI_DENY} || ordera="${ordera} ${x}" 216 hasq ${x} ${ABI_DENY} || ordera="${ordera} ${x}"
218 fi 217 fi
219 done 218 done
220 hasq ${DEFAULT_ABI} ${ABI_DENY} || order="${ordera} ${DEFAULT_ABI}" 219 hasq ${DEFAULT_ABI} ${ABI_DENY} || order="${ordera} ${DEFAULT_ABI}"
221 220
222 if [ -n "${ABI_ALLOW}" ]; then 221 if [[ -n ${ABI_ALLOW} ]] ; then
223 local ordera="" 222 local ordera=""
224 for x in ${order}; do 223 for x in ${order} ; do
225 if hasq ${x} ${ABI_ALLOW}; then 224 if hasq ${x} ${ABI_ALLOW} ; then
226 ordera="${ordera} ${x}" 225 ordera="${ordera} ${x}"
227 fi 226 fi
228 done 227 done
229 order="${ordera}" 228 order=${ordera}
230 fi 229 fi
231 else 230 else
232 order="${DEFAULT_ABI}" 231 order=${DEFAULT_ABI}
233 fi 232 fi
234 233
235 if [ -z "${order}" ]; then 234 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." 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."
237 fi 236 fi
238 237
239 echo ${order} 238 echo ${order}
240 return 0 239 return 0
… …
243# Return a list of the ABIs supported by this profile. 242# Return a list of the ABIs supported by this profile.
244# the last one in the list being the default. 243# the last one in the list being the default.
245get_all_abis() { 244get_all_abis() {
246 local order="" 245 local order=""
247 246
248 if [ -z "${MULTILIB_ABIS}" ]; then 247 if [[ -z ${MULTILIB_ABIS} ]] ; then
249 echo "default" 248 echo "default"
250 return 0 249 return 0
251 fi 250 fi
252 251
253 for x in ${MULTILIB_ABIS}; do 252 for x in ${MULTILIB_ABIS}; do
254 if [ "${x}" != "${DEFAULT_ABI}" ]; then 253 if [[ ${x} != ${DEFAULT_ABI} ]] ; then
255 order="${order:+${order }}${x}" 254 order="${order:+${order} }${x}"
256 fi 255 fi
257 done 256 done
258 order="${order:+${order} }${DEFAULT_ABI}" 257 order="${order:+${order} }${DEFAULT_ABI}"
259 258
260 echo ${order} 259 echo ${order}
… …
301# include dir defaults to /usr/include 300# include dir defaults to /usr/include
302# ABI defaults to ${ABI} or ${DEFAULT_ABI} 301# ABI defaults to ${ABI} or ${DEFAULT_ABI}
303get_ml_incdir() { 302get_ml_incdir() {
304 local dir=/usr/include 303 local dir=/usr/include
305 304
306 if [[ ${#} -gt 0 ]]; then 305 if [[ $# -gt 0 ]]; then
307 incdir=${1} 306 incdir=$1
308 shift 307 shift
309 fi 308 fi
310 309
311 if [[ -z "${MULTILIB_ABIS}" ]]; then 310 if [[ -z "${MULTILIB_ABIS}" ]]; then
312 echo ${incdir} 311 echo ${incdir}
313 return 0 312 return 0
314 fi 313 fi
315 314
316 local abi=${ABI-${DEFAULT_ABI}} 315 local abi=${ABI-${DEFAULT_ABI}}
317 if [[ ${#} -gt 0 ]]; then 316 if [[ $# -gt 0 ]]; then
318 abi=${1} 317 abi=$1
319 shift 318 shift
320 fi 319 fi
321 320
322 if [[ -d "${dir}/gentoo-multilib/${abi}" ]]; then 321 if [[ -d "${dir}/gentoo-multilib/${abi}" ]]; then
323 echo ${dir}/gentoo-multilib/${abi} 322 echo ${dir}/gentoo-multilib/${abi}
… …
340# ... 339# ...
341# prep_ml_includes /usr/qt/3/include 340# prep_ml_includes /usr/qt/3/include
342# } 341# }
343 342
344prep_ml_includes() { 343prep_ml_includes() {
345 if [ $(number_abis) -gt 1 ]; then 344 if [[ $(number_abis) -gt 1 ]] ; then
346 local dir 345 local dir
347 local dirs 346 local dirs
348 local base 347 local base
349 348
350 if [ ${#} -eq 0 ]; then 349 if [[ $# -eq 0 ]] ; then
351 dirs="/usr/include" 350 dirs=/usr/include
352 else 351 else
353 dirs="${@}" 352 dirs="$@"
354 fi 353 fi
355 354
356 for dir in ${dirs}; do 355 for dir in ${dirs} ; do
357 base=${T}/gentoo-multilib/${dir}/gentoo-multilib 356 base=${T}/gentoo-multilib/${dir}/gentoo-multilib
358 mkdir -p ${base} 357 mkdir -p "${base}"
359 [ -d ${base}/${ABI} ] && rm -rf ${base}/${ABI} 358 [[ -d ${base}/${ABI} ]] && rm -rf "${base}/${ABI}"
360 mv ${D}/${dir} ${base}/${ABI} 359 mv "${D}/${dir}" "${base}/${ABI}"
361 done 360 done
362 361
363 if is_final_abi; then 362 if is_final_abi; then
364 base=${T}/gentoo-multilib 363 base=${T}/gentoo-multilib
365 pushd ${base} 364 pushd "${base}"
366 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}
367 popd 366 popd
368 367
368 # This 'set' stuff is required by mips profiles to properly pass
369 # CDEFINE's (which have spaces) to sub-functions
370 set --
369 for dir in ${dirs}; do 371 for dir in ${dirs} ; do
370 local args=${dir} 372 set -- "$@" "${dir}"
371 local abi 373 local abi
372 for abi in $(get_install_abis); do 374 for abi in $(get_install_abis); do
373 args="${args} $(get_abi_CDEFINE ${abi}):${dir}/gentoo-multilib/${abi}" 375 set -- "$@" "$(get_abi_CDEFINE ${abi}):${dir}/gentoo-multilib/${abi}"
374 done 376 done
375 create_ml_includes ${args} 377 create_ml_includes "$@"
376 done 378 done
377 fi 379 fi
378 fi 380 fi
379} 381}
380 382
… …
387# 389#
388# Example: 390# Example:
389# 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
390# 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
391create_ml_includes() { 393create_ml_includes() {
392 local dest="${1}" 394 local dest=$1
393 shift 395 shift
394 local mlinfo="${@}"
395 local basedirs=$(create_ml_includes-listdirs ${mlinfo}) 396 local basedirs=$(create_ml_includes-listdirs "$@")
396 397
397 create_ml_includes-makedestdirs ${dest} ${basedirs} 398 create_ml_includes-makedestdirs ${dest} ${basedirs}
398 399
399 local file 400 local file
400 for file in $(create_ml_includes-allfiles ${basedirs}); do 401 for file in $(create_ml_includes-allfiles ${basedirs}) ; do
401 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')
402 { 403 (
403 echo "/* Common header file autogenerated by create_ml_includes in multilib.eclass */" 404 echo "/* Autogenerated by create_ml_includes() in multilib.eclass */"
404 405
405 local dir 406 local dir
406 for dir in ${basedirs}; do 407 for dir in ${basedirs}; do
407 if [ -f "${D}/${dir}/${file}" ]; then 408 if [[ -f ${D}/${dir}/${file} ]] ; then
409 echo ""
408 local sym=$(create_ml_includes-sym_for_dir ${dir} ${mlinfo}) 410 local sym=$(create_ml_includes-sym_for_dir ${dir} "$@")
411 if [[ ${sym/=} != "${sym}" ]] ; then
412 echo "#if ${sym}"
409 if [[ ${sym::1} == "!" ]]; then 413 elif [[ ${sym::1} == "!" ]] ; then
410 echo "#ifndef ${sym:1}" 414 echo "#ifndef ${sym:1}"
411 else 415 else
412 echo "#ifdef ${sym}" 416 echo "#ifdef ${sym}"
413 fi 417 fi
414 echo "#include <$(create_ml_includes-absolute ${dir}/${file})>" 418 echo "# include <$(create_ml_includes-absolute ${dir}/${file})>"
415 echo "#endif /* ${sym} */" 419 echo "#endif /* ${sym} */"
416 echo ""
417 fi 420 fi
418 done 421 done
419 422
420 #echo "#endif /* __CREATE_ML_INCLUDES_STUB_${name}__ */" 423 #echo "#endif /* __CREATE_ML_INCLUDES_STUB_${name}__ */"
421 } > ${D}/${dest}/${file} 424 ) > "${D}/${dest}/${file}"
422 done 425 done
423} 426}
424 427
425# Helper function for create_ml_includes 428# Helper function for create_ml_includes
426create_ml_includes-absolute() { 429create_ml_includes-absolute() {
427 local dst="$(create_ml_includes-tidy_path ${1})" 430 local dst="$(create_ml_includes-tidy_path $1)"
428 431
429 dst=(${dst//\// }) 432 dst=(${dst//\// })
430 433
431 local i 434 local i
432 for ((i=0; i<${#dst[*]}; i++)); do 435 for ((i=0; i<${#dst[*]}; i++)); do
… …
442 echo -n ${dst[i]} 445 echo -n ${dst[i]}
443} 446}
444 447
445# Helper function for create_ml_includes 448# Helper function for create_ml_includes
446create_ml_includes-tidy_path() { 449create_ml_includes-tidy_path() {
447 local removed="${1}" 450 local removed=$1
448 451
449 if [ -n "${removed}" ]; then 452 if [ -n "${removed}" ]; then
450 # Remove multiple slashes 453 # Remove multiple slashes
451 while [ "${removed}" != "${removed/\/\//\/}" ]; do 454 while [ "${removed}" != "${removed/\/\//\/}" ]; do
452 removed=${removed/\/\//\/} 455 removed=${removed/\/\//\/}
… …
478 481
479# Helper function for create_ml_includes 482# Helper function for create_ml_includes
480create_ml_includes-listdirs() { 483create_ml_includes-listdirs() {
481 local dirs 484 local dirs
482 local data 485 local data
483 for data in ${@}; do 486 for data in "$@"; do
484 dirs="${dirs} ${data/*:/}" 487 dirs="${dirs} ${data/*:/}"
485 done 488 done
486 echo ${dirs:1} 489 echo ${dirs:1}
487} 490}
488 491
489# Helper function for create_ml_includes 492# Helper function for create_ml_includes
490create_ml_includes-makedestdirs() { 493create_ml_includes-makedestdirs() {
491 local dest=${1} 494 local dest=$1
492 shift 495 shift
493 local basedirs=${@} 496 local basedirs=$@
494 497
495 dodir ${dest} 498 dodir ${dest}
496 499
497 local basedir 500 local basedir
498 for basedir in ${basedirs}; do 501 for basedir in ${basedirs}; do
… …
503 done 506 done
504} 507}
505 508
506# Helper function for create_ml_includes 509# Helper function for create_ml_includes
507create_ml_includes-allfiles() { 510create_ml_includes-allfiles() {
508 local basedirs=${@}
509
510 local basedir 511 local basedir file
511 for basedir in ${basedirs}; do 512 for basedir in "$@" ; do
512 local file
513 for file in $(find ${D}/${basedir} -type f); do 513 for file in $(find "${D}"/${basedir} -type f); do
514 echo ${file/${D}\/${basedir}\//} 514 echo ${file/${D}\/${basedir}\//}
515 done 515 done
516 done | sort | uniq 516 done | sort | uniq
517} 517}
518 518
519# Helper function for create_ml_includes 519# Helper function for create_ml_includes
520create_ml_includes-sym_for_dir() { 520create_ml_includes-sym_for_dir() {
521 local dir="${1}" 521 local dir=$1
522 shift 522 shift
523 local data 523 local data
524 for data in ${@}; do 524 for data in "$@"; do
525 if [ "${dir}" = "${data/*:/}" ]; then 525 if [[ ${data} == *:${dir} ]] ; then
526 echo ${data/:*/} 526 echo ${data/:*/}
527 return 0 527 return 0
528 fi 528 fi
529 done 529 done
530 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 $@"
531 # exit because we'll likely be called from a subshell 531 # exit because we'll likely be called from a subshell
532 exit 1 532 exit 1
533} 533}
534 534
535get_libname() { 535get_libname() {
… …
547 echo ".so.${ver}" 547 echo ".so.${ver}"
548 fi 548 fi
549 fi 549 fi
550} 550}
551 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.31  
changed lines
  Added in v.1.40
  ViewVC Help
Powered by ViewVC 1.1.13