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

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

  ViewVC Help
Powered by ViewVC 1.1.20