/[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.59
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.5 2005/01/12 22:39:44 eradicator Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/multilib.eclass,v 1.59 2007/03/27 01:34:31 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"
14 11
15DEPEND="!build? ( sys-apps/sed sys-apps/findutils sys-apps/coreutils )" 12#inherit toolchain-funcs # cant do this because it includes us
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}
16 113
17# This function simply returns the desired lib directory. With portage 114# This function simply returns the desired lib directory. With portage
18# 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
19# 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
20# 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
26# 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,
27# 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
28# 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
29# over CONF_LIBDIR in econf, dolib, etc... 126# over CONF_LIBDIR in econf, dolib, etc...
30get_libdir() { 127get_libdir() {
31 LIBDIR_TEST=$(type econf) 128 local CONF_LIBDIR
32 if [ ! -z "${CONF_LIBDIR_OVERRIDE}" ] ; then 129 if [ -n "${CONF_LIBDIR_OVERRIDE}" ] ; then
33 # if there is an override, we want to use that... always. 130 # if there is an override, we want to use that... always.
34 CONF_LIBDIR="${CONF_LIBDIR_OVERRIDE}" 131 echo ${CONF_LIBDIR_OVERRIDE}
35 elif [ -n "$(get_abi_LIBDIR)" ]; then 132 else
36 CONF_LIBDIR="$(get_abi_LIBDIR)" 133 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 134 fi
41 # and of course, default to lib if CONF_LIBDIR isnt set
42 echo ${CONF_LIBDIR:=lib}
43 unset LIBDIR_TEST
44} 135}
45 136
46get_multilibdir() { 137get_multilibdir() {
47 if [ -n "$(get_abi_LIBDIR)" ]; then 138 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" 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"
49 exit 1 140 exit 1
50 fi 141 fi
51 echo ${CONF_MULTILIBDIR:=lib32} 142 echo ${CONF_MULTILIBDIR:=lib32}
52} 143}
61# 152#
62# get_libdir_override lib64 153# get_libdir_override lib64
63# 154#
64# Travis Tilley <lv@gentoo.org> (31 Aug 2004) 155# Travis Tilley <lv@gentoo.org> (31 Aug 2004)
65get_libdir_override() { 156get_libdir_override() {
66 if [ -n "$(get_abi_LIBDIR)" ]; then 157 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" 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"
68 exit 1 159 exit 1
69 fi 160 fi
70 CONF_LIBDIR="$1" 161 CONF_LIBDIR="$1"
71 CONF_LIBDIR_OVERRIDE="$1" 162 CONF_LIBDIR_OVERRIDE="$1"
163 LIBDIR_default="$1"
72} 164}
73 165
74# get_abi_var <VAR> [<ABI>] 166# get_abi_var <VAR> [<ABI>]
75# 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
76# 168#
84# 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.
85# 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.
86# 178#
87# Jeremy Huddleston <eradicator@gentoo.org> 179# Jeremy Huddleston <eradicator@gentoo.org>
88get_abi_var() { 180get_abi_var() {
89 local flag=${1} 181 local flag=$1
90 local abi 182 local abi
91 if [ $# -gt 1 ]; then 183 if [ $# -gt 1 ]; then
92 abi=${2} 184 abi=${2}
93 elif [ -n "${ABI}" ]; then 185 elif [ -n "${ABI}" ]; then
94 abi=${ABI} 186 abi=${ABI}
95 elif [ -n "${DEFAULT_ABI}" ]; then 187 elif [ -n "${DEFAULT_ABI}" ]; then
96 abi=${DEFAULT_ABI} 188 abi=${DEFAULT_ABI}
97 else 189 else
98 return 1 190 abi="default"
99 fi 191 fi
100 192
101 local var="${flag}_${abi}" 193 local var="${flag}_${abi}"
102 echo ${!var} 194 echo ${!var}
103} 195}
104 196
105get_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 "$@"; }
106get_abi_CDEFINE() { get_abi_var CDEFINE ${@}; } 203get_abi_CDEFINE() { get_abi_var CDEFINE "$@"; }
107get_abi_LIBDIR() { get_abi_var LIBDIR ${@}; } 204get_abi_LIBDIR() { get_abi_var LIBDIR "$@"; }
108 205
109# 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
110# the last one in the list being the default. 207# the last one in the list being the default.
111get_abi_order() { 208get_install_abis() {
112 local order="" 209 local order=""
113 210
114 if [ -z "${MULTILIB_ABIS}" ]; then 211 if [[ -z ${MULTILIB_ABIS} ]] ; then
115 echo "NOMULTILIB" 212 echo "default"
116 return 1 213 return 0
117 fi 214 fi
118 215
119 if hasq multilib-pkg-force ${RESTRICT} || 216 if hasq multilib-pkg-force ${RESTRICT} ||
120 { hasq multilib-pkg ${FEATURES} && hasq multilib-pkg ${RESTRICT}; }; then 217 { hasq multilib-pkg ${FEATURES} && hasq multilib-pkg ${RESTRICT}; }; then
121 for x in ${MULTILIB_ABIS}; do 218 for x in ${MULTILIB_ABIS} ; do
122 if [ "${x}" != "${DEFAULT_ABI}" ]; then 219 if [[ ${x} != "${DEFAULT_ABI}" ]] ; then
123 hasq ${x} ${ABI_DENY} || ordera="${ordera} ${x}" 220 hasq ${x} ${ABI_DENY} || ordera="${ordera} ${x}"
124 fi 221 fi
125 done 222 done
126 hasq ${DEFAULT_ABI} ${ABI_DENY} || order="${ordera} ${DEFAULT_ABI}" 223 hasq ${DEFAULT_ABI} ${ABI_DENY} || order="${ordera} ${DEFAULT_ABI}"
127 224
128 if [ -n "${ABI_ALLOW}" ]; then 225 if [[ -n ${ABI_ALLOW} ]] ; then
129 local ordera="" 226 local ordera=""
130 for x in ${order}; do 227 for x in ${order} ; do
131 if hasq ${x} ${ABI_ALLOW}; then 228 if hasq ${x} ${ABI_ALLOW} ; then
132 ordera="${ordera} ${x}" 229 ordera="${ordera} ${x}"
133 fi 230 fi
134 done 231 done
135 order="${ordera}" 232 order=${ordera}
136 fi 233 fi
137 else 234 else
138 order="${DEFAULT_ABI}" 235 order=${DEFAULT_ABI}
139 fi 236 fi
140 237
141 if [ -z "${order}" ]; then 238 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." 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."
143 fi 240 fi
144 241
145 echo ${order} 242 echo ${order}
146 return 0 243 return 0
147} 244}
148 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
149# get_all_libdir() 267# get_all_libdirs()
150# 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
151# those that might not be touched by the current ebuild. 269# those that might not be touched by the current ebuild.
152get_all_libdirs() { 270get_all_libdirs() {
153 local libdirs="lib" 271 local libdirs="lib"
154 local abi 272 local abi
155 local dir 273 local dir
156 274
157 if [ -n "${MULTILIB_ABIS}" ]; then
158 for abi in ${MULTILIB_ABIS}; do 275 for abi in ${MULTILIB_ABIS}; do
159 [ "$(get_abi_LIBDIR ${abi})" != "lib" ] && libdirs="${libdirs} $(get_abi_LIBDIR ${abi})" 276 [ "$(get_abi_LIBDIR ${abi})" != "lib" ] && libdirs="${libdirs} $(get_abi_LIBDIR ${abi})"
160 done 277 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 278
167 echo "${libdirs}" 279 echo "${libdirs}"
168} 280}
169 281
170# 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
171# using the new multilib configuration. This can be used to determine 283# 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} 284# if we're in the last (or only) run through src_{unpack,compile,install}
173is_final_abi() { 285is_final_abi() {
174 [ -z "${ABI}" ] && return 0 286 has_multilib_profile || return 0
175 local ALL_ABIS=$(get_abi_order) 287 local ALL_ABIS=$(get_install_abis)
176 local LAST_ABI=${ALL_ABIS/* /} 288 local LAST_ABI=${ALL_ABIS/* /}
177 [ "${LAST_ABI}" = "${ABI}" ] 289 [[ ${LAST_ABI} == ${ABI} ]]
178} 290}
179 291
180# echo the number of ABIs we will be installing for 292# echo the number of ABIs we will be installing for
181number_abis() { 293number_abis() {
182 get_abi_order | wc -w 294 get_install_abis | wc -w
295}
296
297# get_ml_incdir [<include dir> [<ABI>]]
298# include dir defaults to /usr/include
299# ABI defaults to ${ABI} or ${DEFAULT_ABI}
300get_ml_incdir() {
301 local dir=/usr/include
302
303 if [[ $# -gt 0 ]]; then
304 incdir=$1
305 shift
306 fi
307
308 if [[ -z "${MULTILIB_ABIS}" ]]; then
309 echo ${incdir}
310 return 0
311 fi
312
313 local abi=${ABI-${DEFAULT_ABI}}
314 if [[ $# -gt 0 ]]; then
315 abi=$1
316 shift
317 fi
318
319 if [[ -d "${dir}/gentoo-multilib/${abi}" ]]; then
320 echo ${dir}/gentoo-multilib/${abi}
321 else
322 echo ${dir}
323 fi
183} 324}
184 325
185# prep_ml_includes: 326# prep_ml_includes:
186# 327#
187# Some includes (include/asm, glibc, etc) are ABI dependent. In this case, 328# Some includes (include/asm, glibc, etc) are ABI dependent. In this case,
196# ... 337# ...
197# prep_ml_includes /usr/qt/3/include 338# prep_ml_includes /usr/qt/3/include
198# } 339# }
199 340
200prep_ml_includes() { 341prep_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 342 if [[ $(number_abis) -gt 1 ]] ; then
209 local dir 343 local dir
344 local dirs
345 local base
346
347 if [[ $# -eq 0 ]] ; then
348 dirs=/usr/include
349 else
350 dirs="$@"
351 fi
352
210 for dir in ${dirs}; do 353 for dir in ${dirs} ; do
354 base=${T}/gentoo-multilib/${dir}/gentoo-multilib
355 mkdir -p "${base}"
356 [[ -d ${base}/${ABI} ]] && rm -rf "${base}/${ABI}"
211 mv ${D}/${dir} ${D}/${dir}.${ABI} 357 mv "${D}/${dir}" "${base}/${ABI}"
212 done 358 done
213 359
214 if is_final_abi; then 360 if is_final_abi; then
361 base=${T}/gentoo-multilib
362 pushd "${base}"
363 find . | tar -c -T - -f - | tar -x --no-same-owner -f - -C ${D}
364 popd
365
366 # This 'set' stuff is required by mips profiles to properly pass
367 # CDEFINE's (which have spaces) to sub-functions
368 set --
215 for dir in ${dirs}; do 369 for dir in ${dirs} ; do
216 local args="${dir}" 370 set -- "$@" "${dir}"
217 local abi 371 local abi
218 for abi in $(get_abi_order); do 372 for abi in $(get_install_abis); do
219 args="${args} $(get_abi_CDEFINE ${abi}):${dir}.${abi}" 373 set -- "$@" "$(get_abi_CDEFINE ${abi}):${dir}/gentoo-multilib/${abi}"
220 done 374 done
221 create_ml_includes ${args} 375 create_ml_includes "$@"
222 done 376 done
223 fi 377 fi
224 fi 378 fi
225} 379}
226 380
232# 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.
233# 387#
234# Example: 388# Example:
235# 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
236# 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)
237create_ml_includes() { 394create_ml_includes() {
238 local dest="${1}" 395 local dest=$1
239 shift 396 shift
240 local mlinfo="${@}"
241 local basedirs=$(create_ml_includes-listdirs ${mlinfo}) 397 local basedirs=$(create_ml_includes-listdirs "$@")
242 398
243 create_ml_includes-makedestdirs ${dest} ${basedirs} 399 create_ml_includes-makedestdirs ${dest} ${basedirs}
244 400
245 local file 401 local file
246 for file in $(create_ml_includes-allfiles ${basedirs}); do 402 for file in $(create_ml_includes-allfiles ${basedirs}) ; do
247 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')
248 { 404 (
249 echo "/* Common header file autogenerated by create_ml_includes in multilib.eclass */" 405 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 406
254 local dir 407 local dir
255 for dir in ${basedirs}; do 408 for dir in ${basedirs}; do
256 if [ -f "${D}/${dir}/${file}" ]; then 409 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 "" 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} */"
261 fi 421 fi
262 done 422 done
263 423
264 #echo "#endif /* __CREATE_ML_INCLUDES_STUB_${name}__ */" 424 #echo "#endif /* __CREATE_ML_INCLUDES_STUB_${name}__ */"
265 } > ${D}/${dest}/${file} 425 ) > "${D}/${dest}/${file}"
266 done 426 done
267} 427}
268 428
269# Helper function for create_ml_includes 429# Helper function for create_ml_includes
270create_ml_includes-relative_between() { 430create_ml_includes-absolute() {
271 local src="$(create_ml_includes-tidy_path ${1})"
272 local dst="$(create_ml_includes-tidy_path ${2})" 431 local dst="$(create_ml_includes-tidy_path $1)"
273 432
274 src=(${src//\// })
275 dst=(${dst//\// }) 433 dst=(${dst//\// })
276 434
277 local i 435 local i
278 for ((i=0; i<${#src[*]}; i++)); do 436 for ((i=0; i<${#dst[*]}; i++)); do
279 [ "${dst[i]}" != "${src[i]}" ] && break 437 [ "${dst[i]}" == "include" ] && break
280 done 438 done
281 439
282 local common=$i 440 local strip_upto=$i
283 441
284 for ((i=${#src[*]}; i>common; i--)); do
285 echo -n ../
286 done
287
288 for ((i=common; i<${#dst[*]}-1; i++)); do 442 for ((i=strip_upto+1; i<${#dst[*]}-1; i++)); do
289 echo -n ${dst[i]}/ 443 echo -n ${dst[i]}/
290 done 444 done
291 445
292 echo -n ${dst[i]} 446 echo -n ${dst[i]}
293} 447}
294 448
295# Helper function for create_ml_includes 449# Helper function for create_ml_includes
296create_ml_includes-tidy_path() { 450create_ml_includes-tidy_path() {
297 local removed="${1}" 451 local removed=$1
298 452
299 if [ -n "${1}" ]; then 453 if [ -n "${removed}" ]; then
300 # Remove multiple slashes 454 # Remove multiple slashes
301 while [ "${removed}" != "${removed/\/\//\/}" ]; do 455 while [ "${removed}" != "${removed/\/\//\/}" ]; do
302 removed=${removed/\/\//\/} 456 removed=${removed/\/\//\/}
303 done 457 done
304 458
307 removed=${removed//\/.\//\/} 461 removed=${removed//\/.\//\/}
308 done 462 done
309 [ "${removed##*/}" = "." ] && removed=${removed%/*} 463 [ "${removed##*/}" = "." ] && removed=${removed%/*}
310 464
311 # Removed .. directories 465 # Removed .. directories
312 # I wonder if there's a non-trivial bashism for this one... 466 while [ "${removed}" != "${removed//\/..\/}" ]; do
313 while [ "${removed}" != "$(echo ${removed} | sed -e 's:[^/]*/\.\./::')" ]; do 467 local p1="${removed%%\/..\/*}"
314 removed=$(echo ${removed} | sed -e 's:[^/]*/\.\./::') 468 local p2="${removed#*\/..\/}"
469
470 removed="${p1%\/*}/${p2}"
315 done 471 done
316 472
317 # Remove trailing .. 473 # Remove trailing ..
318 removed=$(echo ${removed} | sed -e 's:/[^/]*/\.\.$::') 474 [ "${removed##*/}" = ".." ] && removed=${removed%/*/*}
319 475
320 # Remove trailing / 476 # Remove trailing /
321 [ "${removed##*/}" = "" ] && removed=${removed%/*} 477 [ "${removed##*/}" = "" ] && removed=${removed%/*}
322 478
323 echo ${removed} 479 echo ${removed}
324 fi 480 fi
325} 481}
326 482
327# Helper function for create_ml_includes 483# Helper function for create_ml_includes
328create_ml_includes-listdirs() { 484create_ml_includes-listdirs() {
329 local dirs 485 local dirs
330 local data 486 local data
331 for data in ${@}; do 487 for data in "$@"; do
332 dirs="${dirs} ${data/*:/}" 488 dirs="${dirs} ${data/*:/}"
333 done 489 done
334 echo ${dirs:1} 490 echo ${dirs:1}
335} 491}
336 492
337# Helper function for create_ml_includes 493# Helper function for create_ml_includes
338create_ml_includes-makedestdirs() { 494create_ml_includes-makedestdirs() {
339 local dest=${1} 495 local dest=$1
340 shift 496 shift
341 local basedirs=${@} 497 local basedirs=$@
342 498
343 dodir ${dest} 499 dodir ${dest}
344 500
345 local basedir 501 local basedir
346 for basedir in ${basedirs}; do 502 for basedir in ${basedirs}; do
351 done 507 done
352} 508}
353 509
354# Helper function for create_ml_includes 510# Helper function for create_ml_includes
355create_ml_includes-allfiles() { 511create_ml_includes-allfiles() {
356 local basedirs=${@} 512 local basedir file
357
358 local files
359 for basedir in ${basedirs}; do 513 for basedir in "$@" ; do
360 local file
361 for file in $(find ${D}/${basedir} -type f); do 514 for file in $(find "${D}"/${basedir} -type f); do
362 echo ${file/${D}\/${basedir}\//} 515 echo ${file/${D}\/${basedir}\//}
363 done 516 done
364 done | sort | uniq 517 done | sort | uniq
365} 518}
366 519
367# Helper function for create_ml_includes 520# Helper function for create_ml_includes
368create_ml_includes-sym_for_dir() { 521create_ml_includes-sym_for_dir() {
369 local dir="${1}" 522 local dir=$1
370 shift 523 shift
371 local data 524 local data
372 for data in ${@}; do 525 for data in "$@"; do
373 if [ "${dir}" = "${data/*:/}" ]; then 526 if [[ ${data} == *:${dir} ]] ; then
374 echo ${data/:*/} 527 echo ${data/:*/}
375 return 0 528 return 0
376 fi 529 fi
377 done 530 done
378 echo "Should be here -- create_ml_includes-sym_for_dir ${1} ${@}" 531 echo "Shouldn't be here -- create_ml_includes-sym_for_dir $1 $@"
379 # exit because we'll likely be called from a subshell 532 # exit because we'll likely be called from a subshell
380 exit 1 533 exit 1
381} 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.5  
changed lines
  Added in v.1.59

  ViewVC Help
Powered by ViewVC 1.1.20