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

Diff of /eclass/eutils.eclass

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

Revision 1.128 Revision 1.135
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.128 2004/12/23 09:20:45 eradicator Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.135 2004/12/31 11:28:18 eradicator 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.
54# Jeremy Huddleston <eradicator@gentoo.org> (23 Dec 2004): 54# Jeremy Huddleston <eradicator@gentoo.org> (23 Dec 2004):
55# Added support for ${ABI} and ${DEFAULT_ABI}. If they're both not set, 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 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 57# depend on a newer version of portage (not yet released) which uses these
58# over CONF_LIBDIR in econf, dolib, etc... 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.
62get_libdir() { 59get_libdir() {
63 LIBDIR_TEST=$(type econf) 60 LIBDIR_TEST=$(type econf)
64 if [ ! -z "${CONF_LIBDIR_OVERRIDE}" ] ; then 61 if [ ! -z "${CONF_LIBDIR_OVERRIDE}" ] ; then
65 # if there is an override, we want to use that... always. 62 # if there is an override, we want to use that... always.
66 CONF_LIBDIR="${CONF_LIBDIR_OVERRIDE}" 63 CONF_LIBDIR="${CONF_LIBDIR_OVERRIDE}"
71 # # and if there isnt an override, and we're using a version of 68 # # and if there isnt an override, and we're using a version of
72 # # portage without CONF_LIBDIR support, force the use of lib. dolib 69 # # portage without CONF_LIBDIR support, force the use of lib. dolib
73 # # and friends from portage 2.0.50 wont be too happy otherwise. 70 # # and friends from portage 2.0.50 wont be too happy otherwise.
74 # CONF_LIBDIR="lib" 71 # CONF_LIBDIR="lib"
75 #fi 72 #fi
76 elif [ "${PROFILE_ARCH}" = "sparc64-multilib" ]; then # Using eradicator's LIBDIR_<abi> approach... 73 elif [ -n "$(get_abi_LIBDIR)" ]; then # Using eradicator's LIBDIR_<abi> approach...
77 CONF_LIBDIR="$(get_abi_LIBDIR)" 74 CONF_LIBDIR="$(get_abi_LIBDIR)"
78 elif [ "${LIBDIR_TEST/CONF_LIBDIR}" == "${LIBDIR_TEST}" ]; then # we don't have CONF_LIBDIR support 75 elif [ "${LIBDIR_TEST/CONF_LIBDIR}" == "${LIBDIR_TEST}" ]; then # we don't have CONF_LIBDIR support
79 # will be <portage-2.0.51_pre20 76 # will be <portage-2.0.51_pre20
80 CONF_LIBDIR="lib" 77 CONF_LIBDIR="lib"
81 fi 78 fi
83 echo ${CONF_LIBDIR:=lib} 80 echo ${CONF_LIBDIR:=lib}
84 unset LIBDIR_TEST 81 unset LIBDIR_TEST
85} 82}
86 83
87get_multilibdir() { 84get_multilibdir() {
88 [ "${PROFILE_ARCH}" = "sparc64-multilib" ] && die "get_multilibdir called, but it shouldn't be needed on sparc64-multilib" 85 [ -n "$(get_abi_LIBDIR)" ] && die "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"
89 echo ${CONF_MULTILIBDIR:=lib32} 86 echo ${CONF_MULTILIBDIR:=lib32}
90} 87}
91 88
92# Sometimes you need to override the value returned by get_libdir. A good 89# Sometimes you need to override the value returned by get_libdir. A good
93# example of this is xorg-x11, where lib32 isnt a supported configuration, 90# example of this is xorg-x11, where lib32 isnt a supported configuration,
99# 96#
100# get_libdir_override lib64 97# get_libdir_override lib64
101# 98#
102# Travis Tilley <lv@gentoo.org> (31 Aug 2004) 99# Travis Tilley <lv@gentoo.org> (31 Aug 2004)
103get_libdir_override() { 100get_libdir_override() {
104 [ "${PROFILE_ARCH}" = "sparc64-multilib" ] && die "get_libdir_override called, but it shouldn't be needed on sparc64-multilib..." 101 [ -n "$(get_abi_LIBDIR)" ] && die "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"
105 CONF_LIBDIR="$1" 102 CONF_LIBDIR="$1"
106 CONF_LIBDIR_OVERRIDE="$1" 103 CONF_LIBDIR_OVERRIDE="$1"
107} 104}
108 105
109# This function generate linker scripts in /usr/lib for dynamic 106# This function generate linker scripts in /usr/lib for dynamic
906 cp "${f}" ${T}/edos2unix 903 cp "${f}" ${T}/edos2unix
907 sed 's/\r$//' ${T}/edos2unix > "${f}" 904 sed 's/\r$//' ${T}/edos2unix > "${f}"
908 done 905 done
909} 906}
910 907
908
909##############################################################
910# START: Handle .desktop files and menu entries #
911# maybe this should be separated into a new eclass some time #
912# lanius@gentoo.org #
913##############################################################
914
911# Make a desktop file ! 915# Make a desktop file !
912# Great for making those icons in kde/gnome startmenu ! 916# Great for making those icons in kde/gnome startmenu !
913# Amaze your friends ! Get the women ! Join today ! 917# Amaze your friends ! Get the women ! Join today !
914# 918#
915# make_desktop_entry(<binary>, [name], [icon], [type], [path]) 919# make_desktop_entry(<binary>, [name], [icon], [type], [path])
968 insinto /usr/share/applications 972 insinto /usr/share/applications
969 doins "${desktop}" 973 doins "${desktop}"
970 974
971 return 0 975 return 0
972} 976}
977
978# Make a GDM/KDM Session file
979#
980# make_desktop_entry(<title>, <command>)
981# title: File to execute to start the Window Manager
982# command: Name of the Window Manager
983
984make_session_desktop() {
985
986 [ -z "$1" ] && eerror "make_session_desktop: You must specify the title" && return 1
987 [ -z "$2" ] && eerror "make_session_desktop: You must specify the command" && return 1
988
989 local title="${1}"
990 local command="${2}"
991 local desktop="${T}/${wm}.desktop"
992
993echo "[Desktop Entry]
994Encoding=UTF-8
995Name=${title}
996Comment=This session logs you into ${title}
997Exec=${command}
998TryExec=${command}
999Type=Application" > "${desktop}"
1000
1001 insinto /usr/share/xsessions
1002 doins "${desktop}"
1003
1004 return 0
1005}
1006
1007domenu() {
1008 local i
1009 local j
1010 insinto /usr/share/applications
1011 for i in ${@}
1012 do
1013 if [ -f "${i}" ];
1014 then
1015 doins ${i}
1016 elif [ -d "${i}" ];
1017 then
1018 for j in ${i}/*.desktop
1019 do
1020 doins ${j}
1021 done
1022 fi
1023 done
1024}
1025
1026doicon() {
1027 local i
1028 local j
1029 insinto /usr/share/pixmaps
1030 for i in ${@}
1031 do
1032 if [ -f "${i}" ];
1033 then
1034 doins ${i}
1035 elif [ -d "${i}" ];
1036 then
1037 for j in ${i}/*.png
1038 do
1039 doins ${j}
1040 done
1041 fi
1042 done
1043}
1044
1045##############################################################
1046# END: Handle .desktop files and menu entries #
1047##############################################################
1048
973 1049
974# for internal use only (unpack_pdv and unpack_makeself) 1050# for internal use only (unpack_pdv and unpack_makeself)
975find_unpackable_file() { 1051find_unpackable_file() {
976 local src="$1" 1052 local src="$1"
977 if [ -z "${src}" ] 1053 if [ -z "${src}" ]
1258 export CDROM_TOTAL_CDS=${cdcnt} 1334 export CDROM_TOTAL_CDS=${cdcnt}
1259 export CDROM_CURRENT_CD=1 1335 export CDROM_CURRENT_CD=1
1260 1336
1261 # now we see if the user gave use CD_ROOT ... 1337 # now we see if the user gave use CD_ROOT ...
1262 # if they did, let's just believe them that it's correct 1338 # if they did, let's just believe them that it's correct
1263 if [ ! -z "${CD_ROOT}" ] ; then 1339 if [[ ! -z ${CD_ROOT} ]] ; then
1264 export CDROM_ROOT="${CD_ROOT}" 1340 export CDROM_ROOT=${CD_ROOT}
1265 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}" 1341 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1266 return 1342 return
1267 fi 1343 fi
1268 # do the same for CD_ROOT_X 1344 # do the same for CD_ROOT_X
1269 if [ ! -z "${CD_ROOT_1}" ] ; then 1345 if [[ ! -z ${CD_ROOT_1} ]] ; then
1270 local var= 1346 local var=
1271 cdcnt=0 1347 cdcnt=0
1272 while [ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ] ; do 1348 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1273 cdcnt=$((cdcnt + 1)) 1349 cdcnt=$((cdcnt + 1))
1274 var="CD_ROOT_${cdcnt}" 1350 var="CD_ROOT_${cdcnt}"
1275 if [ -z "${!var}" ] ; then 1351 if [[ -z ${!var} ]] ; then
1276 eerror "You must either use just the CD_ROOT" 1352 eerror "You must either use just the CD_ROOT"
1277 eerror "or specify ALL the CD_ROOT_X variables." 1353 eerror "or specify ALL the CD_ROOT_X variables."
1278 eerror "In this case, you will need ${CDROM_TOTAL_CDS} CD_ROOT_X variables." 1354 eerror "In this case, you will need ${CDROM_TOTAL_CDS} CD_ROOT_X variables."
1279 die "could not locate CD_ROOT_${cdcnt}" 1355 die "could not locate CD_ROOT_${cdcnt}"
1280 fi 1356 fi
1283 export CDROM_ROOT=${CDROM_ROOTS_1} 1359 export CDROM_ROOT=${CDROM_ROOTS_1}
1284 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}" 1360 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1285 return 1361 return
1286 fi 1362 fi
1287 1363
1288 if [ ${CDROM_TOTAL_CDS} -eq 1 ] ; then 1364 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then
1289 einfon "This ebuild will need the " 1365 einfon "This ebuild will need the "
1290 if [ -z "${CDROM_NAME}" ] ; then 1366 if [[ -z ${CDROM_NAME} ]] ; then
1291 echo "cdrom for ${PN}." 1367 echo "cdrom for ${PN}."
1292 else 1368 else
1293 echo "${CDROM_NAME}." 1369 echo "${CDROM_NAME}."
1294 fi 1370 fi
1295 echo 1371 echo
1296 einfo "If you do not have the CD, but have the data files" 1372 einfo "If you do not have the CD, but have the data files"
1297 einfo "mounted somewhere on your filesystem, just export" 1373 einfo "mounted somewhere on your filesystem, just export"
1298 einfo "the variable CD_ROOT so that it points to the" 1374 einfo "the variable CD_ROOT so that it points to the"
1299 einfo "directory containing the files." 1375 einfo "directory containing the files."
1300 echo 1376 echo
1377 einfo "For example:"
1378 einfo "export CD_ROOT=/mnt/cdrom"
1379 echo
1301 else 1380 else
1302 einfo "This package will need access to ${CDROM_TOTAL_CDS} cds." 1381 einfo "This package will need access to ${CDROM_TOTAL_CDS} cds."
1303 cdcnt=0 1382 cdcnt=0
1304 while [ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ] ; do 1383 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1305 cdcnt=$((cdcnt + 1)) 1384 cdcnt=$((cdcnt + 1))
1306 var="CDROM_NAME_${cdcnt}" 1385 var="CDROM_NAME_${cdcnt}"
1307 [ ! -z "${!var}" ] && einfo " CD ${cdcnt}: ${!var}" 1386 [[ ! -z ${!var} ]] && einfo " CD ${cdcnt}: ${!var}"
1308 done 1387 done
1309 echo 1388 echo
1310 einfo "If you do not have the CDs, but have the data files" 1389 einfo "If you do not have the CDs, but have the data files"
1311 einfo "mounted somewhere on your filesystem, just export" 1390 einfo "mounted somewhere on your filesystem, just export"
1312 einfo "the following variables so they point to the right place:" 1391 einfo "the following variables so they point to the right place:"
1313 einfon "" 1392 einfon ""
1314 cdcnt=0 1393 cdcnt=0
1315 while [ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ] ; do 1394 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1316 cdcnt=$((cdcnt + 1)) 1395 cdcnt=$((cdcnt + 1))
1317 echo -n " CD_ROOT_${cdcnt}" 1396 echo -n " CD_ROOT_${cdcnt}"
1318 done 1397 done
1319 echo 1398 echo
1320 einfo "Or, if you have all the files in the same place, or" 1399 einfo "Or, if you have all the files in the same place, or"
1321 einfo "you only have one cdrom, you can export CD_ROOT" 1400 einfo "you only have one cdrom, you can export CD_ROOT"
1322 einfo "and that place will be used as the same data source" 1401 einfo "and that place will be used as the same data source"
1323 einfo "for all the CDs." 1402 einfo "for all the CDs."
1324 echo 1403 echo
1404 einfo "For example:"
1405 einfo "export CD_ROOT_1=/mnt/cdrom"
1406 echo
1325 fi 1407 fi
1326 export CDROM_CURRENT_CD=0 1408 export CDROM_CURRENT_CD=0
1327 cdrom_load_next_cd 1409 cdrom_load_next_cd
1328} 1410}
1329 1411
1333# remember, you can only go forward in the cd chain, you can't go back. 1415# remember, you can only go forward in the cd chain, you can't go back.
1334cdrom_load_next_cd() { 1416cdrom_load_next_cd() {
1335 export CDROM_CURRENT_CD=$((CDROM_CURRENT_CD + 1)) 1417 export CDROM_CURRENT_CD=$((CDROM_CURRENT_CD + 1))
1336 local var= 1418 local var=
1337 1419
1338 if [ ! -z "${CD_ROOT}" ] ; then 1420 if [[ ! -z ${CD_ROOT} ]] ; then
1339 einfo "Using same root as before for CD #${CDROM_CURRENT_CD}" 1421 einfo "Using same root as before for CD #${CDROM_CURRENT_CD}"
1340 return 1422 return
1341 fi 1423 fi
1342 1424
1343 unset CDROM_ROOT 1425 unset CDROM_ROOT
1344 var=CDROM_ROOTS_${CDROM_CURRENT_CD} 1426 var=CDROM_ROOTS_${CDROM_CURRENT_CD}
1345 if [ -z "${!var}" ] ; then 1427 if [[ -z ${!var} ]] ; then
1346 var="CDROM_CHECK_${CDROM_CURRENT_CD}" 1428 var="CDROM_CHECK_${CDROM_CURRENT_CD}"
1347 cdrom_locate_file_on_cd ${!var} 1429 cdrom_locate_file_on_cd ${!var}
1348 else 1430 else
1349 export CDROM_ROOT="${!var}" 1431 export CDROM_ROOT=${!var}
1350 fi 1432 fi
1351 1433
1352 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}" 1434 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1353} 1435}
1354 1436
1358# found, then a message asking for the user to insert the cdrom will be 1440# found, then a message asking for the user to insert the cdrom will be
1359# displayed and we'll hang out here until: 1441# displayed and we'll hang out here until:
1360# (1) the file is found on a mounted cdrom 1442# (1) the file is found on a mounted cdrom
1361# (2) the user hits CTRL+C 1443# (2) the user hits CTRL+C
1362cdrom_locate_file_on_cd() { 1444cdrom_locate_file_on_cd() {
1363 while [ -z "${CDROM_ROOT}" ] ; do 1445 while [[ -z ${CDROM_ROOT} ]] ; do
1364 local dir="$(dirname ${@})" 1446 local dir="$(dirname ${@})"
1365 local file="$(basename ${@})" 1447 local file="$(basename ${@})"
1366 local mline="" 1448 local mline=""
1367 local showedmsg=0 1449 local showedmsg=0
1368 1450
1369 for mline in `mount | egrep -e '(iso|cdrom)' | awk '{print $3}'` ; do 1451 for mline in $(mount | egrep -e '(iso|cdrom)' | awk '{print $3}') ; do
1370 [ -d "${mline}/${dir}" ] || continue 1452 [[ -d ${mline}/${dir} ]] || continue
1371 [ ! -z "$(find ${mline}/${dir} -iname ${file} -maxdepth 1)" ] \ 1453 [[ ! -z $(find ${mline}/${dir} -iname ${file} -maxdepth 1) ]] \
1372 && export CDROM_ROOT=${mline} 1454 && export CDROM_ROOT=${mline}
1373 done 1455 done
1374 1456
1375 if [ -z "${CDROM_ROOT}" ] ; then 1457 if [[ -z ${CDROM_ROOT} ]] ; then
1376 echo 1458 echo
1377 if [ ${showedmsg} -eq 0 ] ; then 1459 if [[ ${showedmsg} -eq 0 ]] ; then
1378 if [ ${CDROM_TOTAL_CDS} -eq 1 ] ; then 1460 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then
1379 if [ -z "${CDROM_NAME}" ] ; then 1461 if [[ -z ${CDROM_NAME} ]] ; then
1380 einfo "Please insert the cdrom for ${PN} now !" 1462 einfo "Please insert the cdrom for ${PN} now !"
1381 else 1463 else
1382 einfo "Please insert the ${CDROM_NAME} cdrom now !" 1464 einfo "Please insert the ${CDROM_NAME} cdrom now !"
1383 fi 1465 fi
1384 else 1466 else
1385 if [ -z "${CDROM_NAME_1}" ] ; then 1467 if [[ -z ${CDROM_NAME_1} ]] ; then
1386 einfo "Please insert cd #${CDROM_CURRENT_CD} for ${PN} now !" 1468 einfo "Please insert cd #${CDROM_CURRENT_CD} for ${PN} now !"
1387 else 1469 else
1388 local var="CDROM_NAME_${CDROM_CURRENT_CD}" 1470 local var="CDROM_NAME_${CDROM_CURRENT_CD}"
1389 einfo "Please insert+mount the ${!var} cdrom now !" 1471 einfo "Please insert+mount the ${!var} cdrom now !"
1390 fi 1472 fi
1509 touch ${D}${LIB} 1591 touch ${D}${LIB}
1510 fi 1592 fi
1511} 1593}
1512 1594
1513preserve_old_lib_notify() { 1595preserve_old_lib_notify() {
1514 LIB=$1 1596 LIB=$1
1515 1597
1516 if [ -n "${LIB}" -a -f "${ROOT}${LIB}" ]; then 1598 if [ -n "${LIB}" -a -f "${ROOT}${LIB}" ]; then
1517 SONAME=`basename ${LIB}` 1599 SONAME=`basename ${LIB}`
1518 1600
1519 einfo "An old version of an installed library was detected on your system." 1601 einfo "An old version of an installed library was detected on your system."
1520 einfo "In order to avoid breaking packages that link against is, this older version" 1602 einfo "In order to avoid breaking packages that link against is, this older version"
1521 einfo "is not being removed. In order to make full use of this newer version," 1603 einfo "is not being removed. In order to make full use of this newer version,"
1522 einfo "you will need to execute the following command:" 1604 einfo "you will need to execute the following command:"
1523 einfo " revdep-rebuild --soname ${SONAME}" 1605 einfo " revdep-rebuild --soname ${SONAME}"
1524 einfo 1606 einfo
1525 einfo "After doing that, you can safely remove ${LIB}" 1607 einfo "After doing that, you can safely remove ${LIB}"
1526 einfo "Note: 'emerge gentoolkit' to get revdep-rebuild" 1608 einfo "Note: 'emerge gentoolkit' to get revdep-rebuild"
1527 fi 1609 fi
1528} 1610}
1529 1611
1530# Hack for people to figure out if a package was built with 1612# Hack for people to figure out if a package was built with
1531# certain USE flags 1613# certain USE flags
1532# 1614#
1533# Usage: built_with_use <DEPEND ATOM> <List of USE flags> 1615# Usage: built_with_use [-a|-o] <DEPEND ATOM> <List of USE flags>
1534# ex: built_with_use xchat gtk2 1616# ex: built_with_use xchat gtk2
1617#
1618# Flags: -a all USE flags should be utilized
1619# -o at least one USE flag should be utilized
1620# Note: the default flag is '-a'
1535built_with_use() { 1621built_with_use() {
1622 local opt=$1
1623 [[ ${opt:0:1} = "-" ]] && shift || opt="-a"
1624
1536 local PKG=$(portageq best_version ${ROOT} $1) 1625 local PKG=$(best_version $1)
1626 shift
1627
1537 local USEFILE="${ROOT}/var/db/pkg/${PKG}/USE" 1628 local USEFILE="${ROOT}/var/db/pkg/${PKG}/USE"
1538 [[ ! -e ${USEFILE} ]] && return 1 1629 [[ ! -e ${USEFILE} ]] && return 1
1539 1630
1540 local USE_BUILT=$(<${USEFILE}) 1631 local USE_BUILT=$(<${USEFILE})
1541
1542 shift
1543 while [ $# -gt 0 ] ; do 1632 while [[ $# -gt 0 ]] ; do
1633 if [[ ${opt} = "-o" ]] ; then
1634 has $1 ${USE_BUILT} && return 0
1635 else
1544 has $1 ${USE_BUILT} || return 1 1636 has $1 ${USE_BUILT} || return 1
1637 fi
1545 shift 1638 shift
1546 done 1639 done
1547 return 0 1640 [[ ${opt} = "-a" ]]
1548} 1641}
1549 1642
1550# Many configure scripts wrongly bail when a C++ compiler 1643# Many configure scripts wrongly bail when a C++ compiler
1551# could not be detected. #73450 1644# could not be detected. #73450
1552epunt_cxx() { 1645epunt_cxx() {
1561} 1654}
1562 1655
1563# get_abi_var <VAR> [<ABI>] 1656# get_abi_var <VAR> [<ABI>]
1564# returns the value of ${<VAR>_<ABI>} which should be set in make.defaults 1657# returns the value of ${<VAR>_<ABI>} which should be set in make.defaults
1565# 1658#
1566# This code is for testing purposes only with the sparc64-multilib ${PROFILE_ARCH}
1567# and getting a more multilib-aware portage layout. It may end up being used, but for now
1568# it is subject to removal if a better way is worked out.
1569#
1570# ex: 1659# ex:
1571# CFLAGS=$(get_abi_var CFLAGS sparc32) # CFLAGS=-m32 1660# CFLAGS=$(get_abi_var CFLAGS sparc32) # CFLAGS=-m32
1572# 1661#
1573# Note that the prefered method is to set CC="$(tc-getCC) $(get_abi_CFLAGS)" 1662# Note that the prefered method is to set CC="$(tc-getCC) $(get_abi_CFLAGS)"
1574# This will hopefully be added to portage soon... 1663# This will hopefully be added to portage soon...
1586 elif [ -n "${ABI}" ]; then 1675 elif [ -n "${ABI}" ]; then
1587 abi=${ABI} 1676 abi=${ABI}
1588 elif [ -n "${DEFAULT_ABI}" ]; then 1677 elif [ -n "${DEFAULT_ABI}" ]; then
1589 abi=${DEFAULT_ABI} 1678 abi=${DEFAULT_ABI}
1590 else 1679 else
1591 return "" 1680 return 1
1592 fi 1681 fi
1593 eval echo \${${flag}_${abi}} 1682 eval echo \${${flag}_${abi}}
1594} 1683}
1595 1684
1596get_abi_CFLAGS() { get_abi_var CFLAGS $1; } 1685get_abi_CFLAGS() { get_abi_var CFLAGS $1; }

Legend:
Removed from v.1.128  
changed lines
  Added in v.1.135

  ViewVC Help
Powered by ViewVC 1.1.20