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

Diff of /eclass/multilib.eclass

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

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