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

Diff of /eclass/multilib.eclass

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

Revision 1.52 Revision 1.72
1# Copyright 1999-2004 Gentoo Foundation 1# Copyright 1999-2008 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.52 2006/06/20 20:16:34 vapier Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/multilib.eclass,v 1.72 2009/02/20 23:20:22 vapier Exp $
4# 4
5# Author: Jeremy Huddleston <eradicator@gentoo.org> 5# @ECLASS: multilib.eclass
6# 6# @MAINTAINER:
7# amd64@gentoo.org
8# toolchain@gentoo.org
9# @BLURB: This eclass is for all functions pertaining to handling multilib configurations.
10# @DESCRIPTION:
7# This eclass is for all functions pertaining to handling multilib. 11# This eclass is for all functions pertaining to handling multilib configurations.
8# configurations.
9 12
10DESCRIPTION="Based on the ${ECLASS} eclass" 13___ECLASS_RECUR_MULTILIB="yes"
11 14[[ -z ${___ECLASS_RECUR_TOOLCHAIN_FUNCS} ]] && inherit toolchain-funcs
12# has_multilib_profile:
13# Return true if the current profile is a multilib profile and lists more than
14# one abi in ${MULTILIB_ABIS}. You might want to use this like
15# 'use multilib || has_multilib_profile' until all profiles utilizing the
16# 'multilib' use flag are removed from portage
17
18# is_final_abi:
19# Return true if ${ABI} is the final abi to be installed (and thus we are
20# on our last run through a src_* function.
21
22# number_abis:
23# echo the number of ABIs we will be installing for
24
25# get_install_abis:
26# Return a list of the ABIs we want to install for with
27# the last one in the list being the default.
28
29# get_all_abis:
30# Return a list of the ABIs supported by this profile.
31# the last one in the list being the default.
32
33# get_all_libdirs:
34# Returns a list of all the libdirs used by this profile. This includes
35# those that might not be touched by the current ebuild and always includes
36# "lib".
37
38# get_libdir:
39# Returns the libdir for the selected ABI. This is backwards compatible
40# and simply calls get_abi_LIBDIR() on newer profiles. You should use this
41# to determine where to install shared objects (ex: /usr/$(get_libdir))
42
43# get_abi_var <VAR> [<ABI>]:
44# returns the value of ${<VAR>_<ABI>} which should be set in make.defaults
45#
46# get_abi_CFLAGS:
47# get_abi_CDEFINE:
48# get_abi_LIBDIR:
49# Aliases for 'get_abi_var CFLAGS', etc.
50
51# get_ml_incdir [<include dir> [<ABI>]]
52# include dir defaults to /usr/include
53# ABI defaults to ${ABI} or ${DEFAULT_ABI}
54#
55# If a multilib include dir is associated with the passed include dir, then
56# we return it, otherwise, we just echo back the include dir. This is
57# neccessary when a built script greps header files rather than testing them
58# via #include (like perl) to figure out features.
59
60# prep_ml_includes:
61# Some includes (include/asm, glibc, etc) are ABI dependent. In this case,
62# We can install them in different locations for each ABI and create a common
63# header which includes the right one based on CDEFINE_${ABI}. If your
64# package installs ABI-specific headers, just add 'prep_ml_includes' to the
65# end of your src_install(). It takes a list of directories that include
66# files are installed in (default is /usr/include if none are passed).
67#
68# Example:
69# src_install() {
70# ...
71# prep_ml_includes /usr/qt/3/include
72# }
73
74# create_ml_includes <include dir> <symbol 1>:<dir 1> [<symbol 2>:<dir 2> ...]
75# If you need more control than prep_ml_includes can offer (like linux-headers
76# for the asm-* dirs, then use create_ml_includes. The firs argument is the
77# common dir. The remaining args are of the form <symbol>:<dir> where
78# <symbol> is what is put in the #ifdef for choosing that dir.
79#
80# Ideas for this code came from debian's sparc-linux headers package.
81#
82# Example:
83# create_ml_includes /usr/include/asm __sparc__:/usr/include/asm-sparc __sparc64__:/usr/include/asm-sparc64
84# create_ml_includes /usr/include/asm __i386__:/usr/include/asm-i386 __x86_64__:/usr/include/asm-x86_64
85
86# get_libname [version]
87# returns libname with proper suffix {.so,.dylib} and optionally supplied version
88# for ELF/MACH-O shared objects
89#
90# Example:
91# get_libname libfoo ${PV}
92# Returns: libfoo.so.${PV} (ELF) || libfoo.${PV}.dylib (MACH)
93
94### END DOCUMENTATION ###
95 15
96# Defaults: 16# Defaults:
97export MULTILIB_ABIS=${MULTILIB_ABIS:-"default"} 17export MULTILIB_ABIS=${MULTILIB_ABIS:-"default"}
98export DEFAULT_ABI=${DEFAULT_ABI:-"default"} 18export DEFAULT_ABI=${DEFAULT_ABI:-"default"}
99export CFLAGS_default 19export CFLAGS_default
102export CTARGET_default=${CTARGET_default:-${CTARGET:-${CHOST_default}}} 22export CTARGET_default=${CTARGET_default:-${CTARGET:-${CHOST_default}}}
103export LIBDIR_default=${CONF_LIBDIR:-"lib"} 23export LIBDIR_default=${CONF_LIBDIR:-"lib"}
104export CDEFINE_default="__unix__" 24export CDEFINE_default="__unix__"
105export KERNEL_ABI=${KERNEL_ABI:-${DEFAULT_ABI}} 25export KERNEL_ABI=${KERNEL_ABI:-${DEFAULT_ABI}}
106 26
107# has_multilib_profile() 27# @FUNCTION: has_multilib_profile
28# @DESCRIPTION:
29# Return true if the current profile is a multilib profile and lists more than
30# one abi in ${MULTILIB_ABIS}. When has_multilib_profile returns true, that
31# profile should enable the 'multilib' use flag. This is so you can DEPEND on
32# a package only for multilib or not multilib.
108has_multilib_profile() { 33has_multilib_profile() {
109 [ -n "${MULTILIB_ABIS}" -a "${MULTILIB_ABIS}" != "${MULTILIB_ABIS/ /}" ] 34 [ -n "${MULTILIB_ABIS}" -a "${MULTILIB_ABIS}" != "${MULTILIB_ABIS/ /}" ]
110} 35}
111 36
37# @FUNCTION: get_libdir
38# @RETURN: the libdir for the selected ABI
39# @DESCRIPTION:
112# This function simply returns the desired lib directory. With portage 40# This function simply returns the desired lib directory. With portage
113# 2.0.51, we now have support for installing libraries to lib32/lib64 41# 2.0.51, we now have support for installing libraries to lib32/lib64
114# to accomidate the needs of multilib systems. It's no longer a good idea 42# to accomidate the needs of multilib systems. It's no longer a good idea
115# to assume all libraries will end up in lib. Replace any (sane) instances 43# to assume all libraries will end up in lib. Replace any (sane) instances
116# where lib is named directly with $(get_libdir) if possible. 44# where lib is named directly with $(get_libdir) if possible.
117#
118# Travis Tilley <lv@gentoo.org> (24 Aug 2004)
119# 45#
120# Jeremy Huddleston <eradicator@gentoo.org> (23 Dec 2004): 46# Jeremy Huddleston <eradicator@gentoo.org> (23 Dec 2004):
121# Added support for ${ABI} and ${DEFAULT_ABI}. If they're both not set, 47# Added support for ${ABI} and ${DEFAULT_ABI}. If they're both not set,
122# fall back on old behavior. Any profile that has these set should also 48# fall back on old behavior. Any profile that has these set should also
123# depend on a newer version of portage (not yet released) which uses these 49# depend on a newer version of portage (not yet released) which uses these
130 else 56 else
131 get_abi_LIBDIR 57 get_abi_LIBDIR
132 fi 58 fi
133} 59}
134 60
61# @FUNCTION: get_multilibdir
62# @RETURN: Returns the multilibdir
135get_multilibdir() { 63get_multilibdir() {
136 if has_multilib_profile; then 64 if has_multilib_profile; then
137 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" 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"
138 exit 1 66 exit 1
139 fi 67 fi
140 echo ${CONF_MULTILIBDIR:=lib32} 68 echo ${CONF_MULTILIBDIR:=lib32}
141} 69}
142 70
71# @FUNCTION: get_libdir_override
72# @DESCRIPTION:
143# Sometimes you need to override the value returned by get_libdir. A good 73# Sometimes you need to override the value returned by get_libdir. A good
144# example of this is xorg-x11, where lib32 isnt a supported configuration, 74# example of this is xorg-x11, where lib32 isnt a supported configuration,
145# and where lib64 -must- be used on amd64 (for applications that need lib 75# and where lib64 -must- be used on amd64 (for applications that need lib
146# to be 32bit, such as adobe acrobat). Note that this override also bypasses 76# to be 32bit, such as adobe acrobat). Note that this override also bypasses
147# portage version sanity checking. 77# portage version sanity checking.
148# get_libdir_override expects one argument, the result get_libdir should 78# get_libdir_override expects one argument, the result get_libdir should
149# return: 79# return:
150# 80#
151# get_libdir_override lib64 81# get_libdir_override lib64
152#
153# Travis Tilley <lv@gentoo.org> (31 Aug 2004)
154get_libdir_override() { 82get_libdir_override() {
155 if has_multilib_profile; then 83 if has_multilib_profile; then
156 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" 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"
157 exit 1 85 exit 1
158 fi 86 fi
159 CONF_LIBDIR="$1" 87 CONF_LIBDIR="$1"
160 CONF_LIBDIR_OVERRIDE="$1" 88 CONF_LIBDIR_OVERRIDE="$1"
161 LIBDIR_default="$1" 89 LIBDIR_default="$1"
162} 90}
163 91
164# get_abi_var <VAR> [<ABI>] 92# @FUNCTION: get_abi_var
93# @USAGE: <VAR> [ABI]
165# returns the value of ${<VAR>_<ABI>} which should be set in make.defaults 94# @RETURN: returns the value of ${<VAR>_<ABI>} which should be set in make.defaults
166# 95# @DESCRIPTION:
167# ex: 96# ex:
168# CFLAGS=$(get_abi_var CFLAGS sparc32) # CFLAGS=-m32 97# CFLAGS=$(get_abi_var CFLAGS sparc32) # CFLAGS=-m32
169# 98#
170# Note that the prefered method is to set CC="$(tc-getCC) $(get_abi_CFLAGS)" 99# Note that the prefered method is to set CC="$(tc-getCC) $(get_abi_CFLAGS)"
171# This will hopefully be added to portage soon... 100# This will hopefully be added to portage soon...
172# 101#
173# If <ABI> is not specified, ${ABI} is used. 102# If <ABI> is not specified, ${ABI} is used.
174# If <ABI> is not specified and ${ABI} is not defined, ${DEFAULT_ABI} is used. 103# If <ABI> is not specified and ${ABI} is not defined, ${DEFAULT_ABI} is used.
175# If <ABI> is not specified and ${ABI} and ${DEFAULT_ABI} are not defined, we return an empty string. 104# If <ABI> is not specified and ${ABI} and ${DEFAULT_ABI} are not defined, we return an empty string.
176#
177# Jeremy Huddleston <eradicator@gentoo.org>
178get_abi_var() { 105get_abi_var() {
179 local flag=$1 106 local flag=$1
180 local abi 107 local abi
181 if [ $# -gt 1 ]; then 108 if [ $# -gt 1 ]; then
182 abi=${2} 109 abi=${2}
190 117
191 local var="${flag}_${abi}" 118 local var="${flag}_${abi}"
192 echo ${!var} 119 echo ${!var}
193} 120}
194 121
122# @FUNCTION: get_abi_CFLAGS
123# @USAGE: [ABI]
124# @DESCRIPTION:
125# Alias for 'get_abi_var CFLAGS'
195get_abi_CFLAGS() { get_abi_var CFLAGS "$@"; } 126get_abi_CFLAGS() { get_abi_var CFLAGS "$@"; }
127
128# @FUNCTION: get_abi_ASFLAGS
129# @USAGE: [ABI]
130# @DESCRIPTION:
131# Alias for 'get_abi_var ASFLAGS'
196get_abi_ASFLAGS() { get_abi_var ASFLAGS "$@"; } 132get_abi_ASFLAGS() { get_abi_var ASFLAGS "$@"; }
133
134# @FUNCTION: get_abi_LDFLAGS
135# @USAGE: [ABI]
136# @DESCRIPTION:
137# Alias for 'get_abi_var LDFLAGS'
197get_abi_LDFLAGS() { get_abi_var LDFLAGS "$@"; } 138get_abi_LDFLAGS() { get_abi_var LDFLAGS "$@"; }
139
140# @FUNCTION: get_abi_CHOST
141# @USAGE: [ABI]
142# @DESCRIPTION:
143# Alias for 'get_abi_var CHOST'
198get_abi_CHOST() { get_abi_var CHOST "$@"; } 144get_abi_CHOST() { get_abi_var CHOST "$@"; }
145
146# @FUNCTION: get_abi_CTARGET
147# @USAGE: [ABI]
148# @DESCRIPTION:
149# Alias for 'get_abi_var CTARGET'
199get_abi_CTARGET() { get_abi_var CTARGET "$@"; } 150get_abi_CTARGET() { get_abi_var CTARGET "$@"; }
151
152# @FUNCTION: get_abi_FAKE_TARGETS
153# @USAGE: [ABI]
154# @DESCRIPTION:
155# Alias for 'get_abi_var FAKE_TARGETS'
200get_abi_FAKE_TARGETS() { get_abi_var FAKE_TARGETS "$@"; } 156get_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'
201get_abi_CDEFINE() { get_abi_var CDEFINE "$@"; } 162get_abi_CDEFINE() { get_abi_var CDEFINE "$@"; }
163
164# @FUNCTION: get_abi_LIBDIR
165# @USAGE: [ABI]
166# @DESCRIPTION:
167# Alias for 'get_abi_var LIBDIR'
202get_abi_LIBDIR() { get_abi_var LIBDIR "$@"; } 168get_abi_LIBDIR() { get_abi_var LIBDIR "$@"; }
203 169
170# @FUNCTION: get_install_abis
171# @DESCRIPTION:
204# Return a list of the ABIs we want to install for with 172# Return a list of the ABIs we want to install for with
205# the last one in the list being the default. 173# the last one in the list being the default.
206get_install_abis() { 174get_install_abis() {
207 local order="" 175 local order=""
208 176
209 if [[ -z ${MULTILIB_ABIS} ]] ; then 177 if [[ -z ${MULTILIB_ABIS} ]] ; then
210 echo "default" 178 echo "default"
211 return 0 179 return 0
212 fi 180 fi
213 181
214 if hasq multilib-pkg-force ${RESTRICT} || 182 if [[ ${EMULTILIB_PKG} == "true" ]] ; then
215 { hasq multilib-pkg ${FEATURES} && hasq multilib-pkg ${RESTRICT}; }; then
216 for x in ${MULTILIB_ABIS} ; do 183 for x in ${MULTILIB_ABIS} ; do
217 if [[ ${x} != "${DEFAULT_ABI}" ]] ; then 184 if [[ ${x} != "${DEFAULT_ABI}" ]] ; then
218 hasq ${x} ${ABI_DENY} || ordera="${ordera} ${x}" 185 hasq ${x} ${ABI_DENY} || ordera="${ordera} ${x}"
219 fi 186 fi
220 done 187 done
239 206
240 echo ${order} 207 echo ${order}
241 return 0 208 return 0
242} 209}
243 210
211# @FUNCTION: get_all_abis
212# @DESCRIPTION:
244# Return a list of the ABIs supported by this profile. 213# Return a list of the ABIs supported by this profile.
245# the last one in the list being the default. 214# the last one in the list being the default.
246get_all_abis() { 215get_all_abis() {
247 local order="" 216 local order=""
248 217
260 229
261 echo ${order} 230 echo ${order}
262 return 0 231 return 0
263} 232}
264 233
265# get_all_libdirs() 234# @FUNCTION: get_all_libdirs
235# @DESCRIPTION:
266# Returns a list of all the libdirs used by this profile. This includes 236# Returns a list of all the libdirs used by this profile. This includes
267# those that might not be touched by the current ebuild. 237# those that might not be touched by the current ebuild and always includes
238# "lib".
268get_all_libdirs() { 239get_all_libdirs() {
269 local libdirs="lib" 240 local libdirs="lib"
270 local abi 241 local abi
271 local dir 242 local dir
272 243
273 # Remove when amd64's 2004.3 is purged.
274 if [[ -n "${CONF_LIBDIR}" ]]; then
275 for dir in ${CONF_LIBDIR} ${CONF_MULTILIBDIR:-lib32}; do
276 [ "${dir}" != "lib" ] && libdirs="${libdirs} ${dir}"
277 done
278 else
279 for abi in ${MULTILIB_ABIS}; do 244 for abi in ${MULTILIB_ABIS}; do
280 [ "$(get_abi_LIBDIR ${abi})" != "lib" ] && libdirs="${libdirs} $(get_abi_LIBDIR ${abi})" 245 [ "$(get_abi_LIBDIR ${abi})" != "lib" ] && libdirs="${libdirs} $(get_abi_LIBDIR ${abi})"
281 done 246 done
282 fi
283 247
284 echo "${libdirs}" 248 echo "${libdirs}"
285} 249}
286 250
251# @FUNCTION: is_final_abi
252# @DESCRIPTION:
287# Return true if ${ABI} is the last ABI on our list (or if we're not 253# Return true if ${ABI} is the last ABI on our list (or if we're not
288# using the new multilib configuration. This can be used to determine 254# using the new multilib configuration. This can be used to determine
289# if we're in the last (or only) run through src_{unpack,compile,install} 255# if we're in the last (or only) run through src_{unpack,compile,install}
290is_final_abi() { 256is_final_abi() {
291 has_multilib_profile || return 0 257 has_multilib_profile || return 0
292 local ALL_ABIS=$(get_install_abis) 258 local ALL_ABIS=$(get_install_abis)
293 local LAST_ABI=${ALL_ABIS/* /} 259 local LAST_ABI=${ALL_ABIS/* /}
294 [[ ${LAST_ABI} == ${ABI} ]] 260 [[ ${LAST_ABI} == ${ABI} ]]
295} 261}
296 262
263# @FUNCTION: number_abis
264# @DESCRIPTION:
297# echo the number of ABIs we will be installing for 265# echo the number of ABIs we will be installing for
298number_abis() { 266number_abis() {
299 get_install_abis | wc -w 267 get_install_abis | wc -w
300} 268}
301 269
302# get_ml_incdir [<include dir> [<ABI>]] 270# @FUNCTION: get_ml_incdir
271# @USAGE: [include_dir] [ABI]
272# @DESCRIPTION:
303# include dir defaults to /usr/include 273# include dir defaults to /usr/include
304# ABI defaults to ${ABI} or ${DEFAULT_ABI} 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.
305get_ml_incdir() { 280get_ml_incdir() {
306 local dir=/usr/include 281 local dir=/usr/include
307 282
308 if [[ $# -gt 0 ]]; then 283 if [[ $# -gt 0 ]]; then
309 incdir=$1 284 incdir=$1
326 else 301 else
327 echo ${dir} 302 echo ${dir}
328 fi 303 fi
329} 304}
330 305
331# prep_ml_includes: 306# @FUNCTION: prep_ml_includes
332# 307# @DESCRIPTION:
333# Some includes (include/asm, glibc, etc) are ABI dependent. In this case, 308# Some includes (include/asm, glibc, etc) are ABI dependent. In this case,
334# We can install them in different locations for each ABI and create a common 309# We can install them in different locations for each ABI and create a common
335# header which includes the right one based on CDEFINE_${ABI}. If your 310# header which includes the right one based on CDEFINE_${ABI}. If your
336# package installs ABI-specific headers, just add 'prep_ml_includes' to the 311# package installs ABI-specific headers, just add 'prep_ml_includes' to the
337# end of your src_install(). It takes a list of directories that include 312# end of your src_install(). It takes a list of directories that include
338# files are installed in (default is /usr/include if none are passed). 313# files are installed in (default is /usr/include if none are passed).
339# 314#
340# Example: 315# Example:
341# src_install() { 316# src_install() {
342# ... 317# ...
343# prep_ml_includes /usr/qt/3/include 318# prep_ml_includes /usr/qt/3/include
344# } 319# }
345
346prep_ml_includes() { 320prep_ml_includes() {
347 if [[ $(number_abis) -gt 1 ]] ; then 321 if [[ $(number_abis) -gt 1 ]] ; then
348 local dir 322 local dir
349 local dirs 323 local dirs
350 local base 324 local base
363 done 337 done
364 338
365 if is_final_abi; then 339 if is_final_abi; then
366 base=${T}/gentoo-multilib 340 base=${T}/gentoo-multilib
367 pushd "${base}" 341 pushd "${base}"
368 find . | tar -c -T - -f - | tar -x --no-same-owner -f - -C ${D} 342 find . | tar -c -T - -f - | tar -x --no-same-owner -f - -C "${D}"
369 popd 343 popd
370 344
371 # This 'set' stuff is required by mips profiles to properly pass 345 # This 'set' stuff is required by mips profiles to properly pass
372 # CDEFINE's (which have spaces) to sub-functions 346 # CDEFINE's (which have spaces) to sub-functions
373 set -- 347 set --
381 done 355 done
382 fi 356 fi
383 fi 357 fi
384} 358}
385 359
360# @FUNCTION: create_ml_includes
361# @USAGE: <include_dir> <symbol_1>:<dir_1> [<symbol_2>:<dir_2>...]
362# @DESCRIPTION:
386# If you need more control than prep_ml_includes can offer (like linux-headers 363# If you need more control than prep_ml_includes can offer (like linux-headers
387# for the asm-* dirs, then use create_ml_includes. The firs argument is the 364# for the asm-* dirs, then use create_ml_includes. The firs argument is the
388# common dir. The remaining args are of the form <symbol>:<dir> where 365# common dir. The remaining args are of the form <symbol>:<dir> where
389# <symbol> is what is put in the #ifdef for choosing that dir. 366# <symbol> is what is put in the #ifdef for choosing that dir.
390# 367#
391# Ideas for this code came from debian's sparc-linux headers package. 368# Ideas for this code came from debian's sparc-linux headers package.
392# 369#
393# Example: 370# Example:
394# create_ml_includes /usr/include/asm __sparc__:/usr/include/asm-sparc __sparc64__:/usr/include/asm-sparc64 371# create_ml_includes /usr/include/asm __sparc__:/usr/include/asm-sparc __sparc64__:/usr/include/asm-sparc64
395# create_ml_includes /usr/include/asm __i386__:/usr/include/asm-i386 __x86_64__:/usr/include/asm-x86_64 372# create_ml_includes /usr/include/asm __i386__:/usr/include/asm-i386 __x86_64__:/usr/include/asm-x86_64
396# 373#
397# Warning: Be careful with the ordering here. The default ABI has to be the 374# Warning: Be careful with the ordering here. The default ABI has to be the
398# last, because it is always defined (by GCC) 375# last, because it is always defined (by GCC)
399create_ml_includes() { 376create_ml_includes() {
400 local dest=$1 377 local dest=$1
504 dodir ${dest} 481 dodir ${dest}
505 482
506 local basedir 483 local basedir
507 for basedir in ${basedirs}; do 484 for basedir in ${basedirs}; do
508 local dir 485 local dir
509 for dir in $(find ${D}/${basedir} -type d); do 486 for dir in $(find "${D}"/${basedir} -type d); do
510 dodir ${dest}/${dir/${D}\/${basedir}/} 487 dodir ${dest}/${dir/${D}\/${basedir}/}
511 done 488 done
512 done 489 done
513} 490}
514 491
536 echo "Shouldn't be here -- create_ml_includes-sym_for_dir $1 $@" 513 echo "Shouldn't be here -- create_ml_includes-sym_for_dir $1 $@"
537 # exit because we'll likely be called from a subshell 514 # exit because we'll likely be called from a subshell
538 exit 1 515 exit 1
539} 516}
540 517
518# @FUNCTION: get_libname
519# @USAGE: [version]
520# @DESCRIPTION:
521# Returns libname with proper suffix {.so,.dylib} and optionally supplied version
522# for ELF/MACH-O shared objects
523#
524# Example:
525# get_libname libfoo ${PV}
526# Returns: libfoo.so.${PV} (ELF) || libfoo.${PV}.dylib (MACH)
541get_libname() { 527get_libname() {
542 local libname 528 local libname
543 local ver=$1 529 local ver=$1
544 case ${CHOST} in 530 case ${CHOST} in
531 *-cygwin|mingw*|*-mingw*) libname="dll";;
545 *-darwin*) libname="dylib";; 532 *-darwin*) libname="dylib";;
546 *) libname="so";; 533 *) libname="so";;
547 esac 534 esac
548 535
549 if [[ -z $@ ]] ; then 536 if [[ -z $* ]] ; then
550 echo ".${libname}" 537 echo ".${libname}"
551 else 538 else
552 for ver in "$@" ; do 539 for ver in "$@" ; do
553 case ${CHOST} in 540 case ${CHOST} in
554 *-darwin*) echo ".${ver}.${libname}";; 541 *-darwin*) echo ".${ver}.${libname}";;
571 export CDEFINE_x86="__i386__" 558 export CDEFINE_x86="__i386__"
572 export LIBDIR_x86="lib" 559 export LIBDIR_x86="lib"
573 560
574 export CFLAGS_amd64=${CFLAGS_amd64--m64} 561 export CFLAGS_amd64=${CFLAGS_amd64--m64}
575 export CHOST_amd64=${CTARGET} 562 export CHOST_amd64=${CTARGET}
576 export CTARGET_amd64=${CTARGET_amd64} 563 export CTARGET_amd64=${CHOST_amd64}
577 export CDEFINE_amd64="__x86_64__" 564 export CDEFINE_amd64="__x86_64__"
578 export LIBDIR_amd64="lib64" 565 export LIBDIR_amd64="lib64"
579 566
580 export MULTILIB_ABIS="amd64 x86" 567 export MULTILIB_ABIS="amd64 x86"
581 export DEFAULT_ABI="amd64" 568 export DEFAULT_ABI="amd64"
632 export LIBDIR_s390x="lib64" 619 export LIBDIR_s390x="lib64"
633 620
634 export MULTILIB_ABIS="s390x s390" 621 export MULTILIB_ABIS="s390x s390"
635 export DEFAULT_ABI="s390x" 622 export DEFAULT_ABI="s390x"
636 ;; 623 ;;
637 sparc64*) 624 sparc*)
638 export CFLAGS_sparc32=${CFLAGS_sparc32--m32} 625 export CFLAGS_sparc32=${CFLAGS_sparc32}
639 export CHOST_sparc32=${CTARGET/sparc64/sparc} 626 export CHOST_sparc32=${CTARGET/sparc64/sparc}
640 export CTARGET_sparc32=${CHOST_sparc32} 627 export CTARGET_sparc32=${CHOST_sparc32}
641 export CDEFINE_sparc32="!__arch64__" 628 export CDEFINE_sparc32="!__arch64__"
642 export LIBDIR_sparc32="lib" 629 export LIBDIR_sparc32="lib"
643 630
645 export CHOST_sparc64=${CTARGET} 632 export CHOST_sparc64=${CTARGET}
646 export CTARGET_sparc64=${CHOST_sparc64} 633 export CTARGET_sparc64=${CHOST_sparc64}
647 export CDEFINE_sparc64="__arch64__" 634 export CDEFINE_sparc64="__arch64__"
648 export LIBDIR_sparc64="lib64" 635 export LIBDIR_sparc64="lib64"
649 636
650 export MULTILIB_ABIS="sparc64 sparc32" 637 export MULTILIB_ABIS="${MULTILIB_ABIS-sparc64 sparc32}"
651 export DEFAULT_ABI="sparc64" 638 export DEFAULT_ABI="${DEFAULT_ABI-sparc64}"
652 ;; 639 ;;
653 *) 640 *)
654 export MULTILIB_ABIS="default" 641 export MULTILIB_ABIS="default"
655 export DEFAULT_ABI="default" 642 export DEFAULT_ABI="default"
656 ;; 643 ;;
657 esac 644 esac
658} 645}
659 646
647# @FUNCTION: multilib_toolchain_setup
648# @DESCRIPTION:
660# Hide multilib details here for packages which are forced to be compiled for a 649# Hide multilib details here for packages which are forced to be compiled for a
661# specific ABI when run on another ABI (like x86-specific packages on amd64) 650# specific ABI when run on another ABI (like x86-specific packages on amd64)
662multilib_toolchain_setup() { 651multilib_toolchain_setup() {
652 local v vv
653
663 export ABI=$1 654 export ABI=$1
664 655
665 # Binutils doesn't have wrappers for ld and as (yet). Eventually it 656 # We want to avoid the behind-the-back magic of gcc-config as it
666 # will, and all this can just be handled with CHOST. 657 # screws up ccache and distcc. See #196243 for more info.
667 export LD="ld $(get_abi_LDFLAGS)" 658 if [[ ${ABI} != ${DEFAULT_ABI} ]] ; then
659 if [[ ${DEFAULT_ABI_SAVED} != "true" ]] ; then
660 for v in CHOST CBUILD AS CC CXX LD ; do
661 export __abi_saved_${v}="${!v}"
662 done
663 export DEFAULT_ABI_SAVED="true"
664 fi
665
666 # Set the CHOST native first so that we pick up the native
667 # toolchain and not a cross-compiler by accident #202811.
668 export CHOST=$(get_abi_CHOST ${DEFAULT_ABI})
668 export AS="as $(get_abi_ASFLAGS)" 669 export AS="$(tc-getAS) $(get_abi_ASFLAGS)"
669 670 export CC="$(tc-getCC) $(get_abi_CFLAGS)"
671 export CXX="$(tc-getCXX) $(get_abi_CFLAGS)"
672 export LD="$(tc-getLD) $(get_abi_LDFLAGS)"
670 export CHOST=$(get_abi_CHOST) 673 export CHOST=$(get_abi_CHOST $1)
671 export CBUILD=$(get_abi_CHOST) 674 export CBUILD=$(get_abi_CHOST $1)
675
676 elif [[ ${DEFAULT_ABI_SAVED} == "true" ]] ; then
677 for v in CHOST CBUILD AS CC CXX LD ; do
678 vv="__abi_saved_${v}"
679 export ${v}=${!vv}
680 done
681 fi
672} 682}

Legend:
Removed from v.1.52  
changed lines
  Added in v.1.72

  ViewVC Help
Powered by ViewVC 1.1.20