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

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

  ViewVC Help
Powered by ViewVC 1.1.20