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

Diff of /eclass/multilib.eclass

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

Revision 1.17 Revision 1.36
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.17 2005/02/03 05:29:07 eradicator Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/multilib.eclass,v 1.36 2005/10/07 01:22:36 eradicator 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
84# 81#
85# Example: 82# Example:
86# 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
87# 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
88 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
89### END DOCUMENTATION ### 94### END DOCUMENTATION ###
95
96# Defaults:
97export MULTILIB_ABIS=${MULTILIB_ABIS:-"default"}
98export DEFAULT_ABI=${DEFAULT_ABI:-"default"}
99# This causes econf to set --libdir=/usr/lib where it didn't before
100#export ABI=${ABI:-"default"}
101export CFLAGS_default
102export LDFLAGS_default
103export CHOST_default=${CHOST_default:-${CHOST}}
104export CTARGET_default=${CTARGET_default:-${CTARGET}}
105export LIBDIR_default=${CONF_LIBDIR:-"lib"}
106export CDEFINE_default="__unix__"
90 107
91# has_multilib_profile() 108# has_multilib_profile()
92has_multilib_profile() { 109has_multilib_profile() {
93 [ -n "${MULTILIB_ABIS}" -a "${MULTILIB_ABIS}" != "${MULTILIB_ABIS/ /}" ] 110 [ -n "${MULTILIB_ABIS}" -a "${MULTILIB_ABIS}" != "${MULTILIB_ABIS/ /}" ]
94} 111}
105# 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,
106# 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
107# 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
108# over CONF_LIBDIR in econf, dolib, etc... 125# over CONF_LIBDIR in econf, dolib, etc...
109get_libdir() { 126get_libdir() {
110 LIBDIR_TEST=$(type econf) 127 local CONF_LIBDIR
111 if [ ! -z "${CONF_LIBDIR_OVERRIDE}" ] ; then 128 if [ -n "${CONF_LIBDIR_OVERRIDE}" ] ; then
112 # if there is an override, we want to use that... always. 129 # if there is an override, we want to use that... always.
113 CONF_LIBDIR="${CONF_LIBDIR_OVERRIDE}" 130 echo ${CONF_LIBDIR_OVERRIDE}
114 elif [ -n "$(get_abi_LIBDIR)" ]; then 131 else
115 CONF_LIBDIR="$(get_abi_LIBDIR)" 132 get_abi_LIBDIR
116 elif [ "${LIBDIR_TEST/CONF_LIBDIR}" == "${LIBDIR_TEST}" ]; then # we don't have CONF_LIBDIR support
117 # will be <portage-2.0.51_pre20
118 CONF_LIBDIR="lib"
119 fi 133 fi
120 # and of course, default to lib if CONF_LIBDIR isnt set
121 echo ${CONF_LIBDIR:=lib}
122 unset LIBDIR_TEST
123} 134}
124 135
125get_multilibdir() { 136get_multilibdir() {
126 if [ -n "$(get_abi_LIBDIR)" ]; then 137 if has_multilib_profile; then
127 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"
128 exit 1 139 exit 1
129 fi 140 fi
130 echo ${CONF_MULTILIBDIR:=lib32} 141 echo ${CONF_MULTILIBDIR:=lib32}
131} 142}
140# 151#
141# get_libdir_override lib64 152# get_libdir_override lib64
142# 153#
143# Travis Tilley <lv@gentoo.org> (31 Aug 2004) 154# Travis Tilley <lv@gentoo.org> (31 Aug 2004)
144get_libdir_override() { 155get_libdir_override() {
145 if [ -n "$(get_abi_LIBDIR)" ]; then 156 if has_multilib_profile; then
146 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"
147 exit 1 158 exit 1
148 fi 159 fi
149 CONF_LIBDIR="$1" 160 CONF_LIBDIR="$1"
150 CONF_LIBDIR_OVERRIDE="$1" 161 CONF_LIBDIR_OVERRIDE="$1"
162 LIBDIR_default="$1"
151} 163}
152 164
153# get_abi_var <VAR> [<ABI>] 165# get_abi_var <VAR> [<ABI>]
154# 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
155# 167#
163# 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.
164# 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.
165# 177#
166# Jeremy Huddleston <eradicator@gentoo.org> 178# Jeremy Huddleston <eradicator@gentoo.org>
167get_abi_var() { 179get_abi_var() {
168 local flag=${1} 180 local flag=$1
169 local abi 181 local abi
170 if [ $# -gt 1 ]; then 182 if [ $# -gt 1 ]; then
171 abi=${2} 183 abi=${2}
172 elif [ -n "${ABI}" ]; then 184 elif [ -n "${ABI}" ]; then
173 abi=${ABI} 185 abi=${ABI}
174 elif [ -n "${DEFAULT_ABI}" ]; then 186 elif [ -n "${DEFAULT_ABI}" ]; then
175 abi=${DEFAULT_ABI} 187 abi=${DEFAULT_ABI}
176 else 188 else
177 return 1 189 abi="default"
178 fi 190 fi
179 191
180 local var="${flag}_${abi}" 192 local var="${flag}_${abi}"
181 echo ${!var} 193 echo ${!var}
182} 194}
183 195
184get_abi_CFLAGS() { get_abi_var CFLAGS ${@}; } 196get_abi_CFLAGS() { get_abi_var CFLAGS "$@"; }
197get_abi_LDFLAGS() { get_abi_var LDFLAGS "$@"; }
198get_abi_CHOST() { get_abi_var CHOST "$@"; }
199get_abi_FAKE_TARGETS() { get_abi_var FAKE_TARGETS "$@"; }
185get_abi_CDEFINE() { get_abi_var CDEFINE ${@}; } 200get_abi_CDEFINE() { get_abi_var CDEFINE "$@"; }
186get_abi_LIBDIR() { get_abi_var LIBDIR ${@}; } 201get_abi_LIBDIR() { get_abi_var LIBDIR "$@"; }
187 202
188# Return a list of the ABIs we want to install for with 203# Return a list of the ABIs we want to install for with
189# the last one in the list being the default. 204# the last one in the list being the default.
190get_abi_order() {
191 ewarn "Please update your ebuild to use get_install_abis instead of get_abi_order"
192 get_install_abis ${@}
193}
194
195get_install_abis() { 205get_install_abis() {
196 local order="" 206 local order=""
197 207
198 if [ -z "${MULTILIB_ABIS}" ]; then 208 if [[ -z ${MULTILIB_ABIS} ]] ; then
199 echo "NOMULTILIB" 209 echo "default"
200 return 1 210 return 0
201 fi 211 fi
202 212
203 if hasq multilib-pkg-force ${RESTRICT} || 213 if hasq multilib-pkg-force ${RESTRICT} ||
204 { hasq multilib-pkg ${FEATURES} && hasq multilib-pkg ${RESTRICT}; }; then 214 { hasq multilib-pkg ${FEATURES} && hasq multilib-pkg ${RESTRICT}; }; then
205 for x in ${MULTILIB_ABIS}; do 215 for x in ${MULTILIB_ABIS} ; do
206 if [ "${x}" != "${DEFAULT_ABI}" ]; then 216 if [[ ${x} != "${DEFAULT_ABI}" ]] ; then
207 hasq ${x} ${ABI_DENY} || ordera="${ordera} ${x}" 217 hasq ${x} ${ABI_DENY} || ordera="${ordera} ${x}"
208 fi 218 fi
209 done 219 done
210 hasq ${DEFAULT_ABI} ${ABI_DENY} || order="${ordera} ${DEFAULT_ABI}" 220 hasq ${DEFAULT_ABI} ${ABI_DENY} || order="${ordera} ${DEFAULT_ABI}"
211 221
212 if [ -n "${ABI_ALLOW}" ]; then 222 if [[ -n ${ABI_ALLOW} ]] ; then
213 local ordera="" 223 local ordera=""
214 for x in ${order}; do 224 for x in ${order} ; do
215 if hasq ${x} ${ABI_ALLOW}; then 225 if hasq ${x} ${ABI_ALLOW} ; then
216 ordera="${ordera} ${x}" 226 ordera="${ordera} ${x}"
217 fi 227 fi
218 done 228 done
219 order="${ordera}" 229 order=${ordera}
220 fi 230 fi
221 else 231 else
222 order="${DEFAULT_ABI}" 232 order=${DEFAULT_ABI}
223 fi 233 fi
224 234
225 if [ -z "${order}" ]; then 235 if [[ -z ${order} ]] ; then
226 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." 236 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."
227 fi 237 fi
228 238
229 echo ${order} 239 echo ${order}
230 return 0 240 return 0
234# the last one in the list being the default. 244# the last one in the list being the default.
235get_all_abis() { 245get_all_abis() {
236 local order="" 246 local order=""
237 247
238 if [ -z "${MULTILIB_ABIS}" ]; then 248 if [ -z "${MULTILIB_ABIS}" ]; then
239 echo "NOMULTILIB" 249 echo "default"
240 return 1 250 return 0
241 fi 251 fi
242 252
243 for x in ${MULTILIB_ABIS}; do 253 for x in ${MULTILIB_ABIS}; do
244 if [ "${x}" != "${DEFAULT_ABI}" ]; then 254 if [ "${x}" != "${DEFAULT_ABI}" ]; then
245 order="${order:+${order }}${x}" 255 order="${order:+${order }}${x}"
262 if has_multilib_profile; then 272 if has_multilib_profile; then
263 for abi in ${MULTILIB_ABIS}; do 273 for abi in ${MULTILIB_ABIS}; do
264 [ "$(get_abi_LIBDIR ${abi})" != "lib" ] && libdirs="${libdirs} $(get_abi_LIBDIR ${abi})" 274 [ "$(get_abi_LIBDIR ${abi})" != "lib" ] && libdirs="${libdirs} $(get_abi_LIBDIR ${abi})"
265 done 275 done
266 elif [ -n "${CONF_LIBDIR}" ]; then 276 elif [ -n "${CONF_LIBDIR}" ]; then
267 for dir in ${CONF_LIBDIR} ${CONF_MULTILIBDIR:=lib32}; do 277 for dir in ${CONF_LIBDIR} ${CONF_MULTILIBDIR:-lib32}; do
268 [ "${dir}" != "lib" ] && libdirs="${libdirs} ${dir}" 278 [ "${dir}" != "lib" ] && libdirs="${libdirs} ${dir}"
269 done 279 done
270 fi 280 fi
271 281
272 echo "${libdirs}" 282 echo "${libdirs}"
274 284
275# Return true if ${ABI} is the last ABI on our list (or if we're not 285# Return true if ${ABI} is the last ABI on our list (or if we're not
276# using the new multilib configuration. This can be used to determine 286# using the new multilib configuration. This can be used to determine
277# if we're in the last (or only) run through src_{unpack,compile,install} 287# if we're in the last (or only) run through src_{unpack,compile,install}
278is_final_abi() { 288is_final_abi() {
279 ! has_multilib_profile && return 0 289 has_multilib_profile || return 0
280 local ALL_ABIS=$(get_abi_order) 290 local ALL_ABIS=$(get_install_abis)
281 local LAST_ABI=${ALL_ABIS/* /} 291 local LAST_ABI=${ALL_ABIS/* /}
282 [ "${LAST_ABI}" = "${ABI}" ] 292 [[ ${LAST_ABI} == ${ABI} ]]
283} 293}
284 294
285# echo the number of ABIs we will be installing for 295# echo the number of ABIs we will be installing for
286number_abis() { 296number_abis() {
287 get_abi_order | wc -w 297 get_install_abis | wc -w
288} 298}
289 299
290# get_ml_incdir [<include dir> [<ABI>]] 300# get_ml_incdir [<include dir> [<ABI>]]
291# include dir defaults to /usr/include 301# include dir defaults to /usr/include
292# ABI defaults to ${ABI} or ${DEFAULT_ABI} 302# ABI defaults to ${ABI} or ${DEFAULT_ABI}
293get_ml_incdir() { 303get_ml_incdir() {
294 local dir=/usr/include 304 local dir=/usr/include
295 305
296 if [[ ${#} -gt 0 ]]; then 306 if [[ $# -gt 0 ]]; then
297 incdir=${1} 307 incdir=$1
298 shift 308 shift
299 fi 309 fi
300 310
301 if [[ -z "${MULTILIB_ABIS}" ]]; then 311 if [[ -z "${MULTILIB_ABIS}" ]]; then
302 echo ${incdir} 312 echo ${incdir}
303 return 0 313 return 0
304 fi 314 fi
305 315
306 local abi=${ABI:-${DEFAULT_ABI}} 316 local abi=${ABI-${DEFAULT_ABI}}
307 if [[ ${#} -gt 0 ]]; then 317 if [[ $# -gt 0 ]]; then
308 abi=${1} 318 abi=$1
309 shift 319 shift
310 fi 320 fi
311 321
312 if [[ -d "${dir}/gentoo-multilib/${abi}" ]]; then 322 if [[ -d "${dir}/gentoo-multilib/${abi}" ]]; then
313 echo ${dir}/gentoo-multilib/${abi} 323 echo ${dir}/gentoo-multilib/${abi}
330# ... 340# ...
331# prep_ml_includes /usr/qt/3/include 341# prep_ml_includes /usr/qt/3/include
332# } 342# }
333 343
334prep_ml_includes() { 344prep_ml_includes() {
335 if [ $(number_abis) -gt 1 ]; then 345 if [[ $(number_abis) -gt 1 ]] ; then
336 local dir 346 local dir
337 local dirs 347 local dirs
338 local base 348 local base
339 349
340 if [ ${#} -eq 0 ]; then 350 if [[ $# -eq 0 ]] ; then
341 dirs="/usr/include" 351 dirs=/usr/include
342 else 352 else
343 dirs="${@}" 353 dirs="$@"
344 fi 354 fi
345 355
346 for dir in ${dirs}; do 356 for dir in ${dirs} ; do
347 base=${T}/gentoo-multilib/${dir}/gentoo-multilib 357 base=${T}/gentoo-multilib/${dir}/gentoo-multilib
348 mkdir -p ${base} 358 mkdir -p "${base}"
349 [ -d ${base}/${ABI} ] && rm -rf ${base}/${ABI} 359 [[ -d ${base}/${ABI} ]] && rm -rf "${base}/${ABI}"
350 mv ${D}/${dir} ${base}/${ABI} 360 mv "${D}/${dir}" "${base}/${ABI}"
351 done 361 done
352 362
353 if is_final_abi; then 363 if is_final_abi; then
354 base=${T}/gentoo-multilib 364 base=${T}/gentoo-multilib
355 pushd ${base} 365 pushd "${base}"
356 find . | tar -c -T - -f - | tar -x --no-same-owner -f - -C ${D} 366 find . | tar -c -T - -f - | tar -x --no-same-owner -f - -C ${D}
357 popd 367 popd
358 368
369 # This 'set' stuff is required by mips profiles to properly pass
370 # CDEFINE's (which have spaces) to sub-functions
371 set --
359 for dir in ${dirs}; do 372 for dir in ${dirs} ; do
360 local args=${dir} 373 set -- "$@" "${dir}"
361 local abi 374 local abi
362 for abi in $(get_abi_order); do 375 for abi in $(get_install_abis); do
363 args="${args} $(get_abi_CDEFINE ${abi}):${dir}/gentoo-multilib/${abi}" 376 set -- "$@" "$(get_abi_CDEFINE ${abi}):${dir}/gentoo-multilib/${abi}"
364 done 377 done
365 create_ml_includes ${args} 378 create_ml_includes "$@"
366 done 379 done
367 fi 380 fi
368 fi 381 fi
369} 382}
370 383
377# 390#
378# Example: 391# Example:
379# create_ml_includes /usr/include/asm __sparc__:/usr/include/asm-sparc __sparc64__:/usr/include/asm-sparc64 392# create_ml_includes /usr/include/asm __sparc__:/usr/include/asm-sparc __sparc64__:/usr/include/asm-sparc64
380# create_ml_includes /usr/include/asm __i386__:/usr/include/asm-i386 __x86_64__:/usr/include/asm-x86_64 393# create_ml_includes /usr/include/asm __i386__:/usr/include/asm-i386 __x86_64__:/usr/include/asm-x86_64
381create_ml_includes() { 394create_ml_includes() {
382 local dest="${1}" 395 local dest=$1
383 shift 396 shift
384 local mlinfo="${@}"
385 local basedirs=$(create_ml_includes-listdirs ${mlinfo}) 397 local basedirs=$(create_ml_includes-listdirs "$@")
386 398
387 create_ml_includes-makedestdirs ${dest} ${basedirs} 399 create_ml_includes-makedestdirs ${dest} ${basedirs}
388 400
389 local file 401 local file
390 for file in $(create_ml_includes-allfiles ${basedirs}); do 402 for file in $(create_ml_includes-allfiles ${basedirs}) ; do
391 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')
392 { 404 (
393 echo "/* Common header file autogenerated by create_ml_includes in multilib.eclass */" 405 echo "/* Autogenerated by create_ml_includes() in multilib.eclass */"
394 #echo "#ifndef __CREATE_ML_INCLUDES_STUB_${name}__"
395 #echo "#define __CREATE_ML_INCLUDES_STUB_${name}__"
396 #echo ""
397 406
398 local dir 407 local dir
399 for dir in ${basedirs}; do 408 for dir in ${basedirs}; do
400 if [ -f "${D}/${dir}/${file}" ]; then 409 if [[ -f ${D}/${dir}/${file} ]] ; then
401 echo "#ifdef $(create_ml_includes-sym_for_dir ${dir} ${mlinfo})"
402 echo "#include \"$(create_ml_includes-relative_between ${dest}/$(dirname ${file}) ${dir}/${file})\""
403 echo "#endif /* $(create_ml_includes-sym_for_dir ${dir} ${mlinfo}) */"
404 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} */"
405 fi 421 fi
406 done 422 done
407 423
408 #echo "#endif /* __CREATE_ML_INCLUDES_STUB_${name}__ */" 424 #echo "#endif /* __CREATE_ML_INCLUDES_STUB_${name}__ */"
409 } > ${D}/${dest}/${file} 425 ) > "${D}/${dest}/${file}"
410 done 426 done
411} 427}
412 428
413# Helper function for create_ml_includes 429# Helper function for create_ml_includes
414create_ml_includes-relative_between() { 430create_ml_includes-absolute() {
415 local src="$(create_ml_includes-tidy_path ${1})"
416 local dst="$(create_ml_includes-tidy_path ${2})" 431 local dst="$(create_ml_includes-tidy_path $1)"
417 432
418 src=(${src//\// })
419 dst=(${dst//\// }) 433 dst=(${dst//\// })
420 434
421 local i 435 local i
422 for ((i=0; i<${#src[*]}; i++)); do 436 for ((i=0; i<${#dst[*]}; i++)); do
423 [ "${dst[i]}" != "${src[i]}" ] && break 437 [ "${dst[i]}" == "include" ] && break
424 done 438 done
425 439
426 local common=$i 440 local strip_upto=$i
427 441
428 for ((i=${#src[*]}; i>common; i--)); do
429 echo -n ../
430 done
431
432 for ((i=common; i<${#dst[*]}-1; i++)); do 442 for ((i=strip_upto+1; i<${#dst[*]}-1; i++)); do
433 echo -n ${dst[i]}/ 443 echo -n ${dst[i]}/
434 done 444 done
435 445
436 echo -n ${dst[i]} 446 echo -n ${dst[i]}
437} 447}
438 448
439# Helper function for create_ml_includes 449# Helper function for create_ml_includes
440create_ml_includes-tidy_path() { 450create_ml_includes-tidy_path() {
441 local removed="${1}" 451 local removed=$1
442 452
443 if [ -n "${removed}" ]; then 453 if [ -n "${removed}" ]; then
444 # Remove multiple slashes 454 # Remove multiple slashes
445 while [ "${removed}" != "${removed/\/\//\/}" ]; do 455 while [ "${removed}" != "${removed/\/\//\/}" ]; do
446 removed=${removed/\/\//\/} 456 removed=${removed/\/\//\/}
463 # Remove trailing .. 473 # Remove trailing ..
464 [ "${removed##*/}" = ".." ] && removed=${removed%/*/*} 474 [ "${removed##*/}" = ".." ] && removed=${removed%/*/*}
465 475
466 # Remove trailing / 476 # Remove trailing /
467 [ "${removed##*/}" = "" ] && removed=${removed%/*} 477 [ "${removed##*/}" = "" ] && removed=${removed%/*}
468 478
469 echo ${removed} 479 echo ${removed}
470 fi 480 fi
471} 481}
472 482
473# Helper function for create_ml_includes 483# Helper function for create_ml_includes
474create_ml_includes-listdirs() { 484create_ml_includes-listdirs() {
475 local dirs 485 local dirs
476 local data 486 local data
477 for data in ${@}; do 487 for data in "$@"; do
478 dirs="${dirs} ${data/*:/}" 488 dirs="${dirs} ${data/*:/}"
479 done 489 done
480 echo ${dirs:1} 490 echo ${dirs:1}
481} 491}
482 492
483# Helper function for create_ml_includes 493# Helper function for create_ml_includes
484create_ml_includes-makedestdirs() { 494create_ml_includes-makedestdirs() {
485 local dest=${1} 495 local dest=$1
486 shift 496 shift
487 local basedirs=${@} 497 local basedirs=$@
488 498
489 dodir ${dest} 499 dodir ${dest}
490 500
491 local basedir 501 local basedir
492 for basedir in ${basedirs}; do 502 for basedir in ${basedirs}; do
497 done 507 done
498} 508}
499 509
500# Helper function for create_ml_includes 510# Helper function for create_ml_includes
501create_ml_includes-allfiles() { 511create_ml_includes-allfiles() {
502 local basedirs=${@}
503
504 local basedir 512 local basedir file
505 for basedir in ${basedirs}; do 513 for basedir in "$@" ; do
506 local file
507 for file in $(find ${D}/${basedir} -type f); do 514 for file in $(find "${D}"/${basedir} -type f); do
508 echo ${file/${D}\/${basedir}\//} 515 echo ${file/${D}\/${basedir}\//}
509 done 516 done
510 done | sort | uniq 517 done | sort | uniq
511} 518}
512 519
513# Helper function for create_ml_includes 520# Helper function for create_ml_includes
514create_ml_includes-sym_for_dir() { 521create_ml_includes-sym_for_dir() {
515 local dir="${1}" 522 local dir=$1
516 shift 523 shift
517 local data 524 local data
518 for data in ${@}; do 525 for data in "$@"; do
519 if [ "${dir}" = "${data/*:/}" ]; then 526 if [[ ${data} == *:${dir} ]] ; then
520 echo ${data/:*/} 527 echo ${data/:*/}
521 return 0 528 return 0
522 fi 529 fi
523 done 530 done
524 echo "Shouldn't be here -- create_ml_includes-sym_for_dir ${1} ${@}" 531 echo "Shouldn't be here -- create_ml_includes-sym_for_dir $1 $@"
525 # exit because we'll likely be called from a subshell 532 # exit because we'll likely be called from a subshell
526 exit 1 533 exit 1
527} 534}
535
536get_libname() {
537 local ver=$1
538 if use userland_Darwin ; then
539 if [ -z ${ver} ] ; then
540 echo ".dylib"
541 else
542 echo ".${ver}.dylib"
543 fi
544 else
545 if [ -z ${ver} ] ; then
546 echo ".so"
547 else
548 echo ".so.${ver}"
549 fi
550 fi
551}
552
553# This is for the toolchain to setup profile variables when pulling in
554# a crosscompiler (and thus they aren't set in the profile)
555multilib_env() {
556 local CTARGET=$1
557 local CTARGET_post=${CTARGET#*-}
558
559 case $(tc-arch ${CTARGET}) in
560 amd64)
561 export CFLAGS_x86=${CFLAGS_x86--m32}
562 export CHOST_x86=i686-${CTARGET_post}
563 export CTARGET_x86=i686-${CTARGET_post}
564 export CDEFINE_x86="__i386__"
565 export LIBDIR_x86="lib"
566
567 export CFLAGS_amd64=${CFLAGS_amd64--m64}
568 export CHOST_amd64=x86_64-${CTARGET_post}
569 export CTARGET_amd64=x86_64-${CTARGET_post}
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 mips)
577 export CFLAGS_o32=${CFLAGS_o32--mabi=32}
578 export CHOST_o32=mips-${CTARGET_post}
579 export CTARGET_o32=mips-${CTARGET_post}
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=mips64-${CTARGET_post}
585 export CTARGET_n32=mips64-${CTARGET_post}
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=mips64-${CTARGET_post}
591 export CTARGET_n64=mips64-${CTARGET_post}
592 export CDEFINE_n64="_MIPS_SIM == _ABI64"
593 export LIBDIR_n64="lib64"
594
595 export MULTILIB_ABIS="n64 n32 o32"
596 case ${CTARGET} in
597 mips64*) export DEFAULT_ABI="n32" ;;
598 *) export DEFAULT_ABI="o32" ;;
599 esac
600 ;;
601 ppc64)
602 export CFLAGS_ppc=${CFLAGS_ppc--m32}
603 export CHOST_ppc=powerpc-${CTARGET_post}
604 export CTARGET_ppc=powerpc-${CTARGET_post}
605 export CDEFINE_ppc="!__powerpc64__"
606 export LIBDIR_ppc="lib"
607
608 export CFLAGS_ppc64=${CFLAGS_ppc64--m64}
609 export CHOST_ppc64=powerpc64-${CTARGET_post}
610 export CTARGET_ppc64=powerpc64-${CTARGET_post}
611 export CDEFINE_ppc64="__powerpc64__"
612 export LIBDIR_ppc64="lib64"
613
614 export MULTILIB_ABIS="ppc64 ppc"
615 export DEFAULT_ABI="ppc64"
616 ;;
617 sparc)
618 export CFLAGS_sparc32=${CFLAGS_sparc32--m32}
619 export CHOST_sparc32=sparc-${CTARGET_post}
620 export CTARGET_sparc32=sparc-${CTARGET_post}
621 export CDEFINE_sparc32="!__arch64__"
622 export LIBDIR_sparc32="lib"
623
624 export CFLAGS_sparc64=${CFLAGS_sparc64--m64}
625 export CHOST_sparc64=sparc64-${CTARGET_post}
626 export CTARGET_sparc64=sparc64-${CTARGET_post}
627 export CDEFINE_sparc64="__arch64__"
628 export LIBDIR_sparc64="lib64"
629
630 export MULTILIB_ABIS="sparc64 sparc32"
631 case ${CTARGET} in
632 sparc64*) export DEFAULT_ABI="sparc64" ;;
633 *) export DEFAULT_ABI="sparc32" ;;
634 esac
635 ;;
636 *)
637 export MULTILIB_ABIS="default"
638 export DEFAULT_ABI="default"
639 ;;
640 esac
641}

Legend:
Removed from v.1.17  
changed lines
  Added in v.1.36

  ViewVC Help
Powered by ViewVC 1.1.20