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

Diff of /eclass/multilib.eclass

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

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

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

  ViewVC Help
Powered by ViewVC 1.1.20