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

Diff of /eclass/multilib.eclass

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

Revision 1.5 Revision 1.65
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.5 2005/01/12 22:39:44 eradicator Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/multilib.eclass,v 1.65 2008/06/01 01:37:29 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
10ECLASS=multilib 13___ECLASS_RECUR_MULTILIB="yes"
11INHERITED="$INHERITED $ECLASS" 14[[ -z ${___ECLASS_RECUR_TOOLCHAIN_FUNCS} ]] && inherit toolchain-funcs
12 15
13DESCRIPTION="Based on the ${ECLASS} eclass" 16# is_final_abi:
17# Return true if ${ABI} is the final abi to be installed (and thus we are
18# on our last run through a src_* function.
14 19
15DEPEND="!build? ( sys-apps/sed sys-apps/findutils sys-apps/coreutils )" 20# number_abis:
21# echo the number of ABIs we will be installing for
16 22
23# get_install_abis:
24# Return a list of the ABIs we want to install for with
25# the last one in the list being the default.
26
27# get_all_abis:
28# Return a list of the ABIs supported by this profile.
29# the last one in the list being the default.
30
31# get_all_libdirs:
32# Returns a list of all the libdirs used by this profile. This includes
33# those that might not be touched by the current ebuild and always includes
34# "lib".
35
36# get_libdir:
37# Returns the libdir for the selected ABI. This is backwards compatible
38# and simply calls get_abi_LIBDIR() on newer profiles. You should use this
39# to determine where to install shared objects (ex: /usr/$(get_libdir))
40
41# get_abi_var <VAR> [<ABI>]:
42# returns the value of ${<VAR>_<ABI>} which should be set in make.defaults
43#
44# get_abi_CFLAGS:
45# get_abi_CDEFINE:
46# get_abi_LIBDIR:
47# Aliases for 'get_abi_var CFLAGS', etc.
48
49# get_ml_incdir [<include dir> [<ABI>]]
50# include dir defaults to /usr/include
51# ABI defaults to ${ABI} or ${DEFAULT_ABI}
52#
53# If a multilib include dir is associated with the passed include dir, then
54# we return it, otherwise, we just echo back the include dir. This is
55# neccessary when a built script greps header files rather than testing them
56# via #include (like perl) to figure out features.
57
58# prep_ml_includes:
59# Some includes (include/asm, glibc, etc) are ABI dependent. In this case,
60# We can install them in different locations for each ABI and create a common
61# header which includes the right one based on CDEFINE_${ABI}. If your
62# package installs ABI-specific headers, just add 'prep_ml_includes' to the
63# end of your src_install(). It takes a list of directories that include
64# files are installed in (default is /usr/include if none are passed).
65#
66# Example:
67# src_install() {
68# ...
69# prep_ml_includes /usr/qt/3/include
70# }
71
72# create_ml_includes <include dir> <symbol 1>:<dir 1> [<symbol 2>:<dir 2> ...]
73# If you need more control than prep_ml_includes can offer (like linux-headers
74# for the asm-* dirs, then use create_ml_includes. The firs argument is the
75# common dir. The remaining args are of the form <symbol>:<dir> where
76# <symbol> is what is put in the #ifdef for choosing that dir.
77#
78# Ideas for this code came from debian's sparc-linux headers package.
79#
80# Example:
81# create_ml_includes /usr/include/asm __sparc__:/usr/include/asm-sparc __sparc64__:/usr/include/asm-sparc64
82# create_ml_includes /usr/include/asm __i386__:/usr/include/asm-i386 __x86_64__:/usr/include/asm-x86_64
83
84# get_libname [version]
85# returns libname with proper suffix {.so,.dylib} and optionally supplied version
86# for ELF/MACH-O shared objects
87#
88# Example:
89# get_libname libfoo ${PV}
90# Returns: libfoo.so.${PV} (ELF) || libfoo.${PV}.dylib (MACH)
91
92### END DOCUMENTATION ###
93
94# Defaults:
95export MULTILIB_ABIS=${MULTILIB_ABIS:-"default"}
96export DEFAULT_ABI=${DEFAULT_ABI:-"default"}
97export CFLAGS_default
98export LDFLAGS_default
99export CHOST_default=${CHOST_default:-${CHOST}}
100export CTARGET_default=${CTARGET_default:-${CTARGET:-${CHOST_default}}}
101export LIBDIR_default=${CONF_LIBDIR:-"lib"}
102export CDEFINE_default="__unix__"
103export KERNEL_ABI=${KERNEL_ABI:-${DEFAULT_ABI}}
104
105# @FUNCTION: has_multilib_profile
106# @DESCRIPTION:
107# Return true if the current profile is a multilib profile and lists more than
108# one abi in ${MULTILIB_ABIS}. When has_multilib_profile returns true, that
109# profile should enable the 'multilib' use flag. This is so you can DEPEND on
110# a package only for multilib or not multilib.
111has_multilib_profile() {
112 [ -n "${MULTILIB_ABIS}" -a "${MULTILIB_ABIS}" != "${MULTILIB_ABIS/ /}" ]
113}
114
115# @FUNCTION: get_libdir
116# @RETURN: the libdir for the selected ABI
117# @DESCRIPTION:
17# This function simply returns the desired lib directory. With portage 118# This function simply returns the desired lib directory. With portage
18# 2.0.51, we now have support for installing libraries to lib32/lib64 119# 2.0.51, we now have support for installing libraries to lib32/lib64
19# to accomidate the needs of multilib systems. It's no longer a good idea 120# to accomidate the needs of multilib systems. It's no longer a good idea
20# to assume all libraries will end up in lib. Replace any (sane) instances 121# to assume all libraries will end up in lib. Replace any (sane) instances
21# where lib is named directly with $(get_libdir) if possible. 122# where lib is named directly with $(get_libdir) if possible.
22#
23# Travis Tilley <lv@gentoo.org> (24 Aug 2004)
24# 123#
25# Jeremy Huddleston <eradicator@gentoo.org> (23 Dec 2004): 124# Jeremy Huddleston <eradicator@gentoo.org> (23 Dec 2004):
26# Added support for ${ABI} and ${DEFAULT_ABI}. If they're both not set, 125# Added support for ${ABI} and ${DEFAULT_ABI}. If they're both not set,
27# fall back on old behavior. Any profile that has these set should also 126# fall back on old behavior. Any profile that has these set should also
28# depend on a newer version of portage (not yet released) which uses these 127# depend on a newer version of portage (not yet released) which uses these
29# over CONF_LIBDIR in econf, dolib, etc... 128# over CONF_LIBDIR in econf, dolib, etc...
30get_libdir() { 129get_libdir() {
31 LIBDIR_TEST=$(type econf) 130 local CONF_LIBDIR
32 if [ ! -z "${CONF_LIBDIR_OVERRIDE}" ] ; then 131 if [ -n "${CONF_LIBDIR_OVERRIDE}" ] ; then
33 # if there is an override, we want to use that... always. 132 # if there is an override, we want to use that... always.
34 CONF_LIBDIR="${CONF_LIBDIR_OVERRIDE}" 133 echo ${CONF_LIBDIR_OVERRIDE}
35 elif [ -n "$(get_abi_LIBDIR)" ]; then 134 else
36 CONF_LIBDIR="$(get_abi_LIBDIR)" 135 get_abi_LIBDIR
37 elif [ "${LIBDIR_TEST/CONF_LIBDIR}" == "${LIBDIR_TEST}" ]; then # we don't have CONF_LIBDIR support
38 # will be <portage-2.0.51_pre20
39 CONF_LIBDIR="lib"
40 fi 136 fi
41 # and of course, default to lib if CONF_LIBDIR isnt set
42 echo ${CONF_LIBDIR:=lib}
43 unset LIBDIR_TEST
44} 137}
45 138
139# @FUNCTION: get_multilibdir
140# @RETURN: Returns the multilibdir
46get_multilibdir() { 141get_multilibdir() {
47 if [ -n "$(get_abi_LIBDIR)" ]; then 142 if has_multilib_profile; then
48 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" 143 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"
49 exit 1 144 exit 1
50 fi 145 fi
51 echo ${CONF_MULTILIBDIR:=lib32} 146 echo ${CONF_MULTILIBDIR:=lib32}
52} 147}
53 148
149# @FUNCTION: get_libdir_override
150# @DESCRIPTION:
54# Sometimes you need to override the value returned by get_libdir. A good 151# Sometimes you need to override the value returned by get_libdir. A good
55# example of this is xorg-x11, where lib32 isnt a supported configuration, 152# example of this is xorg-x11, where lib32 isnt a supported configuration,
56# and where lib64 -must- be used on amd64 (for applications that need lib 153# and where lib64 -must- be used on amd64 (for applications that need lib
57# to be 32bit, such as adobe acrobat). Note that this override also bypasses 154# to be 32bit, such as adobe acrobat). Note that this override also bypasses
58# portage version sanity checking. 155# portage version sanity checking.
59# get_libdir_override expects one argument, the result get_libdir should 156# get_libdir_override expects one argument, the result get_libdir should
60# return: 157# return:
61# 158#
62# get_libdir_override lib64 159# get_libdir_override lib64
63#
64# Travis Tilley <lv@gentoo.org> (31 Aug 2004)
65get_libdir_override() { 160get_libdir_override() {
66 if [ -n "$(get_abi_LIBDIR)" ]; then 161 if has_multilib_profile; then
67 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" 162 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"
68 exit 1 163 exit 1
69 fi 164 fi
70 CONF_LIBDIR="$1" 165 CONF_LIBDIR="$1"
71 CONF_LIBDIR_OVERRIDE="$1" 166 CONF_LIBDIR_OVERRIDE="$1"
167 LIBDIR_default="$1"
72} 168}
73 169
74# get_abi_var <VAR> [<ABI>] 170# @FUNCTION: get_abi_var
171# @USAGE: <VAR> [ABI]
75# returns the value of ${<VAR>_<ABI>} which should be set in make.defaults 172# @RETURN: returns the value of ${<VAR>_<ABI>} which should be set in make.defaults
76# 173# @DESCRIPTION:
77# ex: 174# ex:
78# CFLAGS=$(get_abi_var CFLAGS sparc32) # CFLAGS=-m32 175# CFLAGS=$(get_abi_var CFLAGS sparc32) # CFLAGS=-m32
79# 176#
80# Note that the prefered method is to set CC="$(tc-getCC) $(get_abi_CFLAGS)" 177# Note that the prefered method is to set CC="$(tc-getCC) $(get_abi_CFLAGS)"
81# This will hopefully be added to portage soon... 178# This will hopefully be added to portage soon...
82# 179#
83# If <ABI> is not specified, ${ABI} is used. 180# If <ABI> is not specified, ${ABI} is used.
84# If <ABI> is not specified and ${ABI} is not defined, ${DEFAULT_ABI} is used. 181# If <ABI> is not specified and ${ABI} is not defined, ${DEFAULT_ABI} is used.
85# If <ABI> is not specified and ${ABI} and ${DEFAULT_ABI} are not defined, we return an empty string. 182# If <ABI> is not specified and ${ABI} and ${DEFAULT_ABI} are not defined, we return an empty string.
86#
87# Jeremy Huddleston <eradicator@gentoo.org>
88get_abi_var() { 183get_abi_var() {
89 local flag=${1} 184 local flag=$1
90 local abi 185 local abi
91 if [ $# -gt 1 ]; then 186 if [ $# -gt 1 ]; then
92 abi=${2} 187 abi=${2}
93 elif [ -n "${ABI}" ]; then 188 elif [ -n "${ABI}" ]; then
94 abi=${ABI} 189 abi=${ABI}
95 elif [ -n "${DEFAULT_ABI}" ]; then 190 elif [ -n "${DEFAULT_ABI}" ]; then
96 abi=${DEFAULT_ABI} 191 abi=${DEFAULT_ABI}
97 else 192 else
98 return 1 193 abi="default"
99 fi 194 fi
100 195
101 local var="${flag}_${abi}" 196 local var="${flag}_${abi}"
102 echo ${!var} 197 echo ${!var}
103} 198}
104 199
200# @FUNCTION: get_abi_CFLAGS
201# @USAGE: [ABI]
202# @DESCRIPTION:
203# Alias for 'get_abi_var CFLAGS'
105get_abi_CFLAGS() { get_abi_var CFLAGS ${@}; } 204get_abi_CFLAGS() { get_abi_var CFLAGS "$@"; }
205
206# @FUNCTION: get_abi_ASFLAGS
207# @USAGE: [ABI]
208# @DESCRIPTION:
209# Alias for 'get_abi_var ASFLAGS'
210get_abi_ASFLAGS() { get_abi_var ASFLAGS "$@"; }
211
212# @FUNCTION: get_abi_LDFLAGS
213# @USAGE: [ABI]
214# @DESCRIPTION:
215# Alias for 'get_abi_var LDFLAGS'
216get_abi_LDFLAGS() { get_abi_var LDFLAGS "$@"; }
217
218# @FUNCTION: get_abi_CHOST
219# @USAGE: [ABI]
220# @DESCRIPTION:
221# Alias for 'get_abi_var CHOST'
222get_abi_CHOST() { get_abi_var CHOST "$@"; }
223
224# @FUNCTION: get_abi_CTARGET
225# @USAGE: [ABI]
226# @DESCRIPTION:
227# Alias for 'get_abi_var CTARGET'
228get_abi_CTARGET() { get_abi_var CTARGET "$@"; }
229
230# @FUNCTION: get_abi_FAKE_TARGETS
231# @USAGE: [ABI]
232# @DESCRIPTION:
233# Alias for 'get_abi_var FAKE_TARGETS'
234get_abi_FAKE_TARGETS() { get_abi_var FAKE_TARGETS "$@"; }
235
236# @FUNCTION: get_abi_CDEFINE
237# @USAGE: [ABI]
238# @DESCRIPTION:
239# Alias for 'get_abi_var CDEFINE'
106get_abi_CDEFINE() { get_abi_var CDEFINE ${@}; } 240get_abi_CDEFINE() { get_abi_var CDEFINE "$@"; }
241
242# @FUNCTION: get_abi_LIBDIR
243# @USAGE: [ABI]
244# @DESCRIPTION:
245# Alias for 'get_abi_var LIBDIR'
107get_abi_LIBDIR() { get_abi_var LIBDIR ${@}; } 246get_abi_LIBDIR() { get_abi_var LIBDIR "$@"; }
108 247
248# @FUNCTION: get_install_abis
249# @DESCRIPTION:
109# Return a list of the ABIs we want to install for with 250# Return a list of the ABIs we want to install for with
110# the last one in the list being the default. 251# the last one in the list being the default.
111get_abi_order() { 252get_install_abis() {
112 local order="" 253 local order=""
113 254
114 if [ -z "${MULTILIB_ABIS}" ]; then 255 if [[ -z ${MULTILIB_ABIS} ]] ; then
115 echo "NOMULTILIB" 256 echo "default"
116 return 1 257 return 0
117 fi 258 fi
118 259
119 if hasq multilib-pkg-force ${RESTRICT} || 260 if [[ ${EMULTILIB_PKG} == "true" ]] ; then
120 { hasq multilib-pkg ${FEATURES} && hasq multilib-pkg ${RESTRICT}; }; then
121 for x in ${MULTILIB_ABIS}; do 261 for x in ${MULTILIB_ABIS} ; do
122 if [ "${x}" != "${DEFAULT_ABI}" ]; then 262 if [[ ${x} != "${DEFAULT_ABI}" ]] ; then
123 hasq ${x} ${ABI_DENY} || ordera="${ordera} ${x}" 263 hasq ${x} ${ABI_DENY} || ordera="${ordera} ${x}"
124 fi 264 fi
125 done 265 done
126 hasq ${DEFAULT_ABI} ${ABI_DENY} || order="${ordera} ${DEFAULT_ABI}" 266 hasq ${DEFAULT_ABI} ${ABI_DENY} || order="${ordera} ${DEFAULT_ABI}"
127 267
128 if [ -n "${ABI_ALLOW}" ]; then 268 if [[ -n ${ABI_ALLOW} ]] ; then
129 local ordera="" 269 local ordera=""
130 for x in ${order}; do 270 for x in ${order} ; do
131 if hasq ${x} ${ABI_ALLOW}; then 271 if hasq ${x} ${ABI_ALLOW} ; then
132 ordera="${ordera} ${x}" 272 ordera="${ordera} ${x}"
133 fi 273 fi
134 done 274 done
135 order="${ordera}" 275 order=${ordera}
136 fi 276 fi
137 else 277 else
138 order="${DEFAULT_ABI}" 278 order=${DEFAULT_ABI}
139 fi 279 fi
140 280
141 if [ -z "${order}" ]; then 281 if [[ -z ${order} ]] ; then
142 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." 282 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."
143 fi 283 fi
144 284
145 echo ${order} 285 echo ${order}
146 return 0 286 return 0
147} 287}
148 288
149# get_all_libdir() 289# @FUNCTION: get_all_abis
290# @DESCRIPTION:
291# Return a list of the ABIs supported by this profile.
292# the last one in the list being the default.
293get_all_abis() {
294 local order=""
295
296 if [[ -z ${MULTILIB_ABIS} ]] ; then
297 echo "default"
298 return 0
299 fi
300
301 for x in ${MULTILIB_ABIS}; do
302 if [[ ${x} != ${DEFAULT_ABI} ]] ; then
303 order="${order:+${order} }${x}"
304 fi
305 done
306 order="${order:+${order} }${DEFAULT_ABI}"
307
308 echo ${order}
309 return 0
310}
311
312# @FUNCTION: get_all_libdirs
313# @DESCRIPTION:
150# Returns a list of all the libdirs used by this profile. This includes 314# Returns a list of all the libdirs used by this profile. This includes
151# those that might not be touched by the current ebuild. 315# those that might not be touched by the current ebuild and always includes
316# "lib".
152get_all_libdirs() { 317get_all_libdirs() {
153 local libdirs="lib" 318 local libdirs="lib"
154 local abi 319 local abi
155 local dir 320 local dir
156 321
157 if [ -n "${MULTILIB_ABIS}" ]; then
158 for abi in ${MULTILIB_ABIS}; do 322 for abi in ${MULTILIB_ABIS}; do
159 [ "$(get_abi_LIBDIR ${abi})" != "lib" ] && libdirs="${libdirs} $(get_abi_LIBDIR ${abi})" 323 [ "$(get_abi_LIBDIR ${abi})" != "lib" ] && libdirs="${libdirs} $(get_abi_LIBDIR ${abi})"
160 done 324 done
161 elif [ -n "${CONF_LIBDIR}" ]; then
162 for dir in ${CONF_LIBDIR} ${CONF_MULTILIBDIR:=lib32}; do
163 [ "${dir}" != "lib" ] && libdirs="${libdirs} ${dir}"
164 done
165 fi
166 325
167 echo "${libdirs}" 326 echo "${libdirs}"
168} 327}
169 328
329# @FUNCTION: is_final_abi
330# @DESCRIPTION:
170# Return true if ${ABI} is the last ABI on our list (or if we're not 331# Return true if ${ABI} is the last ABI on our list (or if we're not
171# using the new multilib configuration. This can be used to determine 332# using the new multilib configuration. This can be used to determine
172# if we're in the last (or only) run through src_{unpack,compile,install} 333# if we're in the last (or only) run through src_{unpack,compile,install}
173is_final_abi() { 334is_final_abi() {
174 [ -z "${ABI}" ] && return 0 335 has_multilib_profile || return 0
175 local ALL_ABIS=$(get_abi_order) 336 local ALL_ABIS=$(get_install_abis)
176 local LAST_ABI=${ALL_ABIS/* /} 337 local LAST_ABI=${ALL_ABIS/* /}
177 [ "${LAST_ABI}" = "${ABI}" ] 338 [[ ${LAST_ABI} == ${ABI} ]]
178} 339}
179 340
341# @FUNCTION: number_abis
342# @DESCRIPTION:
180# echo the number of ABIs we will be installing for 343# echo the number of ABIs we will be installing for
181number_abis() { 344number_abis() {
182 get_abi_order | wc -w 345 get_install_abis | wc -w
183} 346}
184 347
348# @FUNCTION: get_ml_incdir
349# @USAGE: [include_dir] [ABI]
350# @DESCRIPTION:
351# include dir defaults to /usr/include
352# ABI defaults to ${ABI} or ${DEFAULT_ABI}
353#
354# If a multilib include dir is associated with the passed include dir, then
355# we return it, otherwise, we just echo back the include dir. This is
356# neccessary when a built script greps header files rather than testing them
357# via #include (like perl) to figure out features.
358get_ml_incdir() {
359 local dir=/usr/include
360
361 if [[ $# -gt 0 ]]; then
362 incdir=$1
363 shift
364 fi
365
366 if [[ -z "${MULTILIB_ABIS}" ]]; then
367 echo ${incdir}
368 return 0
369 fi
370
371 local abi=${ABI-${DEFAULT_ABI}}
372 if [[ $# -gt 0 ]]; then
373 abi=$1
374 shift
375 fi
376
377 if [[ -d "${dir}/gentoo-multilib/${abi}" ]]; then
378 echo ${dir}/gentoo-multilib/${abi}
379 else
380 echo ${dir}
381 fi
382}
383
185# prep_ml_includes: 384# @FUNCTION: prep_ml_includes
186# 385# @DESCRIPTION:
187# Some includes (include/asm, glibc, etc) are ABI dependent. In this case, 386# Some includes (include/asm, glibc, etc) are ABI dependent. In this case,
188# We can install them in different locations for each ABI and create a common 387# We can install them in different locations for each ABI and create a common
189# header which includes the right one based on CDEFINE_${ABI}. If your 388# header which includes the right one based on CDEFINE_${ABI}. If your
190# package installs ABI-specific headers, just add 'prep_ml_includes' to the 389# package installs ABI-specific headers, just add 'prep_ml_includes' to the
191# end of your src_install(). It takes a list of directories that include 390# end of your src_install(). It takes a list of directories that include
192# files are installed in (default is /usr/include if none are passed). 391# files are installed in (default is /usr/include if none are passed).
193# 392#
194# Example: 393# Example:
195# src_install() { 394# src_install() {
196# ... 395# ...
197# prep_ml_includes /usr/qt/3/include 396# prep_ml_includes /usr/qt/3/include
198# } 397# }
199
200prep_ml_includes() { 398prep_ml_includes() {
201 local dirs
202 if [ ${#} -eq 0 ]; then
203 dirs="/usr/include"
204 else
205 dirs="${@}"
206 fi
207
208 if [ $(number_abis) -gt 1 ]; then 399 if [[ $(number_abis) -gt 1 ]] ; then
209 local dir 400 local dir
401 local dirs
402 local base
403
404 if [[ $# -eq 0 ]] ; then
405 dirs=/usr/include
406 else
407 dirs="$@"
408 fi
409
210 for dir in ${dirs}; do 410 for dir in ${dirs} ; do
411 base=${T}/gentoo-multilib/${dir}/gentoo-multilib
412 mkdir -p "${base}"
413 [[ -d ${base}/${ABI} ]] && rm -rf "${base}/${ABI}"
211 mv ${D}/${dir} ${D}/${dir}.${ABI} 414 mv "${D}/${dir}" "${base}/${ABI}"
212 done 415 done
213 416
214 if is_final_abi; then 417 if is_final_abi; then
418 base=${T}/gentoo-multilib
419 pushd "${base}"
420 find . | tar -c -T - -f - | tar -x --no-same-owner -f - -C ${D}
421 popd
422
423 # This 'set' stuff is required by mips profiles to properly pass
424 # CDEFINE's (which have spaces) to sub-functions
425 set --
215 for dir in ${dirs}; do 426 for dir in ${dirs} ; do
216 local args="${dir}" 427 set -- "$@" "${dir}"
217 local abi 428 local abi
218 for abi in $(get_abi_order); do 429 for abi in $(get_install_abis); do
219 args="${args} $(get_abi_CDEFINE ${abi}):${dir}.${abi}" 430 set -- "$@" "$(get_abi_CDEFINE ${abi}):${dir}/gentoo-multilib/${abi}"
220 done 431 done
221 create_ml_includes ${args} 432 create_ml_includes "$@"
222 done 433 done
223 fi 434 fi
224 fi 435 fi
225} 436}
226 437
438# @FUNCTION: create_ml_includes
439# @USAGE: <include_dir> <symbol_1>:<dir_1> [<symbol_2>:<dir_2>...]
440# @DESCRIPTION:
227# If you need more control than prep_ml_includes can offer (like linux-headers 441# If you need more control than prep_ml_includes can offer (like linux-headers
228# for the asm-* dirs, then use create_ml_includes. The firs argument is the 442# for the asm-* dirs, then use create_ml_includes. The firs argument is the
229# common dir. The remaining args are of the form <symbol>:<dir> where 443# common dir. The remaining args are of the form <symbol>:<dir> where
230# <symbol> is what is put in the #ifdef for choosing that dir. 444# <symbol> is what is put in the #ifdef for choosing that dir.
231# 445#
232# Ideas for this code came from debian's sparc-linux headers package. 446# Ideas for this code came from debian's sparc-linux headers package.
233# 447#
234# Example: 448# Example:
235# create_ml_includes /usr/include/asm __sparc__:/usr/include/asm-sparc __sparc64__:/usr/include/asm-sparc64 449# create_ml_includes /usr/include/asm __sparc__:/usr/include/asm-sparc __sparc64__:/usr/include/asm-sparc64
236# create_ml_includes /usr/include/asm __i386__:/usr/include/asm-i386 __x86_64__:/usr/include/asm-x86_64 450# create_ml_includes /usr/include/asm __i386__:/usr/include/asm-i386 __x86_64__:/usr/include/asm-x86_64
451#
452# Warning: Be careful with the ordering here. The default ABI has to be the
453# last, because it is always defined (by GCC)
237create_ml_includes() { 454create_ml_includes() {
238 local dest="${1}" 455 local dest=$1
239 shift 456 shift
240 local mlinfo="${@}"
241 local basedirs=$(create_ml_includes-listdirs ${mlinfo}) 457 local basedirs=$(create_ml_includes-listdirs "$@")
242 458
243 create_ml_includes-makedestdirs ${dest} ${basedirs} 459 create_ml_includes-makedestdirs ${dest} ${basedirs}
244 460
245 local file 461 local file
246 for file in $(create_ml_includes-allfiles ${basedirs}); do 462 for file in $(create_ml_includes-allfiles ${basedirs}) ; do
247 local name="$(echo $file | tr a-z A-Z | sed 's:[^A-Z]:_:g')" 463 #local name=$(echo ${file} | tr '[:lower:]' '[:upper:]' | sed 's:[^[:upper:]]:_:g')
248 { 464 (
249 echo "/* Common header file autogenerated by create_ml_includes in multilib.eclass */" 465 echo "/* Autogenerated by create_ml_includes() in multilib.eclass */"
250 #echo "#ifndef __CREATE_ML_INCLUDES_STUB_${name}__"
251 #echo "#define __CREATE_ML_INCLUDES_STUB_${name}__"
252 #echo ""
253 466
254 local dir 467 local dir
255 for dir in ${basedirs}; do 468 for dir in ${basedirs}; do
256 if [ -f "${D}/${dir}/${file}" ]; then 469 if [[ -f ${D}/${dir}/${file} ]] ; then
257 echo "#ifdef $(create_ml_includes-sym_for_dir ${dir} ${mlinfo})"
258 echo "#include \"$(create_ml_includes-relative_between ${dest}/$(dirname ${file}) ${dir}/${file})\""
259 echo "#endif /* $(create_ml_includes-sym_for_dir ${dir} ${mlinfo}) */"
260 echo "" 470 echo ""
471 local sym=$(create_ml_includes-sym_for_dir ${dir} "$@")
472 if [[ ${sym/=} != "${sym}" ]] ; then
473 echo "#if ${sym}"
474 elif [[ ${sym::1} == "!" ]] ; then
475 echo "#ifndef ${sym:1}"
476 else
477 echo "#ifdef ${sym}"
478 fi
479 echo "# include <$(create_ml_includes-absolute ${dir}/${file})>"
480 echo "#endif /* ${sym} */"
261 fi 481 fi
262 done 482 done
263 483
264 #echo "#endif /* __CREATE_ML_INCLUDES_STUB_${name}__ */" 484 #echo "#endif /* __CREATE_ML_INCLUDES_STUB_${name}__ */"
265 } > ${D}/${dest}/${file} 485 ) > "${D}/${dest}/${file}"
266 done 486 done
267} 487}
268 488
269# Helper function for create_ml_includes 489# Helper function for create_ml_includes
270create_ml_includes-relative_between() { 490create_ml_includes-absolute() {
271 local src="$(create_ml_includes-tidy_path ${1})"
272 local dst="$(create_ml_includes-tidy_path ${2})" 491 local dst="$(create_ml_includes-tidy_path $1)"
273 492
274 src=(${src//\// })
275 dst=(${dst//\// }) 493 dst=(${dst//\// })
276 494
277 local i 495 local i
278 for ((i=0; i<${#src[*]}; i++)); do 496 for ((i=0; i<${#dst[*]}; i++)); do
279 [ "${dst[i]}" != "${src[i]}" ] && break 497 [ "${dst[i]}" == "include" ] && break
280 done 498 done
281 499
282 local common=$i 500 local strip_upto=$i
283 501
284 for ((i=${#src[*]}; i>common; i--)); do
285 echo -n ../
286 done
287
288 for ((i=common; i<${#dst[*]}-1; i++)); do 502 for ((i=strip_upto+1; i<${#dst[*]}-1; i++)); do
289 echo -n ${dst[i]}/ 503 echo -n ${dst[i]}/
290 done 504 done
291 505
292 echo -n ${dst[i]} 506 echo -n ${dst[i]}
293} 507}
294 508
295# Helper function for create_ml_includes 509# Helper function for create_ml_includes
296create_ml_includes-tidy_path() { 510create_ml_includes-tidy_path() {
297 local removed="${1}" 511 local removed=$1
298 512
299 if [ -n "${1}" ]; then 513 if [ -n "${removed}" ]; then
300 # Remove multiple slashes 514 # Remove multiple slashes
301 while [ "${removed}" != "${removed/\/\//\/}" ]; do 515 while [ "${removed}" != "${removed/\/\//\/}" ]; do
302 removed=${removed/\/\//\/} 516 removed=${removed/\/\//\/}
303 done 517 done
304 518
307 removed=${removed//\/.\//\/} 521 removed=${removed//\/.\//\/}
308 done 522 done
309 [ "${removed##*/}" = "." ] && removed=${removed%/*} 523 [ "${removed##*/}" = "." ] && removed=${removed%/*}
310 524
311 # Removed .. directories 525 # Removed .. directories
312 # I wonder if there's a non-trivial bashism for this one... 526 while [ "${removed}" != "${removed//\/..\/}" ]; do
313 while [ "${removed}" != "$(echo ${removed} | sed -e 's:[^/]*/\.\./::')" ]; do 527 local p1="${removed%%\/..\/*}"
314 removed=$(echo ${removed} | sed -e 's:[^/]*/\.\./::') 528 local p2="${removed#*\/..\/}"
529
530 removed="${p1%\/*}/${p2}"
315 done 531 done
316 532
317 # Remove trailing .. 533 # Remove trailing ..
318 removed=$(echo ${removed} | sed -e 's:/[^/]*/\.\.$::') 534 [ "${removed##*/}" = ".." ] && removed=${removed%/*/*}
319 535
320 # Remove trailing / 536 # Remove trailing /
321 [ "${removed##*/}" = "" ] && removed=${removed%/*} 537 [ "${removed##*/}" = "" ] && removed=${removed%/*}
322 538
323 echo ${removed} 539 echo ${removed}
324 fi 540 fi
325} 541}
326 542
327# Helper function for create_ml_includes 543# Helper function for create_ml_includes
328create_ml_includes-listdirs() { 544create_ml_includes-listdirs() {
329 local dirs 545 local dirs
330 local data 546 local data
331 for data in ${@}; do 547 for data in "$@"; do
332 dirs="${dirs} ${data/*:/}" 548 dirs="${dirs} ${data/*:/}"
333 done 549 done
334 echo ${dirs:1} 550 echo ${dirs:1}
335} 551}
336 552
337# Helper function for create_ml_includes 553# Helper function for create_ml_includes
338create_ml_includes-makedestdirs() { 554create_ml_includes-makedestdirs() {
339 local dest=${1} 555 local dest=$1
340 shift 556 shift
341 local basedirs=${@} 557 local basedirs=$@
342 558
343 dodir ${dest} 559 dodir ${dest}
344 560
345 local basedir 561 local basedir
346 for basedir in ${basedirs}; do 562 for basedir in ${basedirs}; do
351 done 567 done
352} 568}
353 569
354# Helper function for create_ml_includes 570# Helper function for create_ml_includes
355create_ml_includes-allfiles() { 571create_ml_includes-allfiles() {
356 local basedirs=${@} 572 local basedir file
357
358 local files
359 for basedir in ${basedirs}; do 573 for basedir in "$@" ; do
360 local file
361 for file in $(find ${D}/${basedir} -type f); do 574 for file in $(find "${D}"/${basedir} -type f); do
362 echo ${file/${D}\/${basedir}\//} 575 echo ${file/${D}\/${basedir}\//}
363 done 576 done
364 done | sort | uniq 577 done | sort | uniq
365} 578}
366 579
367# Helper function for create_ml_includes 580# Helper function for create_ml_includes
368create_ml_includes-sym_for_dir() { 581create_ml_includes-sym_for_dir() {
369 local dir="${1}" 582 local dir=$1
370 shift 583 shift
371 local data 584 local data
372 for data in ${@}; do 585 for data in "$@"; do
373 if [ "${dir}" = "${data/*:/}" ]; then 586 if [[ ${data} == *:${dir} ]] ; then
374 echo ${data/:*/} 587 echo ${data/:*/}
375 return 0 588 return 0
376 fi 589 fi
377 done 590 done
378 echo "Should be here -- create_ml_includes-sym_for_dir ${1} ${@}" 591 echo "Shouldn't be here -- create_ml_includes-sym_for_dir $1 $@"
379 # exit because we'll likely be called from a subshell 592 # exit because we'll likely be called from a subshell
380 exit 1 593 exit 1
381} 594}
595
596# @FUNCTION: get_libname
597# @USAGE: [version]
598# @DESCRIPTION:
599# Returns libname with proper suffix {.so,.dylib} and optionally supplied version
600# for ELF/MACH-O shared objects
601#
602# Example:
603# get_libname libfoo ${PV}
604# Returns: libfoo.so.${PV} (ELF) || libfoo.${PV}.dylib (MACH)
605get_libname() {
606 local libname
607 local ver=$1
608 case ${CHOST} in
609 mingw*|*-mingw*) libname="dll";;
610 *-darwin*) libname="dylib";;
611 *) libname="so";;
612 esac
613
614 if [[ -z $* ]] ; then
615 echo ".${libname}"
616 else
617 for ver in "$@" ; do
618 case ${CHOST} in
619 *-darwin*) echo ".${ver}.${libname}";;
620 *) echo ".${libname}.${ver}";;
621 esac
622 done
623 fi
624}
625
626# This is for the toolchain to setup profile variables when pulling in
627# a crosscompiler (and thus they aren't set in the profile)
628multilib_env() {
629 local CTARGET=${1:-${CTARGET}}
630
631 case ${CTARGET} in
632 x86_64*)
633 export CFLAGS_x86=${CFLAGS_x86--m32}
634 export CHOST_x86=${CTARGET/x86_64/i686}
635 export CTARGET_x86=${CHOST_x86}
636 export CDEFINE_x86="__i386__"
637 export LIBDIR_x86="lib"
638
639 export CFLAGS_amd64=${CFLAGS_amd64--m64}
640 export CHOST_amd64=${CTARGET}
641 export CTARGET_amd64=${CHOST_amd64}
642 export CDEFINE_amd64="__x86_64__"
643 export LIBDIR_amd64="lib64"
644
645 export MULTILIB_ABIS="amd64 x86"
646 export DEFAULT_ABI="amd64"
647 ;;
648 mips64*)
649 export CFLAGS_o32=${CFLAGS_o32--mabi=32}
650 export CHOST_o32=${CTARGET/mips64/mips}
651 export CTARGET_o32=${CHOST_o32}
652 export CDEFINE_o32="_MIPS_SIM == _ABIO32"
653 export LIBDIR_o32="lib"
654
655 export CFLAGS_n32=${CFLAGS_n32--mabi=n32}
656 export CHOST_n32=${CTARGET}
657 export CTARGET_n32=${CHOST_n32}
658 export CDEFINE_n32="_MIPS_SIM == _ABIN32"
659 export LIBDIR_n32="lib32"
660
661 export CFLAGS_n64=${CFLAGS_n64--mabi=64}
662 export CHOST_n64=${CTARGET}
663 export CTARGET_n64=${CHOST_n64}
664 export CDEFINE_n64="_MIPS_SIM == _ABI64"
665 export LIBDIR_n64="lib64"
666
667 export MULTILIB_ABIS="n64 n32 o32"
668 export DEFAULT_ABI="n32"
669 ;;
670 powerpc64*)
671 export CFLAGS_ppc=${CFLAGS_ppc--m32}
672 export CHOST_ppc=${CTARGET/powerpc64/powerpc}
673 export CTARGET_ppc=${CHOST_ppc}
674 export CDEFINE_ppc="!__powerpc64__"
675 export LIBDIR_ppc="lib"
676
677 export CFLAGS_ppc64=${CFLAGS_ppc64--m64}
678 export CHOST_ppc64=${CTARGET}
679 export CTARGET_ppc64=${CHOST_ppc64}
680 export CDEFINE_ppc64="__powerpc64__"
681 export LIBDIR_ppc64="lib64"
682
683 export MULTILIB_ABIS="ppc64 ppc"
684 export DEFAULT_ABI="ppc64"
685 ;;
686 s390x*)
687 export CFLAGS_s390=${CFLAGS_s390--m31} # the 31 is not a typo
688 export CHOST_s390=${CTARGET/s390x/s390}
689 export CTARGET_s390=${CHOST_s390}
690 export CDEFINE_s390="!__s390x__"
691 export LIBDIR_s390="lib"
692
693 export CFLAGS_s390x=${CFLAGS_s390x--m64}
694 export CHOST_s390x=${CTARGET}
695 export CTARGET_s390x=${CHOST_s390x}
696 export CDEFINE_s390x="__s390x__"
697 export LIBDIR_s390x="lib64"
698
699 export MULTILIB_ABIS="s390x s390"
700 export DEFAULT_ABI="s390x"
701 ;;
702 sparc64*)
703 export CFLAGS_sparc32=${CFLAGS_sparc32--m32}
704 export CHOST_sparc32=${CTARGET/sparc64/sparc}
705 export CTARGET_sparc32=${CHOST_sparc32}
706 export CDEFINE_sparc32="!__arch64__"
707 export LIBDIR_sparc32="lib"
708
709 export CFLAGS_sparc64=${CFLAGS_sparc64--m64}
710 export CHOST_sparc64=${CTARGET}
711 export CTARGET_sparc64=${CHOST_sparc64}
712 export CDEFINE_sparc64="__arch64__"
713 export LIBDIR_sparc64="lib64"
714
715 export MULTILIB_ABIS="sparc64 sparc32"
716 export DEFAULT_ABI="sparc64"
717 ;;
718 *)
719 export MULTILIB_ABIS="default"
720 export DEFAULT_ABI="default"
721 ;;
722 esac
723}
724
725# @FUNCTION: multilib_toolchain_setup
726# @DESCRIPTION:
727# Hide multilib details here for packages which are forced to be compiled for a
728# specific ABI when run on another ABI (like x86-specific packages on amd64)
729multilib_toolchain_setup() {
730 export ABI=$1
731
732 if has_version app-admin/eselect-compiler ; then
733 # Binutils doesn't have wrappers for ld and as (yet). Eventually it
734 # will, and all this can just be handled with CHOST.
735 export LD="ld $(get_abi_LDFLAGS $1)"
736 export AS="as $(get_abi_ASFLAGS $1)"
737
738 export CHOST=$(get_abi_CHOST $1)
739 export CBUILD=$(get_abi_CHOST $1)
740 else
741 tc-export CC
742 fi
743}

Legend:
Removed from v.1.5  
changed lines
  Added in v.1.65

  ViewVC Help
Powered by ViewVC 1.1.20