/[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.138
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.138 2005/01/07 12:04:40 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.
39 sleep 0.1 &>/dev/null ; sleep 0,1 &>/dev/null 39 sleep 0.1 &>/dev/null ; sleep 0,1 &>/dev/null
40 echo -ne "\a" 40 echo -ne "\a"
41 sleep 1 41 sleep 1
42 done 42 done
43 fi 43 fi
44}
45
46# This function simply returns the desired lib directory. With portage
47# 2.0.51, we now have support for installing libraries to lib32/lib64
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
50# where lib is named directly with $(get_libdir) if possible.
51#
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.
62get_libdir() {
63 LIBDIR_TEST=$(type econf)
64 if [ ! -z "${CONF_LIBDIR_OVERRIDE}" ] ; then
65 # if there is an override, we want to use that... always.
66 CONF_LIBDIR="${CONF_LIBDIR_OVERRIDE}"
67 # We don't need to know the verison of portage. We only need to know
68 # if there is support for CONF_LIBDIR in econf and co.
69 # Danny van Dyk <kugelfang@gentoo.org> 2004/17/09
70 #elif portageq has_version / '<sys-apps/portage-2.0.51_pre20' ; then
71 # # 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
73 # # and friends from portage 2.0.50 wont be too happy otherwise.
74 # CONF_LIBDIR="lib"
75 #fi
76 elif [ "${PROFILE_ARCH}" = "sparc64-multilib" ]; then # Using eradicator's LIBDIR_<abi> approach...
77 CONF_LIBDIR="$(get_abi_LIBDIR)"
78 elif [ "${LIBDIR_TEST/CONF_LIBDIR}" == "${LIBDIR_TEST}" ]; then # we don't have CONF_LIBDIR support
79 # will be <portage-2.0.51_pre20
80 CONF_LIBDIR="lib"
81 fi
82 # and of course, default to lib if CONF_LIBDIR isnt set
83 echo ${CONF_LIBDIR:=lib}
84 unset LIBDIR_TEST
85}
86
87get_multilibdir() {
88 [ "${PROFILE_ARCH}" = "sparc64-multilib" ] && die "get_multilibdir called, but it shouldn't be needed on sparc64-multilib"
89 echo ${CONF_MULTILIBDIR:=lib32}
90}
91
92# 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,
94# and where lib64 -must- be used on amd64 (for applications that need lib
95# to be 32bit, such as adobe acrobat). Note that this override also bypasses
96# portage version sanity checking.
97# get_libdir_override expects one argument, the result get_libdir should
98# return:
99#
100# get_libdir_override lib64
101#
102# Travis Tilley <lv@gentoo.org> (31 Aug 2004)
103get_libdir_override() {
104 [ "${PROFILE_ARCH}" = "sparc64-multilib" ] && die "get_libdir_override called, but it shouldn't be needed on sparc64-multilib..."
105 CONF_LIBDIR="$1"
106 CONF_LIBDIR_OVERRIDE="$1"
107} 44}
108 45
109# This function generate linker scripts in /usr/lib for dynamic 46# This function generate linker scripts in /usr/lib for dynamic
110# libs in /lib. This is to fix linking problems when you have 47# libs in /lib. This is to fix linking problems when you have
111# the .so in /lib, and the .a in /usr/lib. What happens is that 48# the .so in /lib, and the .a in /usr/lib. What happens is that
906 cp "${f}" ${T}/edos2unix 843 cp "${f}" ${T}/edos2unix
907 sed 's/\r$//' ${T}/edos2unix > "${f}" 844 sed 's/\r$//' ${T}/edos2unix > "${f}"
908 done 845 done
909} 846}
910 847
848
849##############################################################
850# START: Handle .desktop files and menu entries #
851# maybe this should be separated into a new eclass some time #
852# lanius@gentoo.org #
853##############################################################
854
911# Make a desktop file ! 855# Make a desktop file !
912# Great for making those icons in kde/gnome startmenu ! 856# Great for making those icons in kde/gnome startmenu !
913# Amaze your friends ! Get the women ! Join today ! 857# Amaze your friends ! Get the women ! Join today !
914# 858#
915# make_desktop_entry(<binary>, [name], [icon], [type], [path]) 859# make_desktop_entry(<binary>, [name], [icon], [type], [path])
968 insinto /usr/share/applications 912 insinto /usr/share/applications
969 doins "${desktop}" 913 doins "${desktop}"
970 914
971 return 0 915 return 0
972} 916}
917
918# Make a GDM/KDM Session file
919#
920# make_desktop_entry(<title>, <command>)
921# title: File to execute to start the Window Manager
922# command: Name of the Window Manager
923
924make_session_desktop() {
925
926 [ -z "$1" ] && eerror "make_session_desktop: You must specify the title" && return 1
927 [ -z "$2" ] && eerror "make_session_desktop: You must specify the command" && return 1
928
929 local title="${1}"
930 local command="${2}"
931 local desktop="${T}/${wm}.desktop"
932
933echo "[Desktop Entry]
934Encoding=UTF-8
935Name=${title}
936Comment=This session logs you into ${title}
937Exec=${command}
938TryExec=${command}
939Type=Application" > "${desktop}"
940
941 insinto /usr/share/xsessions
942 doins "${desktop}"
943
944 return 0
945}
946
947domenu() {
948 local i
949 local j
950 insinto /usr/share/applications
951 for i in ${@}
952 do
953 if [ -f "${i}" ];
954 then
955 doins ${i}
956 elif [ -d "${i}" ];
957 then
958 for j in ${i}/*.desktop
959 do
960 doins ${j}
961 done
962 fi
963 done
964}
965
966doicon() {
967 local i
968 local j
969 insinto /usr/share/pixmaps
970 for i in ${@}
971 do
972 if [ -f "${i}" ];
973 then
974 doins ${i}
975 elif [ -d "${i}" ];
976 then
977 for j in ${i}/*.png
978 do
979 doins ${j}
980 done
981 fi
982 done
983}
984
985##############################################################
986# END: Handle .desktop files and menu entries #
987##############################################################
988
973 989
974# for internal use only (unpack_pdv and unpack_makeself) 990# for internal use only (unpack_pdv and unpack_makeself)
975find_unpackable_file() { 991find_unpackable_file() {
976 local src="$1" 992 local src="$1"
977 if [ -z "${src}" ] 993 if [ -z "${src}" ]
1258 export CDROM_TOTAL_CDS=${cdcnt} 1274 export CDROM_TOTAL_CDS=${cdcnt}
1259 export CDROM_CURRENT_CD=1 1275 export CDROM_CURRENT_CD=1
1260 1276
1261 # now we see if the user gave use CD_ROOT ... 1277 # now we see if the user gave use CD_ROOT ...
1262 # if they did, let's just believe them that it's correct 1278 # if they did, let's just believe them that it's correct
1263 if [ ! -z "${CD_ROOT}" ] ; then 1279 if [[ ! -z ${CD_ROOT} ]] ; then
1264 export CDROM_ROOT="${CD_ROOT}" 1280 export CDROM_ROOT=${CD_ROOT}
1265 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}" 1281 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1266 return 1282 return
1267 fi 1283 fi
1268 # do the same for CD_ROOT_X 1284 # do the same for CD_ROOT_X
1269 if [ ! -z "${CD_ROOT_1}" ] ; then 1285 if [[ ! -z ${CD_ROOT_1} ]] ; then
1270 local var= 1286 local var=
1271 cdcnt=0 1287 cdcnt=0
1272 while [ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ] ; do 1288 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1273 cdcnt=$((cdcnt + 1)) 1289 cdcnt=$((cdcnt + 1))
1274 var="CD_ROOT_${cdcnt}" 1290 var="CD_ROOT_${cdcnt}"
1275 if [ -z "${!var}" ] ; then 1291 if [[ -z ${!var} ]] ; then
1276 eerror "You must either use just the CD_ROOT" 1292 eerror "You must either use just the CD_ROOT"
1277 eerror "or specify ALL the CD_ROOT_X variables." 1293 eerror "or specify ALL the CD_ROOT_X variables."
1278 eerror "In this case, you will need ${CDROM_TOTAL_CDS} CD_ROOT_X variables." 1294 eerror "In this case, you will need ${CDROM_TOTAL_CDS} CD_ROOT_X variables."
1279 die "could not locate CD_ROOT_${cdcnt}" 1295 die "could not locate CD_ROOT_${cdcnt}"
1280 fi 1296 fi
1283 export CDROM_ROOT=${CDROM_ROOTS_1} 1299 export CDROM_ROOT=${CDROM_ROOTS_1}
1284 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}" 1300 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1285 return 1301 return
1286 fi 1302 fi
1287 1303
1288 if [ ${CDROM_TOTAL_CDS} -eq 1 ] ; then 1304 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then
1289 einfon "This ebuild will need the " 1305 einfon "This ebuild will need the "
1290 if [ -z "${CDROM_NAME}" ] ; then 1306 if [[ -z ${CDROM_NAME} ]] ; then
1291 echo "cdrom for ${PN}." 1307 echo "cdrom for ${PN}."
1292 else 1308 else
1293 echo "${CDROM_NAME}." 1309 echo "${CDROM_NAME}."
1294 fi 1310 fi
1295 echo 1311 echo
1296 einfo "If you do not have the CD, but have the data files" 1312 einfo "If you do not have the CD, but have the data files"
1297 einfo "mounted somewhere on your filesystem, just export" 1313 einfo "mounted somewhere on your filesystem, just export"
1298 einfo "the variable CD_ROOT so that it points to the" 1314 einfo "the variable CD_ROOT so that it points to the"
1299 einfo "directory containing the files." 1315 einfo "directory containing the files."
1300 echo 1316 echo
1317 einfo "For example:"
1318 einfo "export CD_ROOT=/mnt/cdrom"
1319 echo
1301 else 1320 else
1302 einfo "This package will need access to ${CDROM_TOTAL_CDS} cds." 1321 einfo "This package will need access to ${CDROM_TOTAL_CDS} cds."
1303 cdcnt=0 1322 cdcnt=0
1304 while [ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ] ; do 1323 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1305 cdcnt=$((cdcnt + 1)) 1324 cdcnt=$((cdcnt + 1))
1306 var="CDROM_NAME_${cdcnt}" 1325 var="CDROM_NAME_${cdcnt}"
1307 [ ! -z "${!var}" ] && einfo " CD ${cdcnt}: ${!var}" 1326 [[ ! -z ${!var} ]] && einfo " CD ${cdcnt}: ${!var}"
1308 done 1327 done
1309 echo 1328 echo
1310 einfo "If you do not have the CDs, but have the data files" 1329 einfo "If you do not have the CDs, but have the data files"
1311 einfo "mounted somewhere on your filesystem, just export" 1330 einfo "mounted somewhere on your filesystem, just export"
1312 einfo "the following variables so they point to the right place:" 1331 einfo "the following variables so they point to the right place:"
1313 einfon "" 1332 einfon ""
1314 cdcnt=0 1333 cdcnt=0
1315 while [ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ] ; do 1334 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1316 cdcnt=$((cdcnt + 1)) 1335 cdcnt=$((cdcnt + 1))
1317 echo -n " CD_ROOT_${cdcnt}" 1336 echo -n " CD_ROOT_${cdcnt}"
1318 done 1337 done
1319 echo 1338 echo
1320 einfo "Or, if you have all the files in the same place, or" 1339 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" 1340 einfo "you only have one cdrom, you can export CD_ROOT"
1322 einfo "and that place will be used as the same data source" 1341 einfo "and that place will be used as the same data source"
1323 einfo "for all the CDs." 1342 einfo "for all the CDs."
1324 echo 1343 echo
1344 einfo "For example:"
1345 einfo "export CD_ROOT_1=/mnt/cdrom"
1346 echo
1325 fi 1347 fi
1326 export CDROM_CURRENT_CD=0 1348 export CDROM_CURRENT_CD=0
1327 cdrom_load_next_cd 1349 cdrom_load_next_cd
1328} 1350}
1329 1351
1333# remember, you can only go forward in the cd chain, you can't go back. 1355# remember, you can only go forward in the cd chain, you can't go back.
1334cdrom_load_next_cd() { 1356cdrom_load_next_cd() {
1335 export CDROM_CURRENT_CD=$((CDROM_CURRENT_CD + 1)) 1357 export CDROM_CURRENT_CD=$((CDROM_CURRENT_CD + 1))
1336 local var= 1358 local var=
1337 1359
1338 if [ ! -z "${CD_ROOT}" ] ; then 1360 if [[ ! -z ${CD_ROOT} ]] ; then
1339 einfo "Using same root as before for CD #${CDROM_CURRENT_CD}" 1361 einfo "Using same root as before for CD #${CDROM_CURRENT_CD}"
1340 return 1362 return
1341 fi 1363 fi
1342 1364
1343 unset CDROM_ROOT 1365 unset CDROM_ROOT
1344 var=CDROM_ROOTS_${CDROM_CURRENT_CD} 1366 var=CDROM_ROOTS_${CDROM_CURRENT_CD}
1345 if [ -z "${!var}" ] ; then 1367 if [[ -z ${!var} ]] ; then
1346 var="CDROM_CHECK_${CDROM_CURRENT_CD}" 1368 var="CDROM_CHECK_${CDROM_CURRENT_CD}"
1347 cdrom_locate_file_on_cd ${!var} 1369 cdrom_locate_file_on_cd ${!var}
1348 else 1370 else
1349 export CDROM_ROOT="${!var}" 1371 export CDROM_ROOT=${!var}
1350 fi 1372 fi
1351 1373
1352 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}" 1374 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1353} 1375}
1354 1376
1358# found, then a message asking for the user to insert the cdrom will be 1380# found, then a message asking for the user to insert the cdrom will be
1359# displayed and we'll hang out here until: 1381# displayed and we'll hang out here until:
1360# (1) the file is found on a mounted cdrom 1382# (1) the file is found on a mounted cdrom
1361# (2) the user hits CTRL+C 1383# (2) the user hits CTRL+C
1362cdrom_locate_file_on_cd() { 1384cdrom_locate_file_on_cd() {
1363 while [ -z "${CDROM_ROOT}" ] ; do 1385 while [[ -z ${CDROM_ROOT} ]] ; do
1364 local dir="$(dirname ${@})" 1386 local dir="$(dirname ${@})"
1365 local file="$(basename ${@})" 1387 local file="$(basename ${@})"
1366 local mline="" 1388 local mline=""
1367 local showedmsg=0 1389 local showedmsg=0
1368 1390
1369 for mline in `mount | egrep -e '(iso|cdrom)' | awk '{print $3}'` ; do 1391 for mline in $(mount | egrep -e '(iso|cdrom)' | awk '{print $3}') ; do
1370 [ -d "${mline}/${dir}" ] || continue 1392 [[ -d ${mline}/${dir} ]] || continue
1371 [ ! -z "$(find ${mline}/${dir} -iname ${file} -maxdepth 1)" ] \ 1393 [[ ! -z $(find ${mline}/${dir} -iname ${file} -maxdepth 1) ]] \
1372 && export CDROM_ROOT=${mline} 1394 && export CDROM_ROOT=${mline}
1373 done 1395 done
1374 1396
1375 if [ -z "${CDROM_ROOT}" ] ; then 1397 if [[ -z ${CDROM_ROOT} ]] ; then
1376 echo 1398 echo
1377 if [ ${showedmsg} -eq 0 ] ; then 1399 if [[ ${showedmsg} -eq 0 ]] ; then
1378 if [ ${CDROM_TOTAL_CDS} -eq 1 ] ; then 1400 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then
1379 if [ -z "${CDROM_NAME}" ] ; then 1401 if [[ -z ${CDROM_NAME} ]] ; then
1380 einfo "Please insert the cdrom for ${PN} now !" 1402 einfo "Please insert the cdrom for ${PN} now !"
1381 else 1403 else
1382 einfo "Please insert the ${CDROM_NAME} cdrom now !" 1404 einfo "Please insert the ${CDROM_NAME} cdrom now !"
1383 fi 1405 fi
1384 else 1406 else
1385 if [ -z "${CDROM_NAME_1}" ] ; then 1407 if [[ -z ${CDROM_NAME_1} ]] ; then
1386 einfo "Please insert cd #${CDROM_CURRENT_CD} for ${PN} now !" 1408 einfo "Please insert cd #${CDROM_CURRENT_CD} for ${PN} now !"
1387 else 1409 else
1388 local var="CDROM_NAME_${CDROM_CURRENT_CD}" 1410 local var="CDROM_NAME_${CDROM_CURRENT_CD}"
1389 einfo "Please insert+mount the ${!var} cdrom now !" 1411 einfo "Please insert+mount the ${!var} cdrom now !"
1390 fi 1412 fi
1509 touch ${D}${LIB} 1531 touch ${D}${LIB}
1510 fi 1532 fi
1511} 1533}
1512 1534
1513preserve_old_lib_notify() { 1535preserve_old_lib_notify() {
1514 LIB=$1 1536 LIB=$1
1515 1537
1516 if [ -n "${LIB}" -a -f "${ROOT}${LIB}" ]; then 1538 if [ -n "${LIB}" -a -f "${ROOT}${LIB}" ]; then
1517 SONAME=`basename ${LIB}` 1539 SONAME=`basename ${LIB}`
1518 1540
1519 einfo "An old version of an installed library was detected on your system." 1541 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" 1542 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," 1543 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:" 1544 einfo "you will need to execute the following command:"
1523 einfo " revdep-rebuild --soname ${SONAME}" 1545 einfo " revdep-rebuild --soname ${SONAME}"
1524 einfo 1546 einfo
1525 einfo "After doing that, you can safely remove ${LIB}" 1547 einfo "After doing that, you can safely remove ${LIB}"
1526 einfo "Note: 'emerge gentoolkit' to get revdep-rebuild" 1548 einfo "Note: 'emerge gentoolkit' to get revdep-rebuild"
1527 fi 1549 fi
1528} 1550}
1529 1551
1530# Hack for people to figure out if a package was built with 1552# Hack for people to figure out if a package was built with
1531# certain USE flags 1553# certain USE flags
1532# 1554#
1533# Usage: built_with_use <DEPEND ATOM> <List of USE flags> 1555# Usage: built_with_use [-a|-o] <DEPEND ATOM> <List of USE flags>
1534# ex: built_with_use xchat gtk2 1556# ex: built_with_use xchat gtk2
1557#
1558# Flags: -a all USE flags should be utilized
1559# -o at least one USE flag should be utilized
1560# Note: the default flag is '-a'
1535built_with_use() { 1561built_with_use() {
1562 local opt=$1
1563 [[ ${opt:0:1} = "-" ]] && shift || opt="-a"
1564
1536 local PKG=$(portageq best_version ${ROOT} $1) 1565 local PKG=$(best_version $1)
1566 shift
1567
1537 local USEFILE="${ROOT}/var/db/pkg/${PKG}/USE" 1568 local USEFILE="${ROOT}/var/db/pkg/${PKG}/USE"
1538 [[ ! -e ${USEFILE} ]] && return 1 1569 [[ ! -e ${USEFILE} ]] && return 1
1539 1570
1540 local USE_BUILT=$(<${USEFILE}) 1571 local USE_BUILT=$(<${USEFILE})
1541
1542 shift
1543 while [ $# -gt 0 ] ; do 1572 while [[ $# -gt 0 ]] ; do
1573 if [[ ${opt} = "-o" ]] ; then
1574 has $1 ${USE_BUILT} && return 0
1575 else
1544 has $1 ${USE_BUILT} || return 1 1576 has $1 ${USE_BUILT} || return 1
1577 fi
1545 shift 1578 shift
1546 done 1579 done
1547 return 0 1580 [[ ${opt} = "-a" ]]
1548} 1581}
1549 1582
1550# Many configure scripts wrongly bail when a C++ compiler 1583# Many configure scripts wrongly bail when a C++ compiler
1551# could not be detected. #73450 1584# could not be detected. #73450
1552epunt_cxx() { 1585epunt_cxx() {
1558 patch -p0 "${f}" "${PORTDIR}/eclass/ELT-patches/nocxx/nocxx.patch" > /dev/null 1591 patch -p0 "${f}" "${PORTDIR}/eclass/ELT-patches/nocxx/nocxx.patch" > /dev/null
1559 done 1592 done
1560 eend 0 1593 eend 0
1561} 1594}
1562 1595
1596# This function simply returns the desired lib directory. With portage
1597# 2.0.51, we now have support for installing libraries to lib32/lib64
1598# to accomidate the needs of multilib systems. It's no longer a good idea
1599# to assume all libraries will end up in lib. Replace any (sane) instances
1600# where lib is named directly with $(get_libdir) if possible.
1601#
1602# Travis Tilley <lv@gentoo.org> (24 Aug 2004)
1603#
1604# Jeremy Huddleston <eradicator@gentoo.org> (23 Dec 2004):
1605# Added support for ${ABI} and ${DEFAULT_ABI}. If they're both not set,
1606# fall back on old behavior. Any profile that has these set should also
1607# depend on a newer version of portage (not yet released) which uses these
1608# over CONF_LIBDIR in econf, dolib, etc...
1609get_libdir() {
1610 LIBDIR_TEST=$(type econf)
1611 if [ ! -z "${CONF_LIBDIR_OVERRIDE}" ] ; then
1612 # if there is an override, we want to use that... always.
1613 CONF_LIBDIR="${CONF_LIBDIR_OVERRIDE}"
1614 # We don't need to know the verison of portage. We only need to know
1615 # if there is support for CONF_LIBDIR in econf and co.
1616 # Danny van Dyk <kugelfang@gentoo.org> 2004/17/09
1617 #elif portageq has_version / '<sys-apps/portage-2.0.51_pre20' ; then
1618 # # and if there isnt an override, and we're using a version of
1619 # # portage without CONF_LIBDIR support, force the use of lib. dolib
1620 # # and friends from portage 2.0.50 wont be too happy otherwise.
1621 # CONF_LIBDIR="lib"
1622 #fi
1623 elif [ -n "$(get_abi_LIBDIR)" ]; then # Using eradicator's LIBDIR_<abi> approach...
1624 CONF_LIBDIR="$(get_abi_LIBDIR)"
1625 elif [ "${LIBDIR_TEST/CONF_LIBDIR}" == "${LIBDIR_TEST}" ]; then # we don't have CONF_LIBDIR support
1626 # will be <portage-2.0.51_pre20
1627 CONF_LIBDIR="lib"
1628 fi
1629 # and of course, default to lib if CONF_LIBDIR isnt set
1630 echo ${CONF_LIBDIR:=lib}
1631 unset LIBDIR_TEST
1632}
1633
1634get_multilibdir() {
1635 if [ -n "$(get_abi_LIBDIR)" ]; then
1636 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"
1637 exit 1
1638 fi
1639 echo ${CONF_MULTILIBDIR:=lib32}
1640}
1641
1642# Sometimes you need to override the value returned by get_libdir. A good
1643# example of this is xorg-x11, where lib32 isnt a supported configuration,
1644# and where lib64 -must- be used on amd64 (for applications that need lib
1645# to be 32bit, such as adobe acrobat). Note that this override also bypasses
1646# portage version sanity checking.
1647# get_libdir_override expects one argument, the result get_libdir should
1648# return:
1649#
1650# get_libdir_override lib64
1651#
1652# Travis Tilley <lv@gentoo.org> (31 Aug 2004)
1653get_libdir_override() {
1654 if [ -n "$(get_abi_LIBDIR)" ]; then
1655 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"
1656 exit 1
1657 fi
1658 CONF_LIBDIR="$1"
1659 CONF_LIBDIR_OVERRIDE="$1"
1660}
1661
1563# get_abi_var <VAR> [<ABI>] 1662# get_abi_var <VAR> [<ABI>]
1564# returns the value of ${<VAR>_<ABI>} which should be set in make.defaults 1663# returns the value of ${<VAR>_<ABI>} which should be set in make.defaults
1565# 1664#
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: 1665# ex:
1571# CFLAGS=$(get_abi_var CFLAGS sparc32) # CFLAGS=-m32 1666# CFLAGS=$(get_abi_var CFLAGS sparc32) # CFLAGS=-m32
1572# 1667#
1573# Note that the prefered method is to set CC="$(tc-getCC) $(get_abi_CFLAGS)" 1668# Note that the prefered method is to set CC="$(tc-getCC) $(get_abi_CFLAGS)"
1574# This will hopefully be added to portage soon... 1669# This will hopefully be added to portage soon...
1577# If <ABI> is not specified and ${ABI} is not defined, ${DEFAULT_ABI} is used. 1672# If <ABI> is not specified and ${ABI} is not defined, ${DEFAULT_ABI} is used.
1578# If <ABI> is not specified and ${ABI} and ${DEFAULT_ABI} are not defined, we return an empty string. 1673# If <ABI> is not specified and ${ABI} and ${DEFAULT_ABI} are not defined, we return an empty string.
1579# 1674#
1580# Jeremy Huddleston <eradicator@gentoo.org> 1675# Jeremy Huddleston <eradicator@gentoo.org>
1581get_abi_var() { 1676get_abi_var() {
1582 local flag=$1 1677 local flag=${1}
1583 local abi 1678 local abi
1584 if [ $# -gt 1 ]; then 1679 if [ $# -gt 1 ]; then
1585 abi=$1 1680 abi=${2}
1586 elif [ -n "${ABI}" ]; then 1681 elif [ -n "${ABI}" ]; then
1587 abi=${ABI} 1682 abi=${ABI}
1588 elif [ -n "${DEFAULT_ABI}" ]; then 1683 elif [ -n "${DEFAULT_ABI}" ]; then
1589 abi=${DEFAULT_ABI} 1684 abi=${DEFAULT_ABI}
1590 else 1685 else
1591 return "" 1686 return 1
1592 fi 1687 fi
1593 eval echo \${${flag}_${abi}}
1594}
1595 1688
1689 local var="${flag}_${abi}"
1690 echo ${!var}
1691}
1692
1596get_abi_CFLAGS() { get_abi_var CFLAGS $1; } 1693get_abi_CFLAGS() { get_abi_var CFLAGS ${@}; }
1597get_abi_CXXFLAGS() { get_abi_var CXXFLAGS $1; } 1694get_abi_CXXFLAGS() { get_abi_var CXXFLAGS ${@}; }
1598get_abi_ASFLAGS() { get_abi_var ASFLAGS $1; } 1695get_abi_ASFLAGS() { get_abi_var ASFLAGS ${@}; }
1599get_abi_LIBDIR() { get_abi_var LIBDIR $1; } 1696get_abi_LIBDIR() { get_abi_var LIBDIR ${@}; }
1600 1697
1698# get_all_libdir()
1699# Returns a list of all the libdirs used by this profile
1700get_all_libdirs() {
1701 local libdirs
1702 if [ -n "${MULTILIB_ABIS}" ]; then
1703 for abi in ${MULTILIB_ABIS}; do
1704 libdirs="${libdirs} $(get_abi_LIBDIR ${abi})"
1705 done
1706 libdirs="${libdirs:1}"
1707 elif [ -n "${CONF_LIBDIR}" ]; then
1708 libdirs="${CONF_LIBDIR} ${CONF_MULTILIBDIR:=lib32}"
1709 else
1710 libdirs="lib"
1711 fi
1712
1713 echo "${libdirs}"
1714}

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

  ViewVC Help
Powered by ViewVC 1.1.20