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

Diff of /eclass/multilib.eclass

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

Revision 1.22 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.22 2005/02/14 11:33:11 eradicator 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.
9 9
10ECLASS=multilib
11INHERITED="$INHERITED $ECLASS"
12 10
13DESCRIPTION="Based on the ${ECLASS} eclass" 11DESCRIPTION="Based on the ${ECLASS} eclass"
14 12
15# has_multilib_profile: 13# has_multilib_profile:
16# Return true if the current profile is a multilib profile and lists more than 14# Return true if the current profile is a multilib profile and lists more than
84# 82#
85# Example: 83# Example:
86# create_ml_includes /usr/include/asm __sparc__:/usr/include/asm-sparc __sparc64__:/usr/include/asm-sparc64 84# 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 85# create_ml_includes /usr/include/asm __i386__:/usr/include/asm-i386 __x86_64__:/usr/include/asm-x86_64
88 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
89### END DOCUMENTATION ### 95### END DOCUMENTATION ###
90 96
91# Defaults: 97# Defaults:
92export MULTILIB_ABIS=${MULTILIB_ABIS:-"default"} 98export MULTILIB_ABIS=${MULTILIB_ABIS:-"default"}
93export DEFAULT_ABI=${DEFAULT_ABI:-"default"} 99export DEFAULT_ABI=${DEFAULT_ABI:-"default"}
100# This causes econf to set --libdir=/usr/lib where it didn't before
94export ABI=${ABI:-"default"} 101#export ABI=${ABI:-"default"}
95export CFLAGS_default="" 102export CFLAGS_default
96export LDFLAGS_default="" 103export LDFLAGS_default
97export CHOST_default=${CHOST} 104export CHOST_default=${CHOST_default:-${CHOST}}
98export LIBDIR_default=${CONF_LIBDIR:-"lib"} 105export LIBDIR_default=${CONF_LIBDIR:-"lib"}
99export CDEFINE_default="__unix__" 106export CDEFINE_default="__unix__"
100 107
101# has_multilib_profile() 108# has_multilib_profile()
102has_multilib_profile() { 109has_multilib_profile() {
168# 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.
169# 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.
170# 177#
171# Jeremy Huddleston <eradicator@gentoo.org> 178# Jeremy Huddleston <eradicator@gentoo.org>
172get_abi_var() { 179get_abi_var() {
173 local flag=${1} 180 local flag=$1
174 local abi 181 local abi
175 if [ $# -gt 1 ]; then 182 if [ $# -gt 1 ]; then
176 abi=${2} 183 abi=${2}
177 elif [ -n "${ABI}" ]; then 184 elif [ -n "${ABI}" ]; then
178 abi=${ABI} 185 abi=${ABI}
184 191
185 local var="${flag}_${abi}" 192 local var="${flag}_${abi}"
186 echo ${!var} 193 echo ${!var}
187} 194}
188 195
189get_abi_CFLAGS() { get_abi_var CFLAGS "${@}"; } 196get_abi_CFLAGS() { get_abi_var CFLAGS "$@"; }
190get_abi_LDFLAGS() { get_abi_var LDFLAGS "${@}"; } 197get_abi_LDFLAGS() { get_abi_var LDFLAGS "$@"; }
191get_abi_CHOST() { get_abi_var CHOST "${@}"; } 198get_abi_CHOST() { get_abi_var CHOST "$@"; }
199get_abi_FAKE_TARGETS() { get_abi_var FAKE_TARGETS "$@"; }
192get_abi_CDEFINE() { get_abi_var CDEFINE "${@}"; } 200get_abi_CDEFINE() { get_abi_var CDEFINE "$@"; }
193get_abi_LIBDIR() { get_abi_var LIBDIR "${@}"; } 201get_abi_LIBDIR() { get_abi_var LIBDIR "$@"; }
194 202
195# 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
196# the last one in the list being the default. 204# the last one in the list being the default.
197get_install_abis() { 205get_install_abis() {
198 local order="" 206 local order=""
199 207
200 if [ -z "${MULTILIB_ABIS}" ]; then 208 if [[ -z ${MULTILIB_ABIS} ]] ; then
201 echo "default" 209 echo "default"
202 return 0 210 return 0
203 fi 211 fi
204 212
205 if hasq multilib-pkg-force ${RESTRICT} || 213 if hasq multilib-pkg-force ${RESTRICT} ||
206 { hasq multilib-pkg ${FEATURES} && hasq multilib-pkg ${RESTRICT}; }; then 214 { hasq multilib-pkg ${FEATURES} && hasq multilib-pkg ${RESTRICT}; }; then
207 for x in ${MULTILIB_ABIS}; do 215 for x in ${MULTILIB_ABIS} ; do
208 if [ "${x}" != "${DEFAULT_ABI}" ]; then 216 if [[ ${x} != "${DEFAULT_ABI}" ]] ; then
209 hasq ${x} ${ABI_DENY} || ordera="${ordera} ${x}" 217 hasq ${x} ${ABI_DENY} || ordera="${ordera} ${x}"
210 fi 218 fi
211 done 219 done
212 hasq ${DEFAULT_ABI} ${ABI_DENY} || order="${ordera} ${DEFAULT_ABI}" 220 hasq ${DEFAULT_ABI} ${ABI_DENY} || order="${ordera} ${DEFAULT_ABI}"
213 221
214 if [ -n "${ABI_ALLOW}" ]; then 222 if [[ -n ${ABI_ALLOW} ]] ; then
215 local ordera="" 223 local ordera=""
216 for x in ${order}; do 224 for x in ${order} ; do
217 if hasq ${x} ${ABI_ALLOW}; then 225 if hasq ${x} ${ABI_ALLOW} ; then
218 ordera="${ordera} ${x}" 226 ordera="${ordera} ${x}"
219 fi 227 fi
220 done 228 done
221 order="${ordera}" 229 order=${ordera}
222 fi 230 fi
223 else 231 else
224 order="${DEFAULT_ABI}" 232 order=${DEFAULT_ABI}
225 fi 233 fi
226 234
227 if [ -z "${order}" ]; then 235 if [[ -z ${order} ]] ; then
228 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."
229 fi 237 fi
230 238
231 echo ${order} 239 echo ${order}
232 return 0 240 return 0
276 284
277# 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
278# using the new multilib configuration. This can be used to determine 286# using the new multilib configuration. This can be used to determine
279# 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}
280is_final_abi() { 288is_final_abi() {
281 ! has_multilib_profile && return 0 289 has_multilib_profile || return 0
282 local ALL_ABIS=$(get_install_abis) 290 local ALL_ABIS=$(get_install_abis)
283 local LAST_ABI=${ALL_ABIS/* /} 291 local LAST_ABI=${ALL_ABIS/* /}
284 [ "${LAST_ABI}" = "${ABI}" ] 292 [[ ${LAST_ABI} == ${ABI} ]]
285} 293}
286 294
287# echo the number of ABIs we will be installing for 295# echo the number of ABIs we will be installing for
288number_abis() { 296number_abis() {
289 get_install_abis | wc -w 297 get_install_abis | wc -w
293# include dir defaults to /usr/include 301# include dir defaults to /usr/include
294# ABI defaults to ${ABI} or ${DEFAULT_ABI} 302# ABI defaults to ${ABI} or ${DEFAULT_ABI}
295get_ml_incdir() { 303get_ml_incdir() {
296 local dir=/usr/include 304 local dir=/usr/include
297 305
298 if [[ ${#} -gt 0 ]]; then 306 if [[ $# -gt 0 ]]; then
299 incdir=${1} 307 incdir=$1
300 shift 308 shift
301 fi 309 fi
302 310
303 if [[ -z "${MULTILIB_ABIS}" ]]; then 311 if [[ -z "${MULTILIB_ABIS}" ]]; then
304 echo ${incdir} 312 echo ${incdir}
305 return 0 313 return 0
306 fi 314 fi
307 315
308 local abi=${ABI:-${DEFAULT_ABI}} 316 local abi=${ABI-${DEFAULT_ABI}}
309 if [[ ${#} -gt 0 ]]; then 317 if [[ $# -gt 0 ]]; then
310 abi=${1} 318 abi=$1
311 shift 319 shift
312 fi 320 fi
313 321
314 if [[ -d "${dir}/gentoo-multilib/${abi}" ]]; then 322 if [[ -d "${dir}/gentoo-multilib/${abi}" ]]; then
315 echo ${dir}/gentoo-multilib/${abi} 323 echo ${dir}/gentoo-multilib/${abi}
332# ... 340# ...
333# prep_ml_includes /usr/qt/3/include 341# prep_ml_includes /usr/qt/3/include
334# } 342# }
335 343
336prep_ml_includes() { 344prep_ml_includes() {
337 if [ $(number_abis) -gt 1 ]; then 345 if [[ $(number_abis) -gt 1 ]] ; then
338 local dir 346 local dir
339 local dirs 347 local dirs
340 local base 348 local base
341 349
342 if [ ${#} -eq 0 ]; then 350 if [[ $# -eq 0 ]] ; then
343 dirs="/usr/include" 351 dirs=/usr/include
344 else 352 else
345 dirs="${@}" 353 dirs="$@"
346 fi 354 fi
347 355
348 for dir in ${dirs}; do 356 for dir in ${dirs} ; do
349 base=${T}/gentoo-multilib/${dir}/gentoo-multilib 357 base=${T}/gentoo-multilib/${dir}/gentoo-multilib
350 mkdir -p ${base} 358 mkdir -p "${base}"
351 [ -d ${base}/${ABI} ] && rm -rf ${base}/${ABI} 359 [[ -d ${base}/${ABI} ]] && rm -rf "${base}/${ABI}"
352 mv ${D}/${dir} ${base}/${ABI} 360 mv "${D}/${dir}" "${base}/${ABI}"
353 done 361 done
354 362
355 if is_final_abi; then 363 if is_final_abi; then
356 base=${T}/gentoo-multilib 364 base=${T}/gentoo-multilib
357 pushd ${base} 365 pushd "${base}"
358 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}
359 popd 367 popd
360 368
369 # This 'set' stuff is required by mips profiles to properly pass
370 # CDEFINE's (which have spaces) to sub-functions
371 set --
361 for dir in ${dirs}; do 372 for dir in ${dirs} ; do
362 local args=${dir} 373 set -- "$@" "${dir}"
363 local abi 374 local abi
364 for abi in $(get_install_abis); do 375 for abi in $(get_install_abis); do
365 args="${args} $(get_abi_CDEFINE ${abi}):${dir}/gentoo-multilib/${abi}" 376 set -- "$@" "$(get_abi_CDEFINE ${abi}):${dir}/gentoo-multilib/${abi}"
366 done 377 done
367 create_ml_includes ${args} 378 create_ml_includes "$@"
368 done 379 done
369 fi 380 fi
370 fi 381 fi
371} 382}
372 383
379# 390#
380# Example: 391# Example:
381# 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
382# 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
383create_ml_includes() { 394create_ml_includes() {
384 local dest="${1}" 395 local dest=$1
385 shift 396 shift
386 local mlinfo="${@}"
387 local basedirs=$(create_ml_includes-listdirs ${mlinfo}) 397 local basedirs=$(create_ml_includes-listdirs "$@")
388 398
389 create_ml_includes-makedestdirs ${dest} ${basedirs} 399 create_ml_includes-makedestdirs ${dest} ${basedirs}
390 400
391 local file 401 local file
392 for file in $(create_ml_includes-allfiles ${basedirs}); do 402 for file in $(create_ml_includes-allfiles ${basedirs}) ; do
393 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')
394 { 404 (
395 echo "/* Common header file autogenerated by create_ml_includes in multilib.eclass */" 405 echo "/* Autogenerated by create_ml_includes() in multilib.eclass */"
396 406
397 local dir 407 local dir
398 for dir in ${basedirs}; do 408 for dir in ${basedirs}; do
399 if [ -f "${D}/${dir}/${file}" ]; then 409 if [[ -f ${D}/${dir}/${file} ]] ; then
410 echo ""
400 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}"
401 if [[ ${sym::1} == "!" ]]; then 414 elif [[ ${sym::1} == "!" ]] ; then
402 echo "#ifndef ${sym:1}" 415 echo "#ifndef ${sym:1}"
403 else 416 else
404 echo "#ifdef ${sym}" 417 echo "#ifdef ${sym}"
405 fi 418 fi
406 echo "#include \"$(create_ml_includes-relative_between ${dest}/$(dirname ${file}) ${dir}/${file})\"" 419 echo "# include <$(create_ml_includes-absolute ${dir}/${file})>"
407 echo "#endif /* ${sym} */" 420 echo "#endif /* ${sym} */"
408 echo ""
409 fi 421 fi
410 done 422 done
411 423
412 #echo "#endif /* __CREATE_ML_INCLUDES_STUB_${name}__ */" 424 #echo "#endif /* __CREATE_ML_INCLUDES_STUB_${name}__ */"
413 } > ${D}/${dest}/${file} 425 ) > "${D}/${dest}/${file}"
414 done 426 done
415} 427}
416 428
417# Helper function for create_ml_includes 429# Helper function for create_ml_includes
418create_ml_includes-relative_between() { 430create_ml_includes-absolute() {
419 local src="$(create_ml_includes-tidy_path ${1})"
420 local dst="$(create_ml_includes-tidy_path ${2})" 431 local dst="$(create_ml_includes-tidy_path $1)"
421 432
422 src=(${src//\// })
423 dst=(${dst//\// }) 433 dst=(${dst//\// })
424 434
425 local i 435 local i
426 for ((i=0; i<${#src[*]}; i++)); do 436 for ((i=0; i<${#dst[*]}; i++)); do
427 [ "${dst[i]}" != "${src[i]}" ] && break 437 [ "${dst[i]}" == "include" ] && break
428 done 438 done
429 439
430 local common=$i 440 local strip_upto=$i
431 441
432 for ((i=${#src[*]}; i>common; i--)); do
433 echo -n ../
434 done
435
436 for ((i=common; i<${#dst[*]}-1; i++)); do 442 for ((i=strip_upto+1; i<${#dst[*]}-1; i++)); do
437 echo -n ${dst[i]}/ 443 echo -n ${dst[i]}/
438 done 444 done
439 445
440 echo -n ${dst[i]} 446 echo -n ${dst[i]}
441} 447}
442 448
443# Helper function for create_ml_includes 449# Helper function for create_ml_includes
444create_ml_includes-tidy_path() { 450create_ml_includes-tidy_path() {
445 local removed="${1}" 451 local removed=$1
446 452
447 if [ -n "${removed}" ]; then 453 if [ -n "${removed}" ]; then
448 # Remove multiple slashes 454 # Remove multiple slashes
449 while [ "${removed}" != "${removed/\/\//\/}" ]; do 455 while [ "${removed}" != "${removed/\/\//\/}" ]; do
450 removed=${removed/\/\//\/} 456 removed=${removed/\/\//\/}
467 # Remove trailing .. 473 # Remove trailing ..
468 [ "${removed##*/}" = ".." ] && removed=${removed%/*/*} 474 [ "${removed##*/}" = ".." ] && removed=${removed%/*/*}
469 475
470 # Remove trailing / 476 # Remove trailing /
471 [ "${removed##*/}" = "" ] && removed=${removed%/*} 477 [ "${removed##*/}" = "" ] && removed=${removed%/*}
472 478
473 echo ${removed} 479 echo ${removed}
474 fi 480 fi
475} 481}
476 482
477# Helper function for create_ml_includes 483# Helper function for create_ml_includes
478create_ml_includes-listdirs() { 484create_ml_includes-listdirs() {
479 local dirs 485 local dirs
480 local data 486 local data
481 for data in ${@}; do 487 for data in "$@"; do
482 dirs="${dirs} ${data/*:/}" 488 dirs="${dirs} ${data/*:/}"
483 done 489 done
484 echo ${dirs:1} 490 echo ${dirs:1}
485} 491}
486 492
487# Helper function for create_ml_includes 493# Helper function for create_ml_includes
488create_ml_includes-makedestdirs() { 494create_ml_includes-makedestdirs() {
489 local dest=${1} 495 local dest=$1
490 shift 496 shift
491 local basedirs=${@} 497 local basedirs=$@
492 498
493 dodir ${dest} 499 dodir ${dest}
494 500
495 local basedir 501 local basedir
496 for basedir in ${basedirs}; do 502 for basedir in ${basedirs}; do
501 done 507 done
502} 508}
503 509
504# Helper function for create_ml_includes 510# Helper function for create_ml_includes
505create_ml_includes-allfiles() { 511create_ml_includes-allfiles() {
506 local basedirs=${@}
507
508 local basedir 512 local basedir file
509 for basedir in ${basedirs}; do 513 for basedir in "$@" ; do
510 local file
511 for file in $(find ${D}/${basedir} -type f); do 514 for file in $(find "${D}"/${basedir} -type f); do
512 echo ${file/${D}\/${basedir}\//} 515 echo ${file/${D}\/${basedir}\//}
513 done 516 done
514 done | sort | uniq 517 done | sort | uniq
515} 518}
516 519
517# Helper function for create_ml_includes 520# Helper function for create_ml_includes
518create_ml_includes-sym_for_dir() { 521create_ml_includes-sym_for_dir() {
519 local dir="${1}" 522 local dir=$1
520 shift 523 shift
521 local data 524 local data
522 for data in ${@}; do 525 for data in "$@"; do
523 if [ "${dir}" = "${data/*:/}" ]; then 526 if [[ ${data} == *:${dir} ]] ; then
524 echo ${data/:*/} 527 echo ${data/:*/}
525 return 0 528 return 0
526 fi 529 fi
527 done 530 done
528 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 $@"
529 # exit because we'll likely be called from a subshell 532 # exit because we'll likely be called from a subshell
530 exit 1 533 exit 1
531} 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}

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

  ViewVC Help
Powered by ViewVC 1.1.20