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

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

  ViewVC Help
Powered by ViewVC 1.1.20