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

Diff of /eclass/multilib.eclass

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

Revision 1.83 Revision 1.93
1# Copyright 1999-2008 Gentoo Foundation 1# Copyright 1999-2011 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.83 2011/03/10 04:29:58 vapier Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/multilib.eclass,v 1.93 2011/10/14 22:54:35 vapier Exp $
4 4
5# @ECLASS: multilib.eclass 5# @ECLASS: multilib.eclass
6# @MAINTAINER: 6# @MAINTAINER:
7# amd64@gentoo.org 7# amd64@gentoo.org
8# toolchain@gentoo.org 8# toolchain@gentoo.org
19export CFLAGS_default 19export CFLAGS_default
20export LDFLAGS_default 20export LDFLAGS_default
21export CHOST_default=${CHOST_default:-${CHOST}} 21export CHOST_default=${CHOST_default:-${CHOST}}
22export CTARGET_default=${CTARGET_default:-${CTARGET:-${CHOST_default}}} 22export CTARGET_default=${CTARGET_default:-${CTARGET:-${CHOST_default}}}
23export LIBDIR_default=${CONF_LIBDIR:-"lib"} 23export LIBDIR_default=${CONF_LIBDIR:-"lib"}
24export CDEFINE_default="__unix__"
25export KERNEL_ABI=${KERNEL_ABI:-${DEFAULT_ABI}} 24export KERNEL_ABI=${KERNEL_ABI:-${DEFAULT_ABI}}
26 25
27# @FUNCTION: has_multilib_profile 26# @FUNCTION: has_multilib_profile
28# @DESCRIPTION: 27# @DESCRIPTION:
29# Return true if the current profile is a multilib profile and lists more than 28# Return true if the current profile is a multilib profile and lists more than
56 else 55 else
57 get_abi_LIBDIR 56 get_abi_LIBDIR
58 fi 57 fi
59} 58}
60 59
61# @FUNCTION: get_multilibdir
62# @RETURN: Returns the multilibdir
63get_multilibdir() {
64 if has_multilib_profile; then
65 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"
66 exit 1
67 fi
68 echo ${CONF_MULTILIBDIR:=lib32}
69}
70
71# @FUNCTION: get_libdir_override
72# @DESCRIPTION:
73# Sometimes you need to override the value returned by get_libdir. A good
74# example of this is xorg-x11, where lib32 isnt a supported configuration,
75# and where lib64 -must- be used on amd64 (for applications that need lib
76# to be 32bit, such as adobe acrobat). Note that this override also bypasses
77# portage version sanity checking.
78# get_libdir_override expects one argument, the result get_libdir should
79# return:
80#
81# get_libdir_override lib64
82get_libdir_override() {
83 if has_multilib_profile; then
84 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"
85 exit 1
86 fi
87 CONF_LIBDIR="$1"
88 CONF_LIBDIR_OVERRIDE="$1"
89 LIBDIR_default="$1"
90}
91
92# @FUNCTION: get_abi_var 60# @FUNCTION: get_abi_var
93# @USAGE: <VAR> [ABI] 61# @USAGE: <VAR> [ABI]
94# @RETURN: returns the value of ${<VAR>_<ABI>} which should be set in make.defaults 62# @RETURN: returns the value of ${<VAR>_<ABI>} which should be set in make.defaults
63# @INTERNAL
95# @DESCRIPTION: 64# @DESCRIPTION:
96# ex: 65# ex:
97# CFLAGS=$(get_abi_var CFLAGS sparc32) # CFLAGS=-m32 66# CFLAGS=$(get_abi_var CFLAGS sparc32) # CFLAGS=-m32
98# 67#
99# Note that the prefered method is to set CC="$(tc-getCC) $(get_abi_CFLAGS)" 68# Note that the prefered method is to set CC="$(tc-getCC) $(get_abi_CFLAGS)"
123# @USAGE: [ABI] 92# @USAGE: [ABI]
124# @DESCRIPTION: 93# @DESCRIPTION:
125# Alias for 'get_abi_var CFLAGS' 94# Alias for 'get_abi_var CFLAGS'
126get_abi_CFLAGS() { get_abi_var CFLAGS "$@"; } 95get_abi_CFLAGS() { get_abi_var CFLAGS "$@"; }
127 96
128# @FUNCTION: get_abi_ASFLAGS
129# @USAGE: [ABI]
130# @DESCRIPTION:
131# Alias for 'get_abi_var ASFLAGS'
132get_abi_ASFLAGS() { get_abi_var ASFLAGS "$@"; }
133
134# @FUNCTION: get_abi_LDFLAGS 97# @FUNCTION: get_abi_LDFLAGS
135# @USAGE: [ABI] 98# @USAGE: [ABI]
136# @DESCRIPTION: 99# @DESCRIPTION:
137# Alias for 'get_abi_var LDFLAGS' 100# Alias for 'get_abi_var LDFLAGS'
138get_abi_LDFLAGS() { get_abi_var LDFLAGS "$@"; } 101get_abi_LDFLAGS() { get_abi_var LDFLAGS "$@"; }
152# @FUNCTION: get_abi_FAKE_TARGETS 115# @FUNCTION: get_abi_FAKE_TARGETS
153# @USAGE: [ABI] 116# @USAGE: [ABI]
154# @DESCRIPTION: 117# @DESCRIPTION:
155# Alias for 'get_abi_var FAKE_TARGETS' 118# Alias for 'get_abi_var FAKE_TARGETS'
156get_abi_FAKE_TARGETS() { get_abi_var FAKE_TARGETS "$@"; } 119get_abi_FAKE_TARGETS() { get_abi_var FAKE_TARGETS "$@"; }
157
158# @FUNCTION: get_abi_CDEFINE
159# @USAGE: [ABI]
160# @DESCRIPTION:
161# Alias for 'get_abi_var CDEFINE'
162get_abi_CDEFINE() { get_abi_var CDEFINE "$@"; }
163 120
164# @FUNCTION: get_abi_LIBDIR 121# @FUNCTION: get_abi_LIBDIR
165# @USAGE: [ABI] 122# @USAGE: [ABI]
166# @DESCRIPTION: 123# @DESCRIPTION:
167# Alias for 'get_abi_var LIBDIR' 124# Alias for 'get_abi_var LIBDIR'
180 fi 137 fi
181 138
182 if [[ ${EMULTILIB_PKG} == "true" ]] ; then 139 if [[ ${EMULTILIB_PKG} == "true" ]] ; then
183 for x in ${MULTILIB_ABIS} ; do 140 for x in ${MULTILIB_ABIS} ; do
184 if [[ ${x} != "${DEFAULT_ABI}" ]] ; then 141 if [[ ${x} != "${DEFAULT_ABI}" ]] ; then
185 hasq ${x} ${ABI_DENY} || ordera="${ordera} ${x}" 142 has ${x} ${ABI_DENY} || order="${order} ${x}"
186 fi 143 fi
187 done 144 done
188 hasq ${DEFAULT_ABI} ${ABI_DENY} || order="${ordera} ${DEFAULT_ABI}" 145 has ${DEFAULT_ABI} ${ABI_DENY} || order="${order} ${DEFAULT_ABI}"
189 146
190 if [[ -n ${ABI_ALLOW} ]] ; then 147 if [[ -n ${ABI_ALLOW} ]] ; then
191 local ordera="" 148 local ordera=""
192 for x in ${order} ; do 149 for x in ${order} ; do
193 if hasq ${x} ${ABI_ALLOW} ; then 150 if has ${x} ${ABI_ALLOW} ; then
194 ordera="${ordera} ${x}" 151 ordera="${ordera} ${x}"
195 fi 152 fi
196 done 153 done
197 order=${ordera} 154 order=${ordera}
198 fi 155 fi
207 echo ${order} 164 echo ${order}
208 return 0 165 return 0
209} 166}
210 167
211# @FUNCTION: get_all_abis 168# @FUNCTION: get_all_abis
212# @DESCRIPTION: 169# @DESCRIPTION:
213# Return a list of the ABIs supported by this profile. 170# Return a list of the ABIs supported by this profile.
214# the last one in the list being the default. 171# the last one in the list being the default.
215get_all_abis() { 172get_all_abis() {
216 local order="" 173 local order=""
217 174
235# @DESCRIPTION: 192# @DESCRIPTION:
236# Returns a list of all the libdirs used by this profile. This includes 193# Returns a list of all the libdirs used by this profile. This includes
237# those that might not be touched by the current ebuild and always includes 194# those that might not be touched by the current ebuild and always includes
238# "lib". 195# "lib".
239get_all_libdirs() { 196get_all_libdirs() {
240 local libdirs="lib" 197 local libdirs
241 local abi 198 local abi
242 local dir 199 local dir
243 200
244 for abi in ${MULTILIB_ABIS}; do 201 for abi in ${MULTILIB_ABIS}; do
245 [ "$(get_abi_LIBDIR ${abi})" != "lib" ] && libdirs="${libdirs} $(get_abi_LIBDIR ${abi})" 202 libdirs+=" $(get_abi_LIBDIR ${abi})"
246 done 203 done
204 [[ " ${libdirs} " != *" lib "* ]] && libdirs+=" lib"
247 205
248 echo "${libdirs}" 206 echo "${libdirs}"
249} 207}
250 208
251# @FUNCTION: is_final_abi 209# @FUNCTION: is_final_abi
262 220
263# @FUNCTION: number_abis 221# @FUNCTION: number_abis
264# @DESCRIPTION: 222# @DESCRIPTION:
265# echo the number of ABIs we will be installing for 223# echo the number of ABIs we will be installing for
266number_abis() { 224number_abis() {
267 get_install_abis | wc -w 225 set -- `get_install_abis`
268} 226 echo $#
269
270# @FUNCTION: get_ml_incdir
271# @USAGE: [include_dir] [ABI]
272# @DESCRIPTION:
273# include dir defaults to /usr/include
274# ABI defaults to ${ABI} or ${DEFAULT_ABI}
275#
276# If a multilib include dir is associated with the passed include dir, then
277# we return it, otherwise, we just echo back the include dir. This is
278# neccessary when a built script greps header files rather than testing them
279# via #include (like perl) to figure out features.
280get_ml_incdir() {
281 local dir=/usr/include
282
283 if [[ $# -gt 0 ]]; then
284 incdir=$1
285 shift
286 fi
287
288 if [[ -z "${MULTILIB_ABIS}" ]]; then
289 echo ${incdir}
290 return 0
291 fi
292
293 local abi=${ABI-${DEFAULT_ABI}}
294 if [[ $# -gt 0 ]]; then
295 abi=$1
296 shift
297 fi
298
299 if [[ -d "${dir}/gentoo-multilib/${abi}" ]]; then
300 echo ${dir}/gentoo-multilib/${abi}
301 else
302 echo ${dir}
303 fi
304}
305
306# @FUNCTION: prep_ml_includes
307# @DESCRIPTION:
308# Some includes (include/asm, glibc, etc) are ABI dependent. In this case,
309# We can install them in different locations for each ABI and create a common
310# header which includes the right one based on CDEFINE_${ABI}. If your
311# package installs ABI-specific headers, just add 'prep_ml_includes' to the
312# end of your src_install(). It takes a list of directories that include
313# files are installed in (default is /usr/include if none are passed).
314#
315# Example:
316# src_install() {
317# ...
318# prep_ml_includes /usr/qt/3/include
319# }
320prep_ml_includes() {
321 if [[ $(number_abis) -gt 1 ]] ; then
322 local dir
323 local dirs
324 local base
325
326 if [[ $# -eq 0 ]] ; then
327 dirs=/usr/include
328 else
329 dirs="$@"
330 fi
331
332 for dir in ${dirs} ; do
333 base=${T}/gentoo-multilib/${dir}/gentoo-multilib
334 mkdir -p "${base}"
335 [[ -d ${base}/${ABI} ]] && rm -rf "${base}/${ABI}"
336 mv "${D}/${dir}" "${base}/${ABI}"
337 done
338
339 if is_final_abi; then
340 base=${T}/gentoo-multilib
341 pushd "${base}"
342 find . | tar -c -T - -f - | tar -x --no-same-owner -f - -C "${D}"
343 popd
344
345 # This 'set' stuff is required by mips profiles to properly pass
346 # CDEFINE's (which have spaces) to sub-functions
347 set --
348 for dir in ${dirs} ; do
349 set -- "$@" "${dir}"
350 local abi
351 for abi in $(get_install_abis); do
352 set -- "$@" "$(get_abi_CDEFINE ${abi}):${dir}/gentoo-multilib/${abi}"
353 done
354 create_ml_includes "$@"
355 done
356 fi
357 fi
358}
359
360# @FUNCTION: create_ml_includes
361# @USAGE: <include_dir> <symbol_1>:<dir_1> [<symbol_2>:<dir_2>...]
362# @DESCRIPTION:
363# If you need more control than prep_ml_includes can offer (like linux-headers
364# for the asm-* dirs, then use create_ml_includes. The firs argument is the
365# common dir. The remaining args are of the form <symbol>:<dir> where
366# <symbol> is what is put in the #ifdef for choosing that dir.
367#
368# Ideas for this code came from debian's sparc-linux headers package.
369#
370# Example:
371# create_ml_includes /usr/include/asm __sparc__:/usr/include/asm-sparc __sparc64__:/usr/include/asm-sparc64
372# create_ml_includes /usr/include/asm __i386__:/usr/include/asm-i386 __x86_64__:/usr/include/asm-x86_64
373#
374# Warning: Be careful with the ordering here. The default ABI has to be the
375# last, because it is always defined (by GCC)
376create_ml_includes() {
377 local dest=$1
378 shift
379 local basedirs=$(create_ml_includes-listdirs "$@")
380
381 create_ml_includes-makedestdirs ${dest} ${basedirs}
382
383 local file
384 for file in $(create_ml_includes-allfiles ${basedirs}) ; do
385 #local name=$(echo ${file} | tr '[:lower:]' '[:upper:]' | sed 's:[^[:upper:]]:_:g')
386 (
387 echo "/* Autogenerated by create_ml_includes() in multilib.eclass */"
388
389 local dir
390 for dir in ${basedirs}; do
391 if [[ -f ${D}/${dir}/${file} ]] ; then
392 echo ""
393 local sym=$(create_ml_includes-sym_for_dir ${dir} "$@")
394 if [[ ${sym/=} != "${sym}" ]] ; then
395 echo "#if ${sym}"
396 elif [[ ${sym::1} == "!" ]] ; then
397 echo "#ifndef ${sym:1}"
398 else
399 echo "#ifdef ${sym}"
400 fi
401 echo "# include <$(create_ml_includes-absolute ${dir}/${file})>"
402 echo "#endif /* ${sym} */"
403 fi
404 done
405
406 #echo "#endif /* __CREATE_ML_INCLUDES_STUB_${name}__ */"
407 ) > "${D}/${dest}/${file}"
408 done
409}
410
411# Helper function for create_ml_includes
412create_ml_includes-absolute() {
413 local dst="$(create_ml_includes-tidy_path $1)"
414
415 dst=(${dst//\// })
416
417 local i
418 for ((i=0; i<${#dst[*]}; i++)); do
419 [ "${dst[i]}" == "include" ] && break
420 done
421
422 local strip_upto=$i
423
424 for ((i=strip_upto+1; i<${#dst[*]}-1; i++)); do
425 echo -n ${dst[i]}/
426 done
427
428 echo -n ${dst[i]}
429}
430
431# Helper function for create_ml_includes
432create_ml_includes-tidy_path() {
433 local removed=$1
434
435 if [ -n "${removed}" ]; then
436 # Remove multiple slashes
437 while [ "${removed}" != "${removed/\/\//\/}" ]; do
438 removed=${removed/\/\//\/}
439 done
440
441 # Remove . directories
442 while [ "${removed}" != "${removed//\/.\//\/}" ]; do
443 removed=${removed//\/.\//\/}
444 done
445 [ "${removed##*/}" = "." ] && removed=${removed%/*}
446
447 # Removed .. directories
448 while [ "${removed}" != "${removed//\/..\/}" ]; do
449 local p1="${removed%%\/..\/*}"
450 local p2="${removed#*\/..\/}"
451
452 removed="${p1%\/*}/${p2}"
453 done
454
455 # Remove trailing ..
456 [ "${removed##*/}" = ".." ] && removed=${removed%/*/*}
457
458 # Remove trailing /
459 [ "${removed##*/}" = "" ] && removed=${removed%/*}
460
461 echo ${removed}
462 fi
463}
464
465# Helper function for create_ml_includes
466create_ml_includes-listdirs() {
467 local dirs
468 local data
469 for data in "$@"; do
470 dirs="${dirs} ${data/*:/}"
471 done
472 echo ${dirs:1}
473}
474
475# Helper function for create_ml_includes
476create_ml_includes-makedestdirs() {
477 local dest=$1
478 shift
479 local basedirs=$@
480 [[ -z ${ED} ]] && local ED=${D}
481
482 dodir ${dest}
483
484 local basedir
485 for basedir in ${basedirs}; do
486 local dir
487 for dir in $(find "${ED}"/${basedir} -type d); do
488 dodir ${dest}/${dir/${ED}\/${basedir}/}
489 done
490 done
491}
492
493# Helper function for create_ml_includes
494create_ml_includes-allfiles() {
495 [[ -z ${ED} ]] && local ED=${D}
496 local basedir file
497 for basedir in "$@" ; do
498 for file in $(find "${ED}"/${basedir} -type f); do
499 echo ${file/${ED}\/${basedir}\//}
500 done
501 done | sort | uniq
502}
503
504# Helper function for create_ml_includes
505create_ml_includes-sym_for_dir() {
506 local dir=$1
507 shift
508 local data
509 for data in "$@"; do
510 if [[ ${data} == *:${dir} ]] ; then
511 echo ${data/:*/}
512 return 0
513 fi
514 done
515 echo "Shouldn't be here -- create_ml_includes-sym_for_dir $1 $@"
516 # exit because we'll likely be called from a subshell
517 exit 1
518} 227}
519 228
520# @FUNCTION: get_libname 229# @FUNCTION: get_libname
521# @USAGE: [version] 230# @USAGE: [version]
522# @DESCRIPTION: 231# @DESCRIPTION:
578 case ${CTARGET} in 287 case ${CTARGET} in
579 x86_64*) 288 x86_64*)
580 export CFLAGS_x86=${CFLAGS_x86--m32} 289 export CFLAGS_x86=${CFLAGS_x86--m32}
581 export CHOST_x86=${CTARGET/x86_64/i686} 290 export CHOST_x86=${CTARGET/x86_64/i686}
582 export CTARGET_x86=${CHOST_x86} 291 export CTARGET_x86=${CHOST_x86}
583 export CDEFINE_x86="__i386__" 292 if [[ ${SYMLINK_LIB} == "yes" ]] ; then
584 export LIBDIR_x86="lib32" 293 export LIBDIR_x86="lib32"
294 else
295 export LIBDIR_x86="lib"
296 fi
585 297
586 export CFLAGS_amd64=${CFLAGS_amd64--m64} 298 export CFLAGS_amd64=${CFLAGS_amd64--m64}
587 export CHOST_amd64=${CTARGET} 299 export CHOST_amd64=${CTARGET}
588 export CTARGET_amd64=${CHOST_amd64} 300 export CTARGET_amd64=${CHOST_amd64}
589 export CDEFINE_amd64="__x86_64__"
590 export LIBDIR_amd64="lib64" 301 export LIBDIR_amd64="lib64"
591 302
592 export CFLAGS_x32=${CFLAGS_x32--mx32} 303 export CFLAGS_x32=${CFLAGS_x32--mx32}
593 export CHOST_x32=${CTARGET} 304 export CHOST_x32=${CTARGET}
594 export CTARGET_x32=${CHOST_x32} 305 export CTARGET_x32=${CHOST_x32}
595 export CDEFINE_x32="__i386__"
596 export LIBDIR_x32="libx32" 306 export LIBDIR_x32="libx32"
597 307
598 : ${MULTILIB_ABIS=amd64 x86} 308 : ${MULTILIB_ABIS=amd64 x86}
599 : ${DEFAULT_ABI=amd64} 309 : ${DEFAULT_ABI=amd64}
600 ;; 310 ;;
601 mips64*) 311 mips64*)
602 export CFLAGS_o32=${CFLAGS_o32--mabi=32} 312 export CFLAGS_o32=${CFLAGS_o32--mabi=32}
603 export CHOST_o32=${CTARGET/mips64/mips} 313 export CHOST_o32=${CTARGET/mips64/mips}
604 export CTARGET_o32=${CHOST_o32} 314 export CTARGET_o32=${CHOST_o32}
605 export CDEFINE_o32="_MIPS_SIM == _ABIO32"
606 export LIBDIR_o32="lib" 315 export LIBDIR_o32="lib"
607 316
608 export CFLAGS_n32=${CFLAGS_n32--mabi=n32} 317 export CFLAGS_n32=${CFLAGS_n32--mabi=n32}
609 export CHOST_n32=${CTARGET} 318 export CHOST_n32=${CTARGET}
610 export CTARGET_n32=${CHOST_n32} 319 export CTARGET_n32=${CHOST_n32}
611 export CDEFINE_n32="_MIPS_SIM == _ABIN32"
612 export LIBDIR_n32="lib32" 320 export LIBDIR_n32="lib32"
613 321
614 export CFLAGS_n64=${CFLAGS_n64--mabi=64} 322 export CFLAGS_n64=${CFLAGS_n64--mabi=64}
615 export CHOST_n64=${CTARGET} 323 export CHOST_n64=${CTARGET}
616 export CTARGET_n64=${CHOST_n64} 324 export CTARGET_n64=${CHOST_n64}
617 export CDEFINE_n64="_MIPS_SIM == _ABI64"
618 export LIBDIR_n64="lib64" 325 export LIBDIR_n64="lib64"
619 326
620 : ${MULTILIB_ABIS=n64 n32 o32} 327 : ${MULTILIB_ABIS=n64 n32 o32}
621 : ${DEFAULT_ABI=n32} 328 : ${DEFAULT_ABI=n32}
622 ;; 329 ;;
623 powerpc64*) 330 powerpc64*)
624 export CFLAGS_ppc=${CFLAGS_ppc--m32} 331 export CFLAGS_ppc=${CFLAGS_ppc--m32}
625 export CHOST_ppc=${CTARGET/powerpc64/powerpc} 332 export CHOST_ppc=${CTARGET/powerpc64/powerpc}
626 export CTARGET_ppc=${CHOST_ppc} 333 export CTARGET_ppc=${CHOST_ppc}
627 export CDEFINE_ppc="!__powerpc64__"
628 export LIBDIR_ppc="lib" 334 export LIBDIR_ppc="lib"
629 335
630 export CFLAGS_ppc64=${CFLAGS_ppc64--m64} 336 export CFLAGS_ppc64=${CFLAGS_ppc64--m64}
631 export CHOST_ppc64=${CTARGET} 337 export CHOST_ppc64=${CTARGET}
632 export CTARGET_ppc64=${CHOST_ppc64} 338 export CTARGET_ppc64=${CHOST_ppc64}
633 export CDEFINE_ppc64="__powerpc64__"
634 export LIBDIR_ppc64="lib64" 339 export LIBDIR_ppc64="lib64"
635 340
636 : ${MULTILIB_ABIS=ppc64 ppc} 341 : ${MULTILIB_ABIS=ppc64 ppc}
637 : ${DEFAULT_ABI=ppc64} 342 : ${DEFAULT_ABI=ppc64}
638 ;; 343 ;;
639 s390x*) 344 s390x*)
640 export CFLAGS_s390=${CFLAGS_s390--m31} # the 31 is not a typo 345 export CFLAGS_s390=${CFLAGS_s390--m31} # the 31 is not a typo
641 export CHOST_s390=${CTARGET/s390x/s390} 346 export CHOST_s390=${CTARGET/s390x/s390}
642 export CTARGET_s390=${CHOST_s390} 347 export CTARGET_s390=${CHOST_s390}
643 export CDEFINE_s390="!__s390x__"
644 export LIBDIR_s390="lib" 348 export LIBDIR_s390="lib"
645 349
646 export CFLAGS_s390x=${CFLAGS_s390x--m64} 350 export CFLAGS_s390x=${CFLAGS_s390x--m64}
647 export CHOST_s390x=${CTARGET} 351 export CHOST_s390x=${CTARGET}
648 export CTARGET_s390x=${CHOST_s390x} 352 export CTARGET_s390x=${CHOST_s390x}
649 export CDEFINE_s390x="__s390x__"
650 export LIBDIR_s390x="lib64" 353 export LIBDIR_s390x="lib64"
651 354
652 : ${MULTILIB_ABIS=s390x s390} 355 : ${MULTILIB_ABIS=s390x s390}
653 : ${DEFAULT_ABI=s390x} 356 : ${DEFAULT_ABI=s390x}
654 ;; 357 ;;
655 sparc*) 358 sparc*)
656 export CFLAGS_sparc32=${CFLAGS_sparc32} 359 export CFLAGS_sparc32=${CFLAGS_sparc32}
657 export CHOST_sparc32=${CTARGET/sparc64/sparc} 360 export CHOST_sparc32=${CTARGET/sparc64/sparc}
658 export CTARGET_sparc32=${CHOST_sparc32} 361 export CTARGET_sparc32=${CHOST_sparc32}
659 export CDEFINE_sparc32="!__arch64__"
660 export LIBDIR_sparc32="lib" 362 export LIBDIR_sparc32="lib"
661 363
662 export CFLAGS_sparc64=${CFLAGS_sparc64--m64} 364 export CFLAGS_sparc64=${CFLAGS_sparc64--m64}
663 export CHOST_sparc64=${CTARGET} 365 export CHOST_sparc64=${CTARGET}
664 export CTARGET_sparc64=${CHOST_sparc64} 366 export CTARGET_sparc64=${CHOST_sparc64}
665 export CDEFINE_sparc64="__arch64__"
666 export LIBDIR_sparc64="lib64" 367 export LIBDIR_sparc64="lib64"
667 368
668 : ${MULTILIB_ABIS=sparc64 sparc32} 369 : ${MULTILIB_ABIS=sparc64 sparc32}
669 : ${DEFAULT_ABI=sparc64} 370 : ${DEFAULT_ABI=sparc64}
670 ;; 371 ;;
672 : ${MULTILIB_ABIS=default} 373 : ${MULTILIB_ABIS=default}
673 : ${DEFAULT_ABI=default} 374 : ${DEFAULT_ABI=default}
674 ;; 375 ;;
675 esac 376 esac
676 377
677 export MULTILIB_ABIS MULTILIB_ABI 378 export MULTILIB_ABIS DEFAULT_ABI
678} 379}
679 380
680# @FUNCTION: multilib_toolchain_setup 381# @FUNCTION: multilib_toolchain_setup
681# @DESCRIPTION: 382# @DESCRIPTION:
682# Hide multilib details here for packages which are forced to be compiled for a 383# Hide multilib details here for packages which are forced to be compiled for a

Legend:
Removed from v.1.83  
changed lines
  Added in v.1.93

  ViewVC Help
Powered by ViewVC 1.1.20