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

Diff of /eclass/multilib.eclass

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

Revision 1.32 Revision 1.33
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.32 2005/08/22 16:20:30 swegener Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/multilib.eclass,v 1.33 2005/09/21 02:50:37 vapier 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.
175# 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.
176# 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.
177# 177#
178# Jeremy Huddleston <eradicator@gentoo.org> 178# Jeremy Huddleston <eradicator@gentoo.org>
179get_abi_var() { 179get_abi_var() {
180 local flag=${1} 180 local flag=$1
181 local abi 181 local abi
182 if [ $# -gt 1 ]; then 182 if [ $# -gt 1 ]; then
183 abi=${2} 183 abi=${2}
184 elif [ -n "${ABI}" ]; then 184 elif [ -n "${ABI}" ]; then
185 abi=${ABI} 185 abi=${ABI}
191 191
192 local var="${flag}_${abi}" 192 local var="${flag}_${abi}"
193 echo ${!var} 193 echo ${!var}
194} 194}
195 195
196get_abi_CFLAGS() { get_abi_var CFLAGS "${@}"; } 196get_abi_CFLAGS() { get_abi_var CFLAGS "$@"; }
197get_abi_LDFLAGS() { get_abi_var LDFLAGS "${@}"; } 197get_abi_LDFLAGS() { get_abi_var LDFLAGS "$@"; }
198get_abi_CHOST() { get_abi_var CHOST "${@}"; } 198get_abi_CHOST() { get_abi_var CHOST "$@"; }
199get_abi_FAKE_TARGETS() { get_abi_var FAKE_TARGETS "${@}"; } 199get_abi_FAKE_TARGETS() { get_abi_var FAKE_TARGETS "$@"; }
200get_abi_CDEFINE() { get_abi_var CDEFINE "${@}"; } 200get_abi_CDEFINE() { get_abi_var CDEFINE "$@"; }
201get_abi_LIBDIR() { get_abi_var LIBDIR "${@}"; } 201get_abi_LIBDIR() { get_abi_var LIBDIR "$@"; }
202 202
203# 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
204# the last one in the list being the default. 204# the last one in the list being the default.
205get_install_abis() { 205get_install_abis() {
206 local order="" 206 local order=""
207 207
208 if [ -z "${MULTILIB_ABIS}" ]; then 208 if [[ -z ${MULTILIB_ABIS} ]] ; then
209 echo "default" 209 echo "default"
210 return 0 210 return 0
211 fi 211 fi
212 212
213 if hasq multilib-pkg-force ${RESTRICT} || 213 if hasq multilib-pkg-force ${RESTRICT} ||
214 { hasq multilib-pkg ${FEATURES} && hasq multilib-pkg ${RESTRICT}; }; then 214 { hasq multilib-pkg ${FEATURES} && hasq multilib-pkg ${RESTRICT}; }; then
215 for x in ${MULTILIB_ABIS}; do 215 for x in ${MULTILIB_ABIS} ; do
216 if [ "${x}" != "${DEFAULT_ABI}" ]; then 216 if [[ ${x} != "${DEFAULT_ABI}" ]] ; then
217 hasq ${x} ${ABI_DENY} || ordera="${ordera} ${x}" 217 hasq ${x} ${ABI_DENY} || ordera="${ordera} ${x}"
218 fi 218 fi
219 done 219 done
220 hasq ${DEFAULT_ABI} ${ABI_DENY} || order="${ordera} ${DEFAULT_ABI}" 220 hasq ${DEFAULT_ABI} ${ABI_DENY} || order="${ordera} ${DEFAULT_ABI}"
221 221
222 if [ -n "${ABI_ALLOW}" ]; then 222 if [[ -n ${ABI_ALLOW} ]] ; then
223 local ordera="" 223 local ordera=""
224 for x in ${order}; do 224 for x in ${order} ; do
225 if hasq ${x} ${ABI_ALLOW}; then 225 if hasq ${x} ${ABI_ALLOW} ; then
226 ordera="${ordera} ${x}" 226 ordera="${ordera} ${x}"
227 fi 227 fi
228 done 228 done
229 order="${ordera}" 229 order=${ordera}
230 fi 230 fi
231 else 231 else
232 order="${DEFAULT_ABI}" 232 order=${DEFAULT_ABI}
233 fi 233 fi
234 234
235 if [ -z "${order}" ]; then 235 if [[ -z ${order} ]] ; then
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." 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."
237 fi 237 fi
238 238
239 echo ${order} 239 echo ${order}
240 return 0 240 return 0
301# include dir defaults to /usr/include 301# include dir defaults to /usr/include
302# ABI defaults to ${ABI} or ${DEFAULT_ABI} 302# ABI defaults to ${ABI} or ${DEFAULT_ABI}
303get_ml_incdir() { 303get_ml_incdir() {
304 local dir=/usr/include 304 local dir=/usr/include
305 305
306 if [[ ${#} -gt 0 ]]; then 306 if [[ $# -gt 0 ]]; then
307 incdir=${1} 307 incdir=$1
308 shift 308 shift
309 fi 309 fi
310 310
311 if [[ -z "${MULTILIB_ABIS}" ]]; then 311 if [[ -z "${MULTILIB_ABIS}" ]]; then
312 echo ${incdir} 312 echo ${incdir}
313 return 0 313 return 0
314 fi 314 fi
315 315
316 local abi=${ABI-${DEFAULT_ABI}} 316 local abi=${ABI-${DEFAULT_ABI}}
317 if [[ ${#} -gt 0 ]]; then 317 if [[ $# -gt 0 ]]; then
318 abi=${1} 318 abi=$1
319 shift 319 shift
320 fi 320 fi
321 321
322 if [[ -d "${dir}/gentoo-multilib/${abi}" ]]; then 322 if [[ -d "${dir}/gentoo-multilib/${abi}" ]]; then
323 echo ${dir}/gentoo-multilib/${abi} 323 echo ${dir}/gentoo-multilib/${abi}
340# ... 340# ...
341# prep_ml_includes /usr/qt/3/include 341# prep_ml_includes /usr/qt/3/include
342# } 342# }
343 343
344prep_ml_includes() { 344prep_ml_includes() {
345 if [ $(number_abis) -gt 1 ]; then 345 if [[ $(number_abis) -gt 1 ]] ; then
346 local dir 346 local dir
347 local dirs 347 local dirs
348 local base 348 local base
349 349
350 if [ ${#} -eq 0 ]; then 350 if [[ $# -eq 0 ]] ; then
351 dirs="/usr/include" 351 dirs=/usr/include
352 else 352 else
353 dirs="${@}" 353 dirs="$@"
354 fi 354 fi
355 355
356 for dir in ${dirs}; do 356 for dir in ${dirs} ; do
357 base=${T}/gentoo-multilib/${dir}/gentoo-multilib 357 base=${T}/gentoo-multilib/${dir}/gentoo-multilib
358 mkdir -p ${base} 358 mkdir -p "${base}"
359 [ -d ${base}/${ABI} ] && rm -rf ${base}/${ABI} 359 [[ -d ${base}/${ABI} ]] && rm -rf "${base}/${ABI}"
360 mv ${D}/${dir} ${base}/${ABI} 360 mv "${D}/${dir}" "${base}/${ABI}"
361 done 361 done
362 362
363 if is_final_abi; then 363 if is_final_abi; then
364 base=${T}/gentoo-multilib 364 base=${T}/gentoo-multilib
365 pushd ${base} 365 pushd "${base}"
366 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}
367 popd 367 popd
368 368
369 # This 'set' stuff is required by mips profiles to properly pass
370 # CDEFINE's (which have spaces) to sub-functions
371 set --
369 for dir in ${dirs}; do 372 for dir in ${dirs} ; do
370 local args=${dir} 373 set -- "$@" "${dir}"
371 local abi 374 local abi
372 for abi in $(get_install_abis); do 375 for abi in $(get_install_abis); do
373 args="${args} $(get_abi_CDEFINE ${abi}):${dir}/gentoo-multilib/${abi}" 376 set -- "$@" "$(get_abi_CDEFINE ${abi}):${dir}/gentoo-multilib/${abi}"
374 done 377 done
375 create_ml_includes ${args} 378 create_ml_includes "$@"
376 done 379 done
377 fi 380 fi
378 fi 381 fi
379} 382}
380 383
387# 390#
388# Example: 391# Example:
389# 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
390# 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
391create_ml_includes() { 394create_ml_includes() {
392 local dest="${1}" 395 local dest=$1
393 shift 396 shift
394 local mlinfo="${@}"
395 local basedirs=$(create_ml_includes-listdirs ${mlinfo}) 397 local basedirs=$(create_ml_includes-listdirs "$@")
396 398
397 create_ml_includes-makedestdirs ${dest} ${basedirs} 399 create_ml_includes-makedestdirs ${dest} ${basedirs}
398 400
399 local file 401 local file
400 for file in $(create_ml_includes-allfiles ${basedirs}); do 402 for file in $(create_ml_includes-allfiles ${basedirs}) ; do
401 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')
402 { 404 (
403 echo "/* Common header file autogenerated by create_ml_includes in multilib.eclass */" 405 echo "/* Autogenerated by create_ml_includes() in multilib.eclass */"
404 406
405 local dir 407 local dir
406 for dir in ${basedirs}; do 408 for dir in ${basedirs}; do
407 if [ -f "${D}/${dir}/${file}" ]; then 409 if [[ -f ${D}/${dir}/${file} ]] ; then
410 echo ""
408 local sym=$(create_ml_includes-sym_for_dir ${dir} ${mlinfo}) 411 local sym=$(create_ml_includes-sym_for_dir ${dir} "$@")
412 if [[ ${sym/=} != "${sym}" ]] ; then
413 echo "#if ${sym}"
409 if [[ ${sym::1} == "!" ]]; then 414 elif [[ ${sym::1} == "!" ]] ; then
410 echo "#ifndef ${sym:1}" 415 echo "#ifndef ${sym:1}"
411 else 416 else
412 echo "#ifdef ${sym}" 417 echo "#ifdef ${sym}"
413 fi 418 fi
414 echo "#include <$(create_ml_includes-absolute ${dir}/${file})>" 419 echo "# include <$(create_ml_includes-absolute ${dir}/${file})>"
415 echo "#endif /* ${sym} */" 420 echo "#endif /* ${sym} */"
416 echo ""
417 fi 421 fi
418 done 422 done
419 423
420 #echo "#endif /* __CREATE_ML_INCLUDES_STUB_${name}__ */" 424 #echo "#endif /* __CREATE_ML_INCLUDES_STUB_${name}__ */"
421 } > ${D}/${dest}/${file} 425 ) > "${D}/${dest}/${file}"
422 done 426 done
423} 427}
424 428
425# Helper function for create_ml_includes 429# Helper function for create_ml_includes
426create_ml_includes-absolute() { 430create_ml_includes-absolute() {
427 local dst="$(create_ml_includes-tidy_path ${1})" 431 local dst="$(create_ml_includes-tidy_path $1)"
428 432
429 dst=(${dst//\// }) 433 dst=(${dst//\// })
430 434
431 local i 435 local i
432 for ((i=0; i<${#dst[*]}; i++)); do 436 for ((i=0; i<${#dst[*]}; i++)); do
442 echo -n ${dst[i]} 446 echo -n ${dst[i]}
443} 447}
444 448
445# Helper function for create_ml_includes 449# Helper function for create_ml_includes
446create_ml_includes-tidy_path() { 450create_ml_includes-tidy_path() {
447 local removed="${1}" 451 local removed=$1
448 452
449 if [ -n "${removed}" ]; then 453 if [ -n "${removed}" ]; then
450 # Remove multiple slashes 454 # Remove multiple slashes
451 while [ "${removed}" != "${removed/\/\//\/}" ]; do 455 while [ "${removed}" != "${removed/\/\//\/}" ]; do
452 removed=${removed/\/\//\/} 456 removed=${removed/\/\//\/}
478 482
479# Helper function for create_ml_includes 483# Helper function for create_ml_includes
480create_ml_includes-listdirs() { 484create_ml_includes-listdirs() {
481 local dirs 485 local dirs
482 local data 486 local data
483 for data in ${@}; do 487 for data in "$@"; do
484 dirs="${dirs} ${data/*:/}" 488 dirs="${dirs} ${data/*:/}"
485 done 489 done
486 echo ${dirs:1} 490 echo ${dirs:1}
487} 491}
488 492
489# Helper function for create_ml_includes 493# Helper function for create_ml_includes
490create_ml_includes-makedestdirs() { 494create_ml_includes-makedestdirs() {
491 local dest=${1} 495 local dest=$1
492 shift 496 shift
493 local basedirs=${@} 497 local basedirs=$@
494 498
495 dodir ${dest} 499 dodir ${dest}
496 500
497 local basedir 501 local basedir
498 for basedir in ${basedirs}; do 502 for basedir in ${basedirs}; do
503 done 507 done
504} 508}
505 509
506# Helper function for create_ml_includes 510# Helper function for create_ml_includes
507create_ml_includes-allfiles() { 511create_ml_includes-allfiles() {
508 local basedirs=${@}
509
510 local basedir 512 local basedir file
511 for basedir in ${basedirs}; do 513 for basedir in "$@" ; do
512 local file
513 for file in $(find ${D}/${basedir} -type f); do 514 for file in $(find "${D}"/${basedir} -type f); do
514 echo ${file/${D}\/${basedir}\//} 515 echo ${file/${D}\/${basedir}\//}
515 done 516 done
516 done | sort | uniq 517 done | sort | uniq
517} 518}
518 519
519# Helper function for create_ml_includes 520# Helper function for create_ml_includes
520create_ml_includes-sym_for_dir() { 521create_ml_includes-sym_for_dir() {
521 local dir="${1}" 522 local dir=$1
522 shift 523 shift
523 local data 524 local data
524 for data in ${@}; do 525 for data in "$@"; do
525 if [ "${dir}" = "${data/*:/}" ]; then 526 if [[ ${data} == *:${dir} ]] ; then
526 echo ${data/:*/} 527 echo ${data/:*/}
527 return 0 528 return 0
528 fi 529 fi
529 done 530 done
530 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 $@"
531 # exit because we'll likely be called from a subshell 532 # exit because we'll likely be called from a subshell
532 exit 1 533 exit 1
533} 534}
534 535
535get_libname() { 536get_libname() {
546 else 547 else
547 echo ".so.${ver}" 548 echo ".so.${ver}"
548 fi 549 fi
549 fi 550 fi
550} 551}
551

Legend:
Removed from v.1.32  
changed lines
  Added in v.1.33

  ViewVC Help
Powered by ViewVC 1.1.20