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

Diff of /eclass/multilib.eclass

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

Revision 1.86 Revision 1.93
1# Copyright 1999-2011 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.86 2011/03/18 19:12:08 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
… …
263 220
264# @FUNCTION: number_abis 221# @FUNCTION: number_abis
265# @DESCRIPTION: 222# @DESCRIPTION:
266# echo the number of ABIs we will be installing for 223# echo the number of ABIs we will be installing for
267number_abis() { 224number_abis() {
268 get_install_abis | wc -w 225 set -- `get_install_abis`
269} 226 echo $#
270
271# @FUNCTION: get_ml_incdir
272# @USAGE: [include_dir] [ABI]
273# @DESCRIPTION:
274# include dir defaults to /usr/include
275# ABI defaults to ${ABI} or ${DEFAULT_ABI}
276#
277# If a multilib include dir is associated with the passed include dir, then
278# we return it, otherwise, we just echo back the include dir. This is
279# neccessary when a built script greps header files rather than testing them
280# via #include (like perl) to figure out features.
281get_ml_incdir() {
282 local dir=/usr/include
283
284 if [[ $# -gt 0 ]]; then
285 incdir=$1
286 shift
287 fi
288
289 if [[ -z "${MULTILIB_ABIS}" ]]; then
290 echo ${incdir}
291 return 0
292 fi
293
294 local abi=${ABI-${DEFAULT_ABI}}
295 if [[ $# -gt 0 ]]; then
296 abi=$1
297 shift
298 fi
299
300 if [[ -d "${dir}/gentoo-multilib/${abi}" ]]; then
301 echo ${dir}/gentoo-multilib/${abi}
302 else
303 echo ${dir}
304 fi
305}
306
307# @FUNCTION: prep_ml_includes
308# @DESCRIPTION:
309# Some includes (include/asm, glibc, etc) are ABI dependent. In this case,
310# We can install them in different locations for each ABI and create a common
311# header which includes the right one based on CDEFINE_${ABI}. If your
312# package installs ABI-specific headers, just add 'prep_ml_includes' to the
313# end of your src_install(). It takes a list of directories that include
314# files are installed in (default is /usr/include if none are passed).
315#
316# Example:
317# src_install() {
318# ...
319# prep_ml_includes /usr/qt/3/include
320# }
321prep_ml_includes() {
322 if [[ $(number_abis) -gt 1 ]] ; then
323 local dir
324 local dirs
325 local base
326
327 if [[ $# -eq 0 ]] ; then
328 dirs=/usr/include
329 else
330 dirs="$@"
331 fi
332
333 for dir in ${dirs} ; do
334 base=${T}/gentoo-multilib/${dir}/gentoo-multilib
335 mkdir -p "${base}"
336 [[ -d ${base}/${ABI} ]] && rm -rf "${base}/${ABI}"
337 mv "${D}/${dir}" "${base}/${ABI}"
338 done
339
340 if is_final_abi; then
341 base=${T}/gentoo-multilib
342 pushd "${base}"
343 find . | tar -c -T - -f - | tar -x --no-same-owner -f - -C "${D}"
344 popd
345
346 # This 'set' stuff is required by mips profiles to properly pass
347 # CDEFINE's (which have spaces) to sub-functions
348 set --
349 for dir in ${dirs} ; do
350 set -- "$@" "${dir}"
351 local abi
352 for abi in $(get_install_abis); do
353 set -- "$@" "$(get_abi_CDEFINE ${abi}):${dir}/gentoo-multilib/${abi}"
354 done
355 create_ml_includes "$@"
356 done
357 fi
358 fi
359}
360
361# @FUNCTION: create_ml_includes
362# @USAGE: <include_dir> <symbol_1>:<dir_1> [<symbol_2>:<dir_2>...]
363# @DESCRIPTION:
364# If you need more control than prep_ml_includes can offer (like linux-headers
365# for the asm-* dirs, then use create_ml_includes. The firs argument is the
366# common dir. The remaining args are of the form <symbol>:<dir> where
367# <symbol> is what is put in the #ifdef for choosing that dir.
368#
369# Ideas for this code came from debian's sparc-linux headers package.
370#
371# Example:
372# create_ml_includes /usr/include/asm __sparc__:/usr/include/asm-sparc __sparc64__:/usr/include/asm-sparc64
373# create_ml_includes /usr/include/asm __i386__:/usr/include/asm-i386 __x86_64__:/usr/include/asm-x86_64
374#
375# Warning: Be careful with the ordering here. The default ABI has to be the
376# last, because it is always defined (by GCC)
377create_ml_includes() {
378 local dest=$1
379 shift
380 local basedirs=$(create_ml_includes-listdirs "$@")
381
382 create_ml_includes-makedestdirs ${dest} ${basedirs}
383
384 local file
385 for file in $(create_ml_includes-allfiles ${basedirs}) ; do
386 #local name=$(echo ${file} | tr '[:lower:]' '[:upper:]' | sed 's:[^[:upper:]]:_:g')
387 (
388 echo "/* Autogenerated by create_ml_includes() in multilib.eclass */"
389
390 local dir
391 for dir in ${basedirs}; do
392 if [[ -f ${D}/${dir}/${file} ]] ; then
393 echo ""
394 local sym=$(create_ml_includes-sym_for_dir ${dir} "$@")
395 if [[ ${sym/=} != "${sym}" ]] ; then
396 echo "#if ${sym}"
397 elif [[ ${sym::1} == "!" ]] ; then
398 echo "#ifndef ${sym:1}"
399 else
400 echo "#ifdef ${sym}"
401 fi
402 echo "# include <$(create_ml_includes-absolute ${dir}/${file})>"
403 echo "#endif /* ${sym} */"
404 fi
405 done
406
407 #echo "#endif /* __CREATE_ML_INCLUDES_STUB_${name}__ */"
408 ) > "${D}/${dest}/${file}"
409 done
410}
411
412# Helper function for create_ml_includes
413create_ml_includes-absolute() {
414 local dst="$(create_ml_includes-tidy_path $1)"
415
416 dst=(${dst//\// })
417
418 local i
419 for ((i=0; i<${#dst[*]}; i++)); do
420 [ "${dst[i]}" == "include" ] && break
421 done
422
423 local strip_upto=$i
424
425 for ((i=strip_upto+1; i<${#dst[*]}-1; i++)); do
426 echo -n ${dst[i]}/
427 done
428
429 echo -n ${dst[i]}
430}
431
432# Helper function for create_ml_includes
433create_ml_includes-tidy_path() {
434 local removed=$1
435
436 if [ -n "${removed}" ]; then
437 # Remove multiple slashes
438 while [ "${removed}" != "${removed/\/\//\/}" ]; do
439 removed=${removed/\/\//\/}
440 done
441
442 # Remove . directories
443 while [ "${removed}" != "${removed//\/.\//\/}" ]; do
444 removed=${removed//\/.\//\/}
445 done
446 [ "${removed##*/}" = "." ] && removed=${removed%/*}
447
448 # Removed .. directories
449 while [ "${removed}" != "${removed//\/..\/}" ]; do
450 local p1="${removed%%\/..\/*}"
451 local p2="${removed#*\/..\/}"
452
453 removed="${p1%\/*}/${p2}"
454 done
455
456 # Remove trailing ..
457 [ "${removed##*/}" = ".." ] && removed=${removed%/*/*}
458
459 # Remove trailing /
460 [ "${removed##*/}" = "" ] && removed=${removed%/*}
461
462 echo ${removed}
463 fi
464}
465
466# Helper function for create_ml_includes
467create_ml_includes-listdirs() {
468 local dirs
469 local data
470 for data in "$@"; do
471 dirs="${dirs} ${data/*:/}"
472 done
473 echo ${dirs:1}
474}
475
476# Helper function for create_ml_includes
477create_ml_includes-makedestdirs() {
478 local dest=$1
479 shift
480 local basedirs=$@
481 [[ -z ${ED} ]] && local ED=${D}
482
483 dodir ${dest}
484
485 local basedir
486 for basedir in ${basedirs}; do
487 local dir
488 for dir in $(find "${ED}"/${basedir} -type d); do
489 dodir ${dest}/${dir/${ED}\/${basedir}/}
490 done
491 done
492}
493
494# Helper function for create_ml_includes
495create_ml_includes-allfiles() {
496 [[ -z ${ED} ]] && local ED=${D}
497 local basedir file
498 for basedir in "$@" ; do
499 for file in $(find "${ED}"/${basedir} -type f); do
500 echo ${file/${ED}\/${basedir}\//}
501 done
502 done | sort | uniq
503}
504
505# Helper function for create_ml_includes
506create_ml_includes-sym_for_dir() {
507 local dir=$1
508 shift
509 local data
510 for data in "$@"; do
511 if [[ ${data} == *:${dir} ]] ; then
512 echo ${data/:*/}
513 return 0
514 fi
515 done
516 echo "Shouldn't be here -- create_ml_includes-sym_for_dir $1 $@"
517 # exit because we'll likely be called from a subshell
518 exit 1
519} 227}
520 228
521# @FUNCTION: get_libname 229# @FUNCTION: get_libname
522# @USAGE: [version] 230# @USAGE: [version]
523# @DESCRIPTION: 231# @DESCRIPTION:
… …
579 case ${CTARGET} in 287 case ${CTARGET} in
580 x86_64*) 288 x86_64*)
581 export CFLAGS_x86=${CFLAGS_x86--m32} 289 export CFLAGS_x86=${CFLAGS_x86--m32}
582 export CHOST_x86=${CTARGET/x86_64/i686} 290 export CHOST_x86=${CTARGET/x86_64/i686}
583 export CTARGET_x86=${CHOST_x86} 291 export CTARGET_x86=${CHOST_x86}
584 export CDEFINE_x86="__i386__"
585 if [[ ${SYMLINK_LIBDIR} == "yes" ]] ; then 292 if [[ ${SYMLINK_LIB} == "yes" ]] ; then
586 export LIBDIR_x86="lib32" 293 export LIBDIR_x86="lib32"
587 else 294 else
588 export LIBDIR_x86="lib" 295 export LIBDIR_x86="lib"
589 fi 296 fi
590 297
591 export CFLAGS_amd64=${CFLAGS_amd64--m64} 298 export CFLAGS_amd64=${CFLAGS_amd64--m64}
592 export CHOST_amd64=${CTARGET} 299 export CHOST_amd64=${CTARGET}
593 export CTARGET_amd64=${CHOST_amd64} 300 export CTARGET_amd64=${CHOST_amd64}
594 export CDEFINE_amd64="__x86_64__"
595 export LIBDIR_amd64="lib64" 301 export LIBDIR_amd64="lib64"
596 302
597 export CFLAGS_x32=${CFLAGS_x32--mx32} 303 export CFLAGS_x32=${CFLAGS_x32--mx32}
598 export CHOST_x32=${CTARGET} 304 export CHOST_x32=${CTARGET}
599 export CTARGET_x32=${CHOST_x32} 305 export CTARGET_x32=${CHOST_x32}
600 export CDEFINE_x32="__i386__"
601 export LIBDIR_x32="libx32" 306 export LIBDIR_x32="libx32"
602 307
603 : ${MULTILIB_ABIS=amd64 x86} 308 : ${MULTILIB_ABIS=amd64 x86}
604 : ${DEFAULT_ABI=amd64} 309 : ${DEFAULT_ABI=amd64}
605 ;; 310 ;;
606 mips64*) 311 mips64*)
607 export CFLAGS_o32=${CFLAGS_o32--mabi=32} 312 export CFLAGS_o32=${CFLAGS_o32--mabi=32}
608 export CHOST_o32=${CTARGET/mips64/mips} 313 export CHOST_o32=${CTARGET/mips64/mips}
609 export CTARGET_o32=${CHOST_o32} 314 export CTARGET_o32=${CHOST_o32}
610 export CDEFINE_o32="_MIPS_SIM == _ABIO32"
611 export LIBDIR_o32="lib" 315 export LIBDIR_o32="lib"
612 316
613 export CFLAGS_n32=${CFLAGS_n32--mabi=n32} 317 export CFLAGS_n32=${CFLAGS_n32--mabi=n32}
614 export CHOST_n32=${CTARGET} 318 export CHOST_n32=${CTARGET}
615 export CTARGET_n32=${CHOST_n32} 319 export CTARGET_n32=${CHOST_n32}
616 export CDEFINE_n32="_MIPS_SIM == _ABIN32"
617 export LIBDIR_n32="lib32" 320 export LIBDIR_n32="lib32"
618 321
619 export CFLAGS_n64=${CFLAGS_n64--mabi=64} 322 export CFLAGS_n64=${CFLAGS_n64--mabi=64}
620 export CHOST_n64=${CTARGET} 323 export CHOST_n64=${CTARGET}
621 export CTARGET_n64=${CHOST_n64} 324 export CTARGET_n64=${CHOST_n64}
622 export CDEFINE_n64="_MIPS_SIM == _ABI64"
623 export LIBDIR_n64="lib64" 325 export LIBDIR_n64="lib64"
624 326
625 : ${MULTILIB_ABIS=n64 n32 o32} 327 : ${MULTILIB_ABIS=n64 n32 o32}
626 : ${DEFAULT_ABI=n32} 328 : ${DEFAULT_ABI=n32}
627 ;; 329 ;;
628 powerpc64*) 330 powerpc64*)
629 export CFLAGS_ppc=${CFLAGS_ppc--m32} 331 export CFLAGS_ppc=${CFLAGS_ppc--m32}
630 export CHOST_ppc=${CTARGET/powerpc64/powerpc} 332 export CHOST_ppc=${CTARGET/powerpc64/powerpc}
631 export CTARGET_ppc=${CHOST_ppc} 333 export CTARGET_ppc=${CHOST_ppc}
632 export CDEFINE_ppc="!__powerpc64__"
633 export LIBDIR_ppc="lib" 334 export LIBDIR_ppc="lib"
634 335
635 export CFLAGS_ppc64=${CFLAGS_ppc64--m64} 336 export CFLAGS_ppc64=${CFLAGS_ppc64--m64}
636 export CHOST_ppc64=${CTARGET} 337 export CHOST_ppc64=${CTARGET}
637 export CTARGET_ppc64=${CHOST_ppc64} 338 export CTARGET_ppc64=${CHOST_ppc64}
638 export CDEFINE_ppc64="__powerpc64__"
639 export LIBDIR_ppc64="lib64" 339 export LIBDIR_ppc64="lib64"
640 340
641 : ${MULTILIB_ABIS=ppc64 ppc} 341 : ${MULTILIB_ABIS=ppc64 ppc}
642 : ${DEFAULT_ABI=ppc64} 342 : ${DEFAULT_ABI=ppc64}
643 ;; 343 ;;
644 s390x*) 344 s390x*)
645 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
646 export CHOST_s390=${CTARGET/s390x/s390} 346 export CHOST_s390=${CTARGET/s390x/s390}
647 export CTARGET_s390=${CHOST_s390} 347 export CTARGET_s390=${CHOST_s390}
648 export CDEFINE_s390="!__s390x__"
649 export LIBDIR_s390="lib" 348 export LIBDIR_s390="lib"
650 349
651 export CFLAGS_s390x=${CFLAGS_s390x--m64} 350 export CFLAGS_s390x=${CFLAGS_s390x--m64}
652 export CHOST_s390x=${CTARGET} 351 export CHOST_s390x=${CTARGET}
653 export CTARGET_s390x=${CHOST_s390x} 352 export CTARGET_s390x=${CHOST_s390x}
654 export CDEFINE_s390x="__s390x__"
655 export LIBDIR_s390x="lib64" 353 export LIBDIR_s390x="lib64"
656 354
657 : ${MULTILIB_ABIS=s390x s390} 355 : ${MULTILIB_ABIS=s390x s390}
658 : ${DEFAULT_ABI=s390x} 356 : ${DEFAULT_ABI=s390x}
659 ;; 357 ;;
660 sparc*) 358 sparc*)
661 export CFLAGS_sparc32=${CFLAGS_sparc32} 359 export CFLAGS_sparc32=${CFLAGS_sparc32}
662 export CHOST_sparc32=${CTARGET/sparc64/sparc} 360 export CHOST_sparc32=${CTARGET/sparc64/sparc}
663 export CTARGET_sparc32=${CHOST_sparc32} 361 export CTARGET_sparc32=${CHOST_sparc32}
664 export CDEFINE_sparc32="!__arch64__"
665 export LIBDIR_sparc32="lib" 362 export LIBDIR_sparc32="lib"
666 363
667 export CFLAGS_sparc64=${CFLAGS_sparc64--m64} 364 export CFLAGS_sparc64=${CFLAGS_sparc64--m64}
668 export CHOST_sparc64=${CTARGET} 365 export CHOST_sparc64=${CTARGET}
669 export CTARGET_sparc64=${CHOST_sparc64} 366 export CTARGET_sparc64=${CHOST_sparc64}
670 export CDEFINE_sparc64="__arch64__"
671 export LIBDIR_sparc64="lib64" 367 export LIBDIR_sparc64="lib64"
672 368
673 : ${MULTILIB_ABIS=sparc64 sparc32} 369 : ${MULTILIB_ABIS=sparc64 sparc32}
674 : ${DEFAULT_ABI=sparc64} 370 : ${DEFAULT_ABI=sparc64}
675 ;; 371 ;;
Legend:
Removed from v.1.86  
changed lines
  Added in v.1.93
  ViewVC Help
Powered by ViewVC 1.1.13