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

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

  ViewVC Help
Powered by ViewVC 1.1.20