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

Diff of /eclass/eutils.eclass

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

Revision 1.118 Revision 1.131
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/eutils.eclass,v 1.118 2004/10/13 14:33:01 vapier Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.131 2004/12/26 07:09:59 vapier Exp $
4# 4#
5# Author: Martin Schlemmer <azarah@gentoo.org> 5# Author: Martin Schlemmer <azarah@gentoo.org>
6# 6#
7# This eclass is for general purpose functions that most ebuilds 7# This eclass is for general purpose functions that most ebuilds
8# have to implement themselves. 8# have to implement themselves.
48# to accomidate the needs of multilib systems. It's no longer a good idea 48# to accomidate the needs of multilib systems. It's no longer a good idea
49# to assume all libraries will end up in lib. Replace any (sane) instances 49# to assume all libraries will end up in lib. Replace any (sane) instances
50# where lib is named directly with $(get_libdir) if possible. 50# where lib is named directly with $(get_libdir) if possible.
51# 51#
52# Travis Tilley <lv@gentoo.org> (24 Aug 2004) 52# Travis Tilley <lv@gentoo.org> (24 Aug 2004)
53#
54# Jeremy Huddleston <eradicator@gentoo.org> (23 Dec 2004):
55# Added support for ${ABI} and ${DEFAULT_ABI}. If they're both not set,
56# fall back on old behavior. Any profile that has these set should also
57# depend on a newer version of portage (not yet released) which uses these
58# over CONF_LIBDIR in econf, dolib, etc...
59#
60# For now, this is restricted to the sparc64-multilib ${PROFILE_ARCH} as it
61# is still in testing.
53get_libdir() { 62get_libdir() {
54 LIBDIR_TEST=$(type econf) 63 LIBDIR_TEST=$(type econf)
55 if [ ! -z "${CONF_LIBDIR_OVERRIDE}" ] ; then 64 if [ ! -z "${CONF_LIBDIR_OVERRIDE}" ] ; then
56 # if there is an override, we want to use that... always. 65 # if there is an override, we want to use that... always.
57 CONF_LIBDIR="${CONF_LIBDIR_OVERRIDE}" 66 CONF_LIBDIR="${CONF_LIBDIR_OVERRIDE}"
62 # # and if there isnt an override, and we're using a version of 71 # # and if there isnt an override, and we're using a version of
63 # # portage without CONF_LIBDIR support, force the use of lib. dolib 72 # # portage without CONF_LIBDIR support, force the use of lib. dolib
64 # # and friends from portage 2.0.50 wont be too happy otherwise. 73 # # and friends from portage 2.0.50 wont be too happy otherwise.
65 # CONF_LIBDIR="lib" 74 # CONF_LIBDIR="lib"
66 #fi 75 #fi
76 elif [ "${PROFILE_ARCH}" = "sparc64-multilib" ]; then # Using eradicator's LIBDIR_<abi> approach...
77 CONF_LIBDIR="$(get_abi_LIBDIR)"
67 elif [ "${LIBDIR_TEST/CONF_LIBDIR}" == "${LIBDIR_TEST}" ]; then # we don't have CONF_LIBDIR support 78 elif [ "${LIBDIR_TEST/CONF_LIBDIR}" == "${LIBDIR_TEST}" ]; then # we don't have CONF_LIBDIR support
68 # will be <portage-2.0.51_pre20 79 # will be <portage-2.0.51_pre20
69 CONF_LIBDIR="lib" 80 CONF_LIBDIR="lib"
70 fi 81 fi
71 # and of course, default to lib if CONF_LIBDIR isnt set 82 # and of course, default to lib if CONF_LIBDIR isnt set
72 echo ${CONF_LIBDIR:=lib} 83 echo ${CONF_LIBDIR:=lib}
73 unset LIBDIR_TEST 84 unset LIBDIR_TEST
74} 85}
75 86
76
77get_multilibdir() { 87get_multilibdir() {
88 [ "${PROFILE_ARCH}" = "sparc64-multilib" ] && die "get_multilibdir called, but it shouldn't be needed on sparc64-multilib"
78 echo ${CONF_MULTILIBDIR:=lib32} 89 echo ${CONF_MULTILIBDIR:=lib32}
79} 90}
80
81 91
82# Sometimes you need to override the value returned by get_libdir. A good 92# Sometimes you need to override the value returned by get_libdir. A good
83# example of this is xorg-x11, where lib32 isnt a supported configuration, 93# example of this is xorg-x11, where lib32 isnt a supported configuration,
84# and where lib64 -must- be used on amd64 (for applications that need lib 94# and where lib64 -must- be used on amd64 (for applications that need lib
85# to be 32bit, such as adobe acrobat). Note that this override also bypasses 95# to be 32bit, such as adobe acrobat). Note that this override also bypasses
89# 99#
90# get_libdir_override lib64 100# get_libdir_override lib64
91# 101#
92# Travis Tilley <lv@gentoo.org> (31 Aug 2004) 102# Travis Tilley <lv@gentoo.org> (31 Aug 2004)
93get_libdir_override() { 103get_libdir_override() {
104 [ "${PROFILE_ARCH}" = "sparc64-multilib" ] && die "get_libdir_override called, but it shouldn't be needed on sparc64-multilib..."
94 CONF_LIBDIR="$1" 105 CONF_LIBDIR="$1"
95 CONF_LIBDIR_OVERRIDE="$1" 106 CONF_LIBDIR_OVERRIDE="$1"
96} 107}
97 108
98# This function generate linker scripts in /usr/lib for dynamic 109# This function generate linker scripts in /usr/lib for dynamic
221 local x="" 232 local x=""
222 233
223 if [ "$#" -gt 1 ] 234 if [ "$#" -gt 1 ]
224 then 235 then
225 local m="" 236 local m=""
226 einfo "${#} patches to apply..." 237 einfo "${#} patches to apply ..."
227 for m in "$@" ; do 238 for m in "$@" ; do
228 epatch "${m}" 239 epatch "${m}"
229 done 240 done
230 return 0 241 return 0
231 fi 242 fi
245 local EPATCH_SOURCE="$1/*" 256 local EPATCH_SOURCE="$1/*"
246 else 257 else
247 local EPATCH_SOURCE="$1/*.${EPATCH_SUFFIX}" 258 local EPATCH_SOURCE="$1/*.${EPATCH_SUFFIX}"
248 fi 259 fi
249 else 260 else
250 if [ ! -d ${EPATCH_SOURCE} ] 261 if [ ! -d ${EPATCH_SOURCE} ] || [ -n "$1" ]
251 then 262 then
252 if [ -n "$1" -a "${EPATCH_SOURCE}" = "${WORKDIR}/patch" ] 263 if [ -n "$1" -a "${EPATCH_SOURCE}" = "${WORKDIR}/patch" ]
253 then 264 then
254 EPATCH_SOURCE="$1" 265 EPATCH_SOURCE="$1"
255 fi 266 fi
284 ;; 295 ;;
285 esac 296 esac
286 297
287 if [ "${SINGLE_PATCH}" = "no" ] 298 if [ "${SINGLE_PATCH}" = "no" ]
288 then 299 then
289 einfo "Applying various patches (bugfixes/updates)..." 300 einfo "Applying various patches (bugfixes/updates) ..."
290 fi 301 fi
291 for x in ${EPATCH_SOURCE} 302 for x in ${EPATCH_SOURCE}
292 do 303 do
293 # New ARCH dependant patch naming scheme... 304 # New ARCH dependant patch naming scheme ...
294 # 305 #
295 # ???_arch_foo.patch 306 # ???_arch_foo.patch
296 # 307 #
297 if [ -f ${x} ] && \ 308 if [ -f ${x} ] && \
298 ([ "${SINGLE_PATCH}" = "yes" -o "${x/_all_}" != "${x}" -o "`eval echo \$\{x/_${ARCH}_\}`" != "${x}" ] || \ 309 ([ "${SINGLE_PATCH}" = "yes" -o "${x/_all_}" != "${x}" -o "`eval echo \$\{x/_${ARCH}_\}`" != "${x}" ] || \
313 then 324 then
314 if [ -n "${EPATCH_SINGLE_MSG}" ] 325 if [ -n "${EPATCH_SINGLE_MSG}" ]
315 then 326 then
316 einfo "${EPATCH_SINGLE_MSG}" 327 einfo "${EPATCH_SINGLE_MSG}"
317 else 328 else
318 einfo "Applying ${x##*/}..." 329 einfo "Applying ${x##*/} ..."
319 fi 330 fi
320 else 331 else
321 einfo " ${x##*/}..." 332 einfo " ${x##*/} ..."
322 fi 333 fi
323 334
324 echo "***** ${x##*/} *****" > ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 335 echo "***** ${x##*/} *****" > ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}
325 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 336 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}
326 337
359 370
360 if (cat ${PATCH_TARGET} | patch -p${count} ${popts} --dry-run -f) >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 2>&1 371 if (cat ${PATCH_TARGET} | patch -p${count} ${popts} --dry-run -f) >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 2>&1
361 then 372 then
362 draw_line "***** ${x##*/} *****" > ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 373 draw_line "***** ${x##*/} *****" > ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real
363 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 374 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real
364 echo "ACTUALLY APPLYING ${x##*/}..." >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 375 echo "ACTUALLY APPLYING ${x##*/} ..." >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real
365 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 376 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real
366 draw_line "***** ${x##*/} *****" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 377 draw_line "***** ${x##*/} *****" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real
367 378
368 cat ${PATCH_TARGET} | patch -p${count} ${popts} >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 2>&1 379 cat ${PATCH_TARGET} | patch -p${count} ${popts} >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 2>&1
369 380
438 449
439 return 1; 450 return 1;
440 } 451 }
441 END 452 END
442 453
443 einfon "Checking for _CS_GNU_LIBPTHREAD_VERSION support in glibc ... " 454 einfon "Checking for _CS_GNU_LIBPTHREAD_VERSION support in glibc ..."
444 if gcc -o ${T}/nptl ${T}/test-nptl.c &> /dev/null 455 if gcc -o ${T}/nptl ${T}/test-nptl.c &> /dev/null
445 then 456 then
446 echo "yes" 457 echo "yes"
447 einfon "Checking what PTHREADS implementation we have ... " 458 einfon "Checking what PTHREADS implementation we have ..."
448 if ${T}/nptl 459 if ${T}/nptl
449 then 460 then
450 return 0 461 return 0
451 else 462 else
452 return 1 463 return 1
528 539
529 if [ -n "${ADMINPARAM}" ] 540 if [ -n "${ADMINPARAM}" ]
530 then 541 then
531 if [ "${jobs}" -gt "${ADMINPARAM}" ] 542 if [ "${jobs}" -gt "${ADMINPARAM}" ]
532 then 543 then
533 einfo "Setting make jobs to \"-j${ADMINPARAM}\" to ensure successful merge..." 544 einfo "Setting make jobs to \"-j${ADMINPARAM}\" to ensure successful merge ..."
534 export MAKEOPTS="${MAKEOPTS} -j${ADMINPARAM}" 545 export MAKEOPTS="${MAKEOPTS} -j${ADMINPARAM}"
535 else 546 else
536 einfo "Setting make jobs to \"-j${jobs}\" to ensure successful merge..." 547 einfo "Setting make jobs to \"-j${jobs}\" to ensure successful merge ..."
537 export MAKEOPTS="${MAKEOPTS} -j${jobs}" 548 export MAKEOPTS="${MAKEOPTS} -j${jobs}"
538 fi 549 fi
539 fi 550 fi
540} 551}
541 552
543# does not exist on the users system 554# does not exist on the users system
544# vapier@gentoo.org 555# vapier@gentoo.org
545# 556#
546# Takes just 1 optional parameter (the directory to create tmpfile in) 557# Takes just 1 optional parameter (the directory to create tmpfile in)
547emktemp() { 558emktemp() {
559 local exe="touch"
560 [ "$1" == "-d" ] && exe="mkdir" && shift
548 local topdir="$1" 561 local topdir="$1"
549 562
550 if [ -z "${topdir}" ] 563 if [ -z "${topdir}" ]
551 then 564 then
552 [ -z "${T}" ] \ 565 [ -z "${T}" ] \
558 then 571 then
559 local tmp=/ 572 local tmp=/
560 while [ -e "${tmp}" ] ; do 573 while [ -e "${tmp}" ] ; do
561 tmp="${topdir}/tmp.${RANDOM}.${RANDOM}.${RANDOM}" 574 tmp="${topdir}/tmp.${RANDOM}.${RANDOM}.${RANDOM}"
562 done 575 done
563 touch "${tmp}" 576 ${exe} "${tmp}"
564 echo "${tmp}" 577 echo "${tmp}"
565 else 578 else
579 [ "${exe}" == "touch" ] \
580 && exe="-p" \
581 || exe="-d"
566 mktemp -p "${topdir}" 582 mktemp ${exe} "${topdir}"
567 fi 583 fi
568} 584}
569 585
570# Small wrapper for getent (Linux), nidump (Mac OS X), 586# Small wrapper for getent (Linux), nidump (Mac OS X),
571# and pw (FreeBSD) used in enewuser()/enewgroup() 587# and pw (FreeBSD) used in enewuser()/enewgroup()
572# Joe Jezak <josejx@gmail.com> and usata@gentoo.org 588# Joe Jezak <josejx@gmail.com> and usata@gentoo.org
573# FBSD stuff: Aaron Walker <ka0ttic@gentoo.org> 589# FBSD stuff: Aaron Walker <ka0ttic@gentoo.org>
574# 590#
575# egetent(database, key) 591# egetent(database, key)
576egetent() { 592egetent() {
577 if useq macos || useq ppc-macos ; then 593 if useq ppc-macos ; then
578 case "$2" in 594 case "$2" in
579 *[!0-9]*) # Non numeric 595 *[!0-9]*) # Non numeric
580 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }" 596 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }"
581 ;; 597 ;;
582 *) # Numeric 598 *) # Numeric
729 745
730 # handle extra and add the user 746 # handle extra and add the user
731 local eextra="$@" 747 local eextra="$@"
732 local oldsandbox="${SANDBOX_ON}" 748 local oldsandbox="${SANDBOX_ON}"
733 export SANDBOX_ON="0" 749 export SANDBOX_ON="0"
734 if useq macos || useq ppc-macos ; 750 if useq ppc-macos
735 then 751 then
736 ### Make the user 752 ### Make the user
737 if [ -z "${eextra}" ] 753 if [ -z "${eextra}" ]
738 then 754 then
739 dscl . create /users/${euser} uid ${euid} 755 dscl . create /users/${euser} uid ${euid}
822 then 838 then
823 if [ "${egid}" -gt 0 ] 839 if [ "${egid}" -gt 0 ]
824 then 840 then
825 if [ -z "`egetent group ${egid}`" ] 841 if [ -z "`egetent group ${egid}`" ]
826 then 842 then
827 if useq macos || useq ppc-macos ; then 843 if useq ppc-macos ; then
828 opts="${opts} ${egid}" 844 opts="${opts} ${egid}"
829 else 845 else
830 opts="${opts} -g ${egid}" 846 opts="${opts} -g ${egid}"
831 fi 847 fi
832 else 848 else
846 opts="${opts} ${eextra}" 862 opts="${opts} ${eextra}"
847 863
848 # add the group 864 # add the group
849 local oldsandbox="${SANDBOX_ON}" 865 local oldsandbox="${SANDBOX_ON}"
850 export SANDBOX_ON="0" 866 export SANDBOX_ON="0"
851 if useq macos || useq ppc-macos ; 867 if useq ppc-macos ; then
852 then
853 if [ ! -z "${eextra}" ]; 868 if [ ! -z "${eextra}" ];
854 then 869 then
855 einfo "Extra options are not supported on macos yet" 870 einfo "Extra options are not supported on macos yet"
856 einfo "Please report the ebuild along with the info below" 871 einfo "Please report the ebuild along with the info below"
857 einfo "eextra: ${eextra}" 872 einfo "eextra: ${eextra}"
882} 897}
883 898
884# Simple script to replace 'dos2unix' binaries 899# Simple script to replace 'dos2unix' binaries
885# vapier@gentoo.org 900# vapier@gentoo.org
886# 901#
887# edos2unix(file, <more files>...) 902# edos2unix(file, <more files> ...)
888edos2unix() { 903edos2unix() {
889 for f in "$@" 904 for f in "$@"
890 do 905 do
891 cp "${f}" ${T}/edos2unix 906 cp "${f}" ${T}/edos2unix
892 sed 's/\r$//' ${T}/edos2unix > "${f}" 907 sed 's/\r$//' ${T}/edos2unix > "${f}"
1243 export CDROM_TOTAL_CDS=${cdcnt} 1258 export CDROM_TOTAL_CDS=${cdcnt}
1244 export CDROM_CURRENT_CD=1 1259 export CDROM_CURRENT_CD=1
1245 1260
1246 # now we see if the user gave use CD_ROOT ... 1261 # now we see if the user gave use CD_ROOT ...
1247 # if they did, let's just believe them that it's correct 1262 # if they did, let's just believe them that it's correct
1248 if [ ! -z "${CD_ROOT}" ] ; then 1263 if [[ ! -z ${CD_ROOT} ]] ; then
1249 export CDROM_ROOT="${CD_ROOT}" 1264 export CDROM_ROOT=${CD_ROOT}
1250 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}" 1265 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1251 return 1266 return
1252 fi 1267 fi
1253 # do the same for CD_ROOT_X 1268 # do the same for CD_ROOT_X
1254 if [ ! -z "${CD_ROOT_1}" ] ; then 1269 if [[ ! -z ${CD_ROOT_1} ]] ; then
1255 local var= 1270 local var=
1256 cdcnt=0 1271 cdcnt=0
1257 while [ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ] ; do 1272 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1258 cdcnt=$((cdcnt + 1)) 1273 cdcnt=$((cdcnt + 1))
1259 var="CD_ROOT_${cdcnt}" 1274 var="CD_ROOT_${cdcnt}"
1260 if [ -z "${!var}" ] ; then 1275 if [[ -z ${!var} ]] ; then
1261 eerror "You must either use just the CD_ROOT" 1276 eerror "You must either use just the CD_ROOT"
1262 eerror "or specify ALL the CD_ROOT_X variables." 1277 eerror "or specify ALL the CD_ROOT_X variables."
1263 eerror "In this case, you will need ${CDROM_TOTAL_CDS} CD_ROOT_X variables." 1278 eerror "In this case, you will need ${CDROM_TOTAL_CDS} CD_ROOT_X variables."
1264 die "could not locate CD_ROOT_${cdcnt}" 1279 die "could not locate CD_ROOT_${cdcnt}"
1265 fi 1280 fi
1268 export CDROM_ROOT=${CDROM_ROOTS_1} 1283 export CDROM_ROOT=${CDROM_ROOTS_1}
1269 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}" 1284 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1270 return 1285 return
1271 fi 1286 fi
1272 1287
1273 if [ ${CDROM_TOTAL_CDS} -eq 1 ] ; then 1288 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then
1274 einfon "This ebuild will need the " 1289 einfon "This ebuild will need the "
1275 if [ -z "${CDROM_NAME}" ] ; then 1290 if [[ -z ${CDROM_NAME} ]] ; then
1276 echo "cdrom for ${PN}." 1291 echo "cdrom for ${PN}."
1277 else 1292 else
1278 echo "${CDROM_NAME}." 1293 echo "${CDROM_NAME}."
1279 fi 1294 fi
1280 echo 1295 echo
1284 einfo "directory containing the files." 1299 einfo "directory containing the files."
1285 echo 1300 echo
1286 else 1301 else
1287 einfo "This package will need access to ${CDROM_TOTAL_CDS} cds." 1302 einfo "This package will need access to ${CDROM_TOTAL_CDS} cds."
1288 cdcnt=0 1303 cdcnt=0
1289 while [ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ] ; do 1304 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1290 cdcnt=$((cdcnt + 1)) 1305 cdcnt=$((cdcnt + 1))
1291 var="CDROM_NAME_${cdcnt}" 1306 var="CDROM_NAME_${cdcnt}"
1292 [ ! -z "${!var}" ] && einfo " CD ${cdcnt}: ${!var}" 1307 [[ ! -z ${!var} ]] && einfo " CD ${cdcnt}: ${!var}"
1293 done 1308 done
1294 echo 1309 echo
1295 einfo "If you do not have the CDs, but have the data files" 1310 einfo "If you do not have the CDs, but have the data files"
1296 einfo "mounted somewhere on your filesystem, just export" 1311 einfo "mounted somewhere on your filesystem, just export"
1297 einfo "the following variables so they point to the right place:" 1312 einfo "the following variables so they point to the right place:"
1298 einfon "" 1313 einfon ""
1299 cdcnt=0 1314 cdcnt=0
1300 while [ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ] ; do 1315 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1301 cdcnt=$((cdcnt + 1)) 1316 cdcnt=$((cdcnt + 1))
1302 echo -n " CD_ROOT_${cdcnt}" 1317 echo -n " CD_ROOT_${cdcnt}"
1303 done 1318 done
1304 echo 1319 echo
1305 einfo "Or, if you have all the files in the same place, or" 1320 einfo "Or, if you have all the files in the same place, or"
1318# remember, you can only go forward in the cd chain, you can't go back. 1333# remember, you can only go forward in the cd chain, you can't go back.
1319cdrom_load_next_cd() { 1334cdrom_load_next_cd() {
1320 export CDROM_CURRENT_CD=$((CDROM_CURRENT_CD + 1)) 1335 export CDROM_CURRENT_CD=$((CDROM_CURRENT_CD + 1))
1321 local var= 1336 local var=
1322 1337
1323 if [ ! -z "${CD_ROOT}" ] ; then 1338 if [[ ! -z ${CD_ROOT} ]] ; then
1324 einfo "Using same root as before for CD #${CDROM_CURRENT_CD}" 1339 einfo "Using same root as before for CD #${CDROM_CURRENT_CD}"
1325 return 1340 return
1326 fi 1341 fi
1327 1342
1328 unset CDROM_ROOT 1343 unset CDROM_ROOT
1329 var=CDROM_ROOTS_${CDROM_CURRENT_CD} 1344 var=CDROM_ROOTS_${CDROM_CURRENT_CD}
1330 if [ -z "${!var}" ] ; then 1345 if [[ -z ${!var} ]] ; then
1331 var="CDROM_CHECK_${CDROM_CURRENT_CD}" 1346 var="CDROM_CHECK_${CDROM_CURRENT_CD}"
1332 cdrom_locate_file_on_cd ${!var} 1347 cdrom_locate_file_on_cd ${!var}
1333 else 1348 else
1334 export CDROM_ROOT="${!var}" 1349 export CDROM_ROOT=${!var}
1335 fi 1350 fi
1336 1351
1337 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}" 1352 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1338} 1353}
1339 1354
1343# found, then a message asking for the user to insert the cdrom will be 1358# found, then a message asking for the user to insert the cdrom will be
1344# displayed and we'll hang out here until: 1359# displayed and we'll hang out here until:
1345# (1) the file is found on a mounted cdrom 1360# (1) the file is found on a mounted cdrom
1346# (2) the user hits CTRL+C 1361# (2) the user hits CTRL+C
1347cdrom_locate_file_on_cd() { 1362cdrom_locate_file_on_cd() {
1348 while [ -z "${CDROM_ROOT}" ] ; do 1363 while [[ -z ${CDROM_ROOT} ]] ; do
1349 local dir="$(dirname ${@})" 1364 local dir="$(dirname ${@})"
1350 local file="$(basename ${@})" 1365 local file="$(basename ${@})"
1351 local mline="" 1366 local mline=""
1352 local showedmsg=0 1367 local showedmsg=0
1353 1368
1354 for mline in `mount | egrep -e '(iso|cdrom)' | awk '{print $3}'` ; do 1369 for mline in $(mount | egrep -e '(iso|cdrom)' | awk '{print $3}') ; do
1355 [ -d "${mline}/${dir}" ] || continue 1370 [[ -d ${mline}/${dir} ]] || continue
1356 [ ! -z "$(find ${mline}/${dir} -iname ${file} -maxdepth 1)" ] \ 1371 [[ ! -z $(find ${mline}/${dir} -iname ${file} -maxdepth 1) ]] \
1357 && export CDROM_ROOT=${mline} 1372 && export CDROM_ROOT=${mline}
1358 done 1373 done
1359 1374
1360 if [ -z "${CDROM_ROOT}" ] ; then 1375 if [[ -z ${CDROM_ROOT} ]] ; then
1361 echo 1376 echo
1362 if [ ${showedmsg} -eq 0 ] ; then 1377 if [[ ${showedmsg} -eq 0 ]] ; then
1363 if [ ${CDROM_TOTAL_CDS} -eq 1 ] ; then 1378 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then
1364 if [ -z "${CDROM_NAME}" ] ; then 1379 if [[ -z ${CDROM_NAME} ]] ; then
1365 einfo "Please insert the cdrom for ${PN} now !" 1380 einfo "Please insert the cdrom for ${PN} now !"
1366 else 1381 else
1367 einfo "Please insert the ${CDROM_NAME} cdrom now !" 1382 einfo "Please insert the ${CDROM_NAME} cdrom now !"
1368 fi 1383 fi
1369 else 1384 else
1370 if [ -z "${CDROM_NAME_1}" ] ; then 1385 if [[ -z ${CDROM_NAME_1} ]] ; then
1371 einfo "Please insert cd #${CDROM_CURRENT_CD} for ${PN} now !" 1386 einfo "Please insert cd #${CDROM_CURRENT_CD} for ${PN} now !"
1372 else 1387 else
1373 local var="CDROM_NAME_${CDROM_CURRENT_CD}" 1388 local var="CDROM_NAME_${CDROM_CURRENT_CD}"
1374 einfo "Please insert+mount the ${!var} cdrom now !" 1389 einfo "Please insert+mount the ${!var} cdrom now !"
1375 fi 1390 fi
1423 1438
1424 ls=" ${ls} " 1439 ls=" ${ls} "
1425 newls="" 1440 newls=""
1426 for f in ${LINGUAS} ; do 1441 for f in ${LINGUAS} ; do
1427 if [ "${ls/ ${f} /}" != "${ls}" ] ; then 1442 if [ "${ls/ ${f} /}" != "${ls}" ] ; then
1428 nl="${newls} ${f}" 1443 newls="${newls} ${f}"
1429 else 1444 else
1430 ewarn "Sorry, but ${PN} does not support the ${f} LINGUA" 1445 ewarn "Sorry, but ${PN} does not support the ${f} LINGUA"
1431 fi 1446 fi
1432 done 1447 done
1433 if [ -z "${newls}" ] ; then 1448 if [ -z "${newls}" ] ; then
1509 einfo 1524 einfo
1510 einfo "After doing that, you can safely remove ${LIB}" 1525 einfo "After doing that, you can safely remove ${LIB}"
1511 einfo "Note: 'emerge gentoolkit' to get revdep-rebuild" 1526 einfo "Note: 'emerge gentoolkit' to get revdep-rebuild"
1512 fi 1527 fi
1513} 1528}
1529
1530# Hack for people to figure out if a package was built with
1531# certain USE flags
1532#
1533# Usage: built_with_use [-a|-o] <DEPEND ATOM> <List of USE flags>
1534# ex: built_with_use xchat gtk2
1535#
1536# Flags: -a all USE flags should be utilized
1537# -o at least one USE flag should be utilized
1538# Note: the default flag is '-a'
1539built_with_use() {
1540 local opt=$1
1541 [[ ${opt:0:1} = "-" ]] && shift || opt="-a"
1542
1543 local PKG=$(best_version $1)
1544 shift
1545
1546 local USEFILE="${ROOT}/var/db/pkg/${PKG}/USE"
1547 [[ ! -e ${USEFILE} ]] && return 1
1548
1549 local USE_BUILT=$(<${USEFILE})
1550 while [[ $# -gt 0 ]] ; do
1551 if [[ ${opt} = "-o" ]] ; then
1552 has $1 ${USE_BUILT} && return 0
1553 else
1554 has $1 ${USE_BUILT} || return 1
1555 fi
1556 shift
1557 done
1558 [[ ${opt} = "-a" ]]
1559}
1560
1561# Many configure scripts wrongly bail when a C++ compiler
1562# could not be detected. #73450
1563epunt_cxx() {
1564 local dir=$1
1565 [[ -z ${dir} ]] && dir=${S}
1566 ebegin "Removing useless C++ checks"
1567 local f
1568 for f in $(find ${dir} -name configure) ; do
1569 patch -p0 "${f}" "${PORTDIR}/eclass/ELT-patches/nocxx/nocxx.patch" > /dev/null
1570 done
1571 eend 0
1572}
1573
1574# get_abi_var <VAR> [<ABI>]
1575# returns the value of ${<VAR>_<ABI>} which should be set in make.defaults
1576#
1577# This code is for testing purposes only with the sparc64-multilib ${PROFILE_ARCH}
1578# and getting a more multilib-aware portage layout. It may end up being used, but for now
1579# it is subject to removal if a better way is worked out.
1580#
1581# ex:
1582# CFLAGS=$(get_abi_var CFLAGS sparc32) # CFLAGS=-m32
1583#
1584# Note that the prefered method is to set CC="$(tc-getCC) $(get_abi_CFLAGS)"
1585# This will hopefully be added to portage soon...
1586#
1587# If <ABI> is not specified, ${ABI} is used.
1588# If <ABI> is not specified and ${ABI} is not defined, ${DEFAULT_ABI} is used.
1589# If <ABI> is not specified and ${ABI} and ${DEFAULT_ABI} are not defined, we return an empty string.
1590#
1591# Jeremy Huddleston <eradicator@gentoo.org>
1592get_abi_var() {
1593 local flag=$1
1594 local abi
1595 if [ $# -gt 1 ]; then
1596 abi=$1
1597 elif [ -n "${ABI}" ]; then
1598 abi=${ABI}
1599 elif [ -n "${DEFAULT_ABI}" ]; then
1600 abi=${DEFAULT_ABI}
1601 else
1602 return 1
1603 fi
1604 eval echo \${${flag}_${abi}}
1605}
1606
1607get_abi_CFLAGS() { get_abi_var CFLAGS $1; }
1608get_abi_CXXFLAGS() { get_abi_var CXXFLAGS $1; }
1609get_abi_ASFLAGS() { get_abi_var ASFLAGS $1; }
1610get_abi_LIBDIR() { get_abi_var LIBDIR $1; }
1611

Legend:
Removed from v.1.118  
changed lines
  Added in v.1.131

  ViewVC Help
Powered by ViewVC 1.1.20