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

Diff of /eclass/multilib.eclass

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

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

Legend:
Removed from v.1.13  
changed lines
  Added in v.1.58

  ViewVC Help
Powered by ViewVC 1.1.20