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

Diff of /eclass/multilib.eclass

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

Revision 1.22 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.22 2005/02/14 11:33:11 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
13DESCRIPTION="Based on the ${ECLASS} eclass"
14
15# has_multilib_profile:
16# Return true if the current profile is a multilib profile and lists more than
17# one abi in ${MULTILIB_ABIS}. You might want to use this like
18# 'use multilib || has_multilib_profile' until all profiles utilizing the
19# 'multilib' use flag are removed from portage
20 15
21# is_final_abi: 16# is_final_abi:
22# Return true if ${ABI} is the final abi to be installed (and thus we are 17# Return true if ${ABI} is the final abi to be installed (and thus we are
23# on our last run through a src_* function. 18# on our last run through a src_* function.
24 19
84# 79#
85# Example: 80# Example:
86# create_ml_includes /usr/include/asm __sparc__:/usr/include/asm-sparc __sparc64__:/usr/include/asm-sparc64 81# create_ml_includes /usr/include/asm __sparc__:/usr/include/asm-sparc __sparc64__:/usr/include/asm-sparc64
87# create_ml_includes /usr/include/asm __i386__:/usr/include/asm-i386 __x86_64__:/usr/include/asm-x86_64 82# create_ml_includes /usr/include/asm __i386__:/usr/include/asm-i386 __x86_64__:/usr/include/asm-x86_64
88 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
89### END DOCUMENTATION ### 92### END DOCUMENTATION ###
90 93
91# Defaults: 94# Defaults:
92export MULTILIB_ABIS=${MULTILIB_ABIS:-"default"} 95export MULTILIB_ABIS=${MULTILIB_ABIS:-"default"}
93export DEFAULT_ABI=${DEFAULT_ABI:-"default"} 96export DEFAULT_ABI=${DEFAULT_ABI:-"default"}
94export ABI=${ABI:-"default"}
95export CFLAGS_default="" 97export CFLAGS_default
96export LDFLAGS_default="" 98export LDFLAGS_default
97export CHOST_default=${CHOST} 99export CHOST_default=${CHOST_default:-${CHOST}}
100export CTARGET_default=${CTARGET_default:-${CTARGET:-${CHOST_default}}}
98export LIBDIR_default=${CONF_LIBDIR:-"lib"} 101export LIBDIR_default=${CONF_LIBDIR:-"lib"}
99export CDEFINE_default="__unix__" 102export CDEFINE_default="__unix__"
103export KERNEL_ABI=${KERNEL_ABI:-${DEFAULT_ABI}}
100 104
101# has_multilib_profile() 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.
102has_multilib_profile() { 111has_multilib_profile() {
103 [ -n "${MULTILIB_ABIS}" -a "${MULTILIB_ABIS}" != "${MULTILIB_ABIS/ /}" ] 112 [ -n "${MULTILIB_ABIS}" -a "${MULTILIB_ABIS}" != "${MULTILIB_ABIS/ /}" ]
104} 113}
105 114
115# @FUNCTION: get_libdir
116# @RETURN: the libdir for the selected ABI
117# @DESCRIPTION:
106# This function simply returns the desired lib directory. With portage 118# This function simply returns the desired lib directory. With portage
107# 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
108# 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
109# 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
110# where lib is named directly with $(get_libdir) if possible. 122# where lib is named directly with $(get_libdir) if possible.
111#
112# Travis Tilley <lv@gentoo.org> (24 Aug 2004)
113# 123#
114# Jeremy Huddleston <eradicator@gentoo.org> (23 Dec 2004): 124# Jeremy Huddleston <eradicator@gentoo.org> (23 Dec 2004):
115# 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,
116# 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
117# 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
124 else 134 else
125 get_abi_LIBDIR 135 get_abi_LIBDIR
126 fi 136 fi
127} 137}
128 138
139# @FUNCTION: get_multilibdir
140# @RETURN: Returns the multilibdir
129get_multilibdir() { 141get_multilibdir() {
130 if has_multilib_profile; then 142 if has_multilib_profile; then
131 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"
132 exit 1 144 exit 1
133 fi 145 fi
134 echo ${CONF_MULTILIBDIR:=lib32} 146 echo ${CONF_MULTILIBDIR:=lib32}
135} 147}
136 148
149# @FUNCTION: get_libdir_override
150# @DESCRIPTION:
137# 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
138# 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,
139# 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
140# 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
141# portage version sanity checking. 155# portage version sanity checking.
142# get_libdir_override expects one argument, the result get_libdir should 156# get_libdir_override expects one argument, the result get_libdir should
143# return: 157# return:
144# 158#
145# get_libdir_override lib64 159# get_libdir_override lib64
146#
147# Travis Tilley <lv@gentoo.org> (31 Aug 2004)
148get_libdir_override() { 160get_libdir_override() {
149 if has_multilib_profile; then 161 if has_multilib_profile; then
150 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"
151 exit 1 163 exit 1
152 fi 164 fi
153 CONF_LIBDIR="$1" 165 CONF_LIBDIR="$1"
154 CONF_LIBDIR_OVERRIDE="$1" 166 CONF_LIBDIR_OVERRIDE="$1"
155 LIBDIR_default="$1" 167 LIBDIR_default="$1"
156} 168}
157 169
158# get_abi_var <VAR> [<ABI>] 170# @FUNCTION: get_abi_var
171# @USAGE: <VAR> [ABI]
159# 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
160# 173# @DESCRIPTION:
161# ex: 174# ex:
162# CFLAGS=$(get_abi_var CFLAGS sparc32) # CFLAGS=-m32 175# CFLAGS=$(get_abi_var CFLAGS sparc32) # CFLAGS=-m32
163# 176#
164# 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)"
165# This will hopefully be added to portage soon... 178# This will hopefully be added to portage soon...
166# 179#
167# If <ABI> is not specified, ${ABI} is used. 180# If <ABI> is not specified, ${ABI} is used.
168# 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.
169# 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.
170#
171# Jeremy Huddleston <eradicator@gentoo.org>
172get_abi_var() { 183get_abi_var() {
173 local flag=${1} 184 local flag=$1
174 local abi 185 local abi
175 if [ $# -gt 1 ]; then 186 if [ $# -gt 1 ]; then
176 abi=${2} 187 abi=${2}
177 elif [ -n "${ABI}" ]; then 188 elif [ -n "${ABI}" ]; then
178 abi=${ABI} 189 abi=${ABI}
184 195
185 local var="${flag}_${abi}" 196 local var="${flag}_${abi}"
186 echo ${!var} 197 echo ${!var}
187} 198}
188 199
200# @FUNCTION: get_abi_CFLAGS
201# @USAGE: [ABI]
202# @DESCRIPTION:
203# Alias for 'get_abi_var CFLAGS'
189get_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'
190get_abi_LDFLAGS() { 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'
191get_abi_CHOST() { 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'
192get_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'
193get_abi_LIBDIR() { get_abi_var LIBDIR "${@}"; } 246get_abi_LIBDIR() { get_abi_var LIBDIR "$@"; }
194 247
248# @FUNCTION: get_install_abis
249# @DESCRIPTION:
195# 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
196# the last one in the list being the default. 251# the last one in the list being the default.
197get_install_abis() { 252get_install_abis() {
198 local order="" 253 local order=""
199 254
200 if [ -z "${MULTILIB_ABIS}" ]; then 255 if [[ -z ${MULTILIB_ABIS} ]] ; then
201 echo "default" 256 echo "default"
202 return 0 257 return 0
203 fi 258 fi
204 259
205 if hasq multilib-pkg-force ${RESTRICT} || 260 if [[ ${EMULTILIB_PKG} == "true" ]] ; then
206 { hasq multilib-pkg ${FEATURES} && hasq multilib-pkg ${RESTRICT}; }; then
207 for x in ${MULTILIB_ABIS}; do 261 for x in ${MULTILIB_ABIS} ; do
208 if [ "${x}" != "${DEFAULT_ABI}" ]; then 262 if [[ ${x} != "${DEFAULT_ABI}" ]] ; then
209 hasq ${x} ${ABI_DENY} || ordera="${ordera} ${x}" 263 hasq ${x} ${ABI_DENY} || ordera="${ordera} ${x}"
210 fi 264 fi
211 done 265 done
212 hasq ${DEFAULT_ABI} ${ABI_DENY} || order="${ordera} ${DEFAULT_ABI}" 266 hasq ${DEFAULT_ABI} ${ABI_DENY} || order="${ordera} ${DEFAULT_ABI}"
213 267
214 if [ -n "${ABI_ALLOW}" ]; then 268 if [[ -n ${ABI_ALLOW} ]] ; then
215 local ordera="" 269 local ordera=""
216 for x in ${order}; do 270 for x in ${order} ; do
217 if hasq ${x} ${ABI_ALLOW}; then 271 if hasq ${x} ${ABI_ALLOW} ; then
218 ordera="${ordera} ${x}" 272 ordera="${ordera} ${x}"
219 fi 273 fi
220 done 274 done
221 order="${ordera}" 275 order=${ordera}
222 fi 276 fi
223 else 277 else
224 order="${DEFAULT_ABI}" 278 order=${DEFAULT_ABI}
225 fi 279 fi
226 280
227 if [ -z "${order}" ]; then 281 if [[ -z ${order} ]] ; then
228 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."
229 fi 283 fi
230 284
231 echo ${order} 285 echo ${order}
232 return 0 286 return 0
233} 287}
234 288
289# @FUNCTION: get_all_abis
290# @DESCRIPTION:
235# Return a list of the ABIs supported by this profile. 291# Return a list of the ABIs supported by this profile.
236# the last one in the list being the default. 292# the last one in the list being the default.
237get_all_abis() { 293get_all_abis() {
238 local order="" 294 local order=""
239 295
240 if [ -z "${MULTILIB_ABIS}" ]; then 296 if [[ -z ${MULTILIB_ABIS} ]] ; then
241 echo "default" 297 echo "default"
242 return 0 298 return 0
243 fi 299 fi
244 300
245 for x in ${MULTILIB_ABIS}; do 301 for x in ${MULTILIB_ABIS}; do
246 if [ "${x}" != "${DEFAULT_ABI}" ]; then 302 if [[ ${x} != ${DEFAULT_ABI} ]] ; then
247 order="${order:+${order }}${x}" 303 order="${order:+${order} }${x}"
248 fi 304 fi
249 done 305 done
250 order="${order:+${order} }${DEFAULT_ABI}" 306 order="${order:+${order} }${DEFAULT_ABI}"
251 307
252 echo ${order} 308 echo ${order}
253 return 0 309 return 0
254} 310}
255 311
256# get_all_libdirs() 312# @FUNCTION: get_all_libdirs
313# @DESCRIPTION:
257# 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
258# 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".
259get_all_libdirs() { 317get_all_libdirs() {
260 local libdirs="lib" 318 local libdirs="lib"
261 local abi 319 local abi
262 local dir 320 local dir
263 321
264 if has_multilib_profile; then
265 for abi in ${MULTILIB_ABIS}; do 322 for abi in ${MULTILIB_ABIS}; do
266 [ "$(get_abi_LIBDIR ${abi})" != "lib" ] && libdirs="${libdirs} $(get_abi_LIBDIR ${abi})" 323 [ "$(get_abi_LIBDIR ${abi})" != "lib" ] && libdirs="${libdirs} $(get_abi_LIBDIR ${abi})"
267 done 324 done
268 elif [ -n "${CONF_LIBDIR}" ]; then
269 for dir in ${CONF_LIBDIR} ${CONF_MULTILIBDIR:-lib32}; do
270 [ "${dir}" != "lib" ] && libdirs="${libdirs} ${dir}"
271 done
272 fi
273 325
274 echo "${libdirs}" 326 echo "${libdirs}"
275} 327}
276 328
329# @FUNCTION: is_final_abi
330# @DESCRIPTION:
277# 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
278# using the new multilib configuration. This can be used to determine 332# using the new multilib configuration. This can be used to determine
279# 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}
280is_final_abi() { 334is_final_abi() {
281 ! has_multilib_profile && return 0 335 has_multilib_profile || return 0
282 local ALL_ABIS=$(get_install_abis) 336 local ALL_ABIS=$(get_install_abis)
283 local LAST_ABI=${ALL_ABIS/* /} 337 local LAST_ABI=${ALL_ABIS/* /}
284 [ "${LAST_ABI}" = "${ABI}" ] 338 [[ ${LAST_ABI} == ${ABI} ]]
285} 339}
286 340
341# @FUNCTION: number_abis
342# @DESCRIPTION:
287# echo the number of ABIs we will be installing for 343# echo the number of ABIs we will be installing for
288number_abis() { 344number_abis() {
289 get_install_abis | wc -w 345 get_install_abis | wc -w
290} 346}
291 347
292# get_ml_incdir [<include dir> [<ABI>]] 348# @FUNCTION: get_ml_incdir
349# @USAGE: [include_dir] [ABI]
350# @DESCRIPTION:
293# include dir defaults to /usr/include 351# include dir defaults to /usr/include
294# ABI defaults to ${ABI} or ${DEFAULT_ABI} 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.
295get_ml_incdir() { 358get_ml_incdir() {
296 local dir=/usr/include 359 local dir=/usr/include
297 360
298 if [[ ${#} -gt 0 ]]; then 361 if [[ $# -gt 0 ]]; then
299 incdir=${1} 362 incdir=$1
300 shift 363 shift
301 fi 364 fi
302 365
303 if [[ -z "${MULTILIB_ABIS}" ]]; then 366 if [[ -z "${MULTILIB_ABIS}" ]]; then
304 echo ${incdir} 367 echo ${incdir}
305 return 0 368 return 0
306 fi 369 fi
307 370
308 local abi=${ABI:-${DEFAULT_ABI}} 371 local abi=${ABI-${DEFAULT_ABI}}
309 if [[ ${#} -gt 0 ]]; then 372 if [[ $# -gt 0 ]]; then
310 abi=${1} 373 abi=$1
311 shift 374 shift
312 fi 375 fi
313 376
314 if [[ -d "${dir}/gentoo-multilib/${abi}" ]]; then 377 if [[ -d "${dir}/gentoo-multilib/${abi}" ]]; then
315 echo ${dir}/gentoo-multilib/${abi} 378 echo ${dir}/gentoo-multilib/${abi}
316 else 379 else
317 echo ${dir} 380 echo ${dir}
318 fi 381 fi
319} 382}
320 383
321# prep_ml_includes: 384# @FUNCTION: prep_ml_includes
322# 385# @DESCRIPTION:
323# 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,
324# 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
325# 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
326# 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
327# 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
328# 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).
329# 392#
330# Example: 393# Example:
331# src_install() { 394# src_install() {
332# ... 395# ...
333# prep_ml_includes /usr/qt/3/include 396# prep_ml_includes /usr/qt/3/include
334# } 397# }
335
336prep_ml_includes() { 398prep_ml_includes() {
337 if [ $(number_abis) -gt 1 ]; then 399 if [[ $(number_abis) -gt 1 ]] ; then
338 local dir 400 local dir
339 local dirs 401 local dirs
340 local base 402 local base
341 403
342 if [ ${#} -eq 0 ]; then 404 if [[ $# -eq 0 ]] ; then
343 dirs="/usr/include" 405 dirs=/usr/include
344 else 406 else
345 dirs="${@}" 407 dirs="$@"
346 fi 408 fi
347 409
348 for dir in ${dirs}; do 410 for dir in ${dirs} ; do
349 base=${T}/gentoo-multilib/${dir}/gentoo-multilib 411 base=${T}/gentoo-multilib/${dir}/gentoo-multilib
350 mkdir -p ${base} 412 mkdir -p "${base}"
351 [ -d ${base}/${ABI} ] && rm -rf ${base}/${ABI} 413 [[ -d ${base}/${ABI} ]] && rm -rf "${base}/${ABI}"
352 mv ${D}/${dir} ${base}/${ABI} 414 mv "${D}/${dir}" "${base}/${ABI}"
353 done 415 done
354 416
355 if is_final_abi; then 417 if is_final_abi; then
356 base=${T}/gentoo-multilib 418 base=${T}/gentoo-multilib
357 pushd ${base} 419 pushd "${base}"
358 find . | tar -c -T - -f - | tar -x --no-same-owner -f - -C ${D} 420 find . | tar -c -T - -f - | tar -x --no-same-owner -f - -C ${D}
359 popd 421 popd
360 422
423 # This 'set' stuff is required by mips profiles to properly pass
424 # CDEFINE's (which have spaces) to sub-functions
425 set --
361 for dir in ${dirs}; do 426 for dir in ${dirs} ; do
362 local args=${dir} 427 set -- "$@" "${dir}"
363 local abi 428 local abi
364 for abi in $(get_install_abis); do 429 for abi in $(get_install_abis); do
365 args="${args} $(get_abi_CDEFINE ${abi}):${dir}/gentoo-multilib/${abi}" 430 set -- "$@" "$(get_abi_CDEFINE ${abi}):${dir}/gentoo-multilib/${abi}"
366 done 431 done
367 create_ml_includes ${args} 432 create_ml_includes "$@"
368 done 433 done
369 fi 434 fi
370 fi 435 fi
371} 436}
372 437
438# @FUNCTION: create_ml_includes
439# @USAGE: <include_dir> <symbol_1>:<dir_1> [<symbol_2>:<dir_2>...]
440# @DESCRIPTION:
373# 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
374# 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
375# 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
376# <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.
377# 445#
378# 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.
379# 447#
380# Example: 448# Example:
381# 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
382# 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)
383create_ml_includes() { 454create_ml_includes() {
384 local dest="${1}" 455 local dest=$1
385 shift 456 shift
386 local mlinfo="${@}"
387 local basedirs=$(create_ml_includes-listdirs ${mlinfo}) 457 local basedirs=$(create_ml_includes-listdirs "$@")
388 458
389 create_ml_includes-makedestdirs ${dest} ${basedirs} 459 create_ml_includes-makedestdirs ${dest} ${basedirs}
390 460
391 local file 461 local file
392 for file in $(create_ml_includes-allfiles ${basedirs}); do 462 for file in $(create_ml_includes-allfiles ${basedirs}) ; do
393 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')
394 { 464 (
395 echo "/* Common header file autogenerated by create_ml_includes in multilib.eclass */" 465 echo "/* Autogenerated by create_ml_includes() in multilib.eclass */"
396 466
397 local dir 467 local dir
398 for dir in ${basedirs}; do 468 for dir in ${basedirs}; do
399 if [ -f "${D}/${dir}/${file}" ]; then 469 if [[ -f ${D}/${dir}/${file} ]] ; then
470 echo ""
400 local sym=$(create_ml_includes-sym_for_dir ${dir} ${mlinfo}) 471 local sym=$(create_ml_includes-sym_for_dir ${dir} "$@")
472 if [[ ${sym/=} != "${sym}" ]] ; then
473 echo "#if ${sym}"
401 if [[ ${sym::1} == "!" ]]; then 474 elif [[ ${sym::1} == "!" ]] ; then
402 echo "#ifndef ${sym:1}" 475 echo "#ifndef ${sym:1}"
403 else 476 else
404 echo "#ifdef ${sym}" 477 echo "#ifdef ${sym}"
405 fi 478 fi
406 echo "#include \"$(create_ml_includes-relative_between ${dest}/$(dirname ${file}) ${dir}/${file})\"" 479 echo "# include <$(create_ml_includes-absolute ${dir}/${file})>"
407 echo "#endif /* ${sym} */" 480 echo "#endif /* ${sym} */"
408 echo ""
409 fi 481 fi
410 done 482 done
411 483
412 #echo "#endif /* __CREATE_ML_INCLUDES_STUB_${name}__ */" 484 #echo "#endif /* __CREATE_ML_INCLUDES_STUB_${name}__ */"
413 } > ${D}/${dest}/${file} 485 ) > "${D}/${dest}/${file}"
414 done 486 done
415} 487}
416 488
417# Helper function for create_ml_includes 489# Helper function for create_ml_includes
418create_ml_includes-relative_between() { 490create_ml_includes-absolute() {
419 local src="$(create_ml_includes-tidy_path ${1})"
420 local dst="$(create_ml_includes-tidy_path ${2})" 491 local dst="$(create_ml_includes-tidy_path $1)"
421 492
422 src=(${src//\// })
423 dst=(${dst//\// }) 493 dst=(${dst//\// })
424 494
425 local i 495 local i
426 for ((i=0; i<${#src[*]}; i++)); do 496 for ((i=0; i<${#dst[*]}; i++)); do
427 [ "${dst[i]}" != "${src[i]}" ] && break 497 [ "${dst[i]}" == "include" ] && break
428 done 498 done
429 499
430 local common=$i 500 local strip_upto=$i
431 501
432 for ((i=${#src[*]}; i>common; i--)); do
433 echo -n ../
434 done
435
436 for ((i=common; i<${#dst[*]}-1; i++)); do 502 for ((i=strip_upto+1; i<${#dst[*]}-1; i++)); do
437 echo -n ${dst[i]}/ 503 echo -n ${dst[i]}/
438 done 504 done
439 505
440 echo -n ${dst[i]} 506 echo -n ${dst[i]}
441} 507}
442 508
443# Helper function for create_ml_includes 509# Helper function for create_ml_includes
444create_ml_includes-tidy_path() { 510create_ml_includes-tidy_path() {
445 local removed="${1}" 511 local removed=$1
446 512
447 if [ -n "${removed}" ]; then 513 if [ -n "${removed}" ]; then
448 # Remove multiple slashes 514 # Remove multiple slashes
449 while [ "${removed}" != "${removed/\/\//\/}" ]; do 515 while [ "${removed}" != "${removed/\/\//\/}" ]; do
450 removed=${removed/\/\//\/} 516 removed=${removed/\/\//\/}
467 # Remove trailing .. 533 # Remove trailing ..
468 [ "${removed##*/}" = ".." ] && removed=${removed%/*/*} 534 [ "${removed##*/}" = ".." ] && removed=${removed%/*/*}
469 535
470 # Remove trailing / 536 # Remove trailing /
471 [ "${removed##*/}" = "" ] && removed=${removed%/*} 537 [ "${removed##*/}" = "" ] && removed=${removed%/*}
472 538
473 echo ${removed} 539 echo ${removed}
474 fi 540 fi
475} 541}
476 542
477# Helper function for create_ml_includes 543# Helper function for create_ml_includes
478create_ml_includes-listdirs() { 544create_ml_includes-listdirs() {
479 local dirs 545 local dirs
480 local data 546 local data
481 for data in ${@}; do 547 for data in "$@"; do
482 dirs="${dirs} ${data/*:/}" 548 dirs="${dirs} ${data/*:/}"
483 done 549 done
484 echo ${dirs:1} 550 echo ${dirs:1}
485} 551}
486 552
487# Helper function for create_ml_includes 553# Helper function for create_ml_includes
488create_ml_includes-makedestdirs() { 554create_ml_includes-makedestdirs() {
489 local dest=${1} 555 local dest=$1
490 shift 556 shift
491 local basedirs=${@} 557 local basedirs=$@
492 558
493 dodir ${dest} 559 dodir ${dest}
494 560
495 local basedir 561 local basedir
496 for basedir in ${basedirs}; do 562 for basedir in ${basedirs}; do
501 done 567 done
502} 568}
503 569
504# Helper function for create_ml_includes 570# Helper function for create_ml_includes
505create_ml_includes-allfiles() { 571create_ml_includes-allfiles() {
506 local basedirs=${@}
507
508 local basedir 572 local basedir file
509 for basedir in ${basedirs}; do 573 for basedir in "$@" ; do
510 local file
511 for file in $(find ${D}/${basedir} -type f); do 574 for file in $(find "${D}"/${basedir} -type f); do
512 echo ${file/${D}\/${basedir}\//} 575 echo ${file/${D}\/${basedir}\//}
513 done 576 done
514 done | sort | uniq 577 done | sort | uniq
515} 578}
516 579
517# Helper function for create_ml_includes 580# Helper function for create_ml_includes
518create_ml_includes-sym_for_dir() { 581create_ml_includes-sym_for_dir() {
519 local dir="${1}" 582 local dir=$1
520 shift 583 shift
521 local data 584 local data
522 for data in ${@}; do 585 for data in "$@"; do
523 if [ "${dir}" = "${data/*:/}" ]; then 586 if [[ ${data} == *:${dir} ]] ; then
524 echo ${data/:*/} 587 echo ${data/:*/}
525 return 0 588 return 0
526 fi 589 fi
527 done 590 done
528 echo "Shouldn't be here -- create_ml_includes-sym_for_dir ${1} ${@}" 591 echo "Shouldn't be here -- create_ml_includes-sym_for_dir $1 $@"
529 # exit because we'll likely be called from a subshell 592 # exit because we'll likely be called from a subshell
530 exit 1 593 exit 1
531} 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.22  
changed lines
  Added in v.1.65

  ViewVC Help
Powered by ViewVC 1.1.20