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

Diff of /eclass/eutils.eclass

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

Revision 1.119 Revision 1.128
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.119 2004/10/14 22:44:18 vapier Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.128 2004/12/23 09:20:45 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.
… …
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
… …
577# Joe Jezak <josejx@gmail.com> and usata@gentoo.org 588# Joe Jezak <josejx@gmail.com> and usata@gentoo.org
578# FBSD stuff: Aaron Walker <ka0ttic@gentoo.org> 589# FBSD stuff: Aaron Walker <ka0ttic@gentoo.org>
579# 590#
580# egetent(database, key) 591# egetent(database, key)
581egetent() { 592egetent() {
582 if useq macos || useq ppc-macos ; then 593 if useq ppc-macos ; then
583 case "$2" in 594 case "$2" in
584 *[!0-9]*) # Non numeric 595 *[!0-9]*) # Non numeric
585 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }" 596 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }"
586 ;; 597 ;;
587 *) # Numeric 598 *) # Numeric
… …
734 745
735 # handle extra and add the user 746 # handle extra and add the user
736 local eextra="$@" 747 local eextra="$@"
737 local oldsandbox="${SANDBOX_ON}" 748 local oldsandbox="${SANDBOX_ON}"
738 export SANDBOX_ON="0" 749 export SANDBOX_ON="0"
739 if useq macos || useq ppc-macos ; 750 if useq ppc-macos
740 then 751 then
741 ### Make the user 752 ### Make the user
742 if [ -z "${eextra}" ] 753 if [ -z "${eextra}" ]
743 then 754 then
744 dscl . create /users/${euser} uid ${euid} 755 dscl . create /users/${euser} uid ${euid}
… …
827 then 838 then
828 if [ "${egid}" -gt 0 ] 839 if [ "${egid}" -gt 0 ]
829 then 840 then
830 if [ -z "`egetent group ${egid}`" ] 841 if [ -z "`egetent group ${egid}`" ]
831 then 842 then
832 if useq macos || useq ppc-macos ; then 843 if useq ppc-macos ; then
833 opts="${opts} ${egid}" 844 opts="${opts} ${egid}"
834 else 845 else
835 opts="${opts} -g ${egid}" 846 opts="${opts} -g ${egid}"
836 fi 847 fi
837 else 848 else
… …
851 opts="${opts} ${eextra}" 862 opts="${opts} ${eextra}"
852 863
853 # add the group 864 # add the group
854 local oldsandbox="${SANDBOX_ON}" 865 local oldsandbox="${SANDBOX_ON}"
855 export SANDBOX_ON="0" 866 export SANDBOX_ON="0"
856 if useq macos || useq ppc-macos ; 867 if useq ppc-macos ; then
857 then
858 if [ ! -z "${eextra}" ]; 868 if [ ! -z "${eextra}" ];
859 then 869 then
860 einfo "Extra options are not supported on macos yet" 870 einfo "Extra options are not supported on macos yet"
861 einfo "Please report the ebuild along with the info below" 871 einfo "Please report the ebuild along with the info below"
862 einfo "eextra: ${eextra}" 872 einfo "eextra: ${eextra}"
… …
887} 897}
888 898
889# Simple script to replace 'dos2unix' binaries 899# Simple script to replace 'dos2unix' binaries
890# vapier@gentoo.org 900# vapier@gentoo.org
891# 901#
892# edos2unix(file, <more files>...) 902# edos2unix(file, <more files> ...)
893edos2unix() { 903edos2unix() {
894 for f in "$@" 904 for f in "$@"
895 do 905 do
896 cp "${f}" ${T}/edos2unix 906 cp "${f}" ${T}/edos2unix
897 sed 's/\r$//' ${T}/edos2unix > "${f}" 907 sed 's/\r$//' ${T}/edos2unix > "${f}"
… …
1428 1438
1429 ls=" ${ls} " 1439 ls=" ${ls} "
1430 newls="" 1440 newls=""
1431 for f in ${LINGUAS} ; do 1441 for f in ${LINGUAS} ; do
1432 if [ "${ls/ ${f} /}" != "${ls}" ] ; then 1442 if [ "${ls/ ${f} /}" != "${ls}" ] ; then
1433 nl="${newls} ${f}" 1443 newls="${newls} ${f}"
1434 else 1444 else
1435 ewarn "Sorry, but ${PN} does not support the ${f} LINGUA" 1445 ewarn "Sorry, but ${PN} does not support the ${f} LINGUA"
1436 fi 1446 fi
1437 done 1447 done
1438 if [ -z "${newls}" ] ; then 1448 if [ -z "${newls}" ] ; then
… …
1514 einfo 1524 einfo
1515 einfo "After doing that, you can safely remove ${LIB}" 1525 einfo "After doing that, you can safely remove ${LIB}"
1516 einfo "Note: 'emerge gentoolkit' to get revdep-rebuild" 1526 einfo "Note: 'emerge gentoolkit' to get revdep-rebuild"
1517 fi 1527 fi
1518} 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 <DEPEND ATOM> <List of USE flags>
1534# ex: built_with_use xchat gtk2
1535built_with_use() {
1536 local PKG=$(portageq best_version ${ROOT} $1)
1537 local USEFILE="${ROOT}/var/db/pkg/${PKG}/USE"
1538 [[ ! -e ${USEFILE} ]] && return 1
1539
1540 local USE_BUILT=$(<${USEFILE})
1541
1542 shift
1543 while [ $# -gt 0 ] ; do
1544 has $1 ${USE_BUILT} || return 1
1545 shift
1546 done
1547 return 0
1548}
1549
1550# Many configure scripts wrongly bail when a C++ compiler
1551# could not be detected. #73450
1552epunt_cxx() {
1553 local dir=$1
1554 [[ -z ${dir} ]] && dir=${S}
1555 ebegin "Removing useless C++ checks"
1556 local f
1557 for f in $(find ${dir} -name configure) ; do
1558 patch -p0 "${f}" "${PORTDIR}/eclass/ELT-patches/nocxx/nocxx.patch" > /dev/null
1559 done
1560 eend 0
1561}
1562
1563# get_abi_var <VAR> [<ABI>]
1564# returns the value of ${<VAR>_<ABI>} which should be set in make.defaults
1565#
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:
1571# CFLAGS=$(get_abi_var CFLAGS sparc32) # CFLAGS=-m32
1572#
1573# Note that the prefered method is to set CC="$(tc-getCC) $(get_abi_CFLAGS)"
1574# This will hopefully be added to portage soon...
1575#
1576# If <ABI> is not specified, ${ABI} is used.
1577# 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.
1579#
1580# Jeremy Huddleston <eradicator@gentoo.org>
1581get_abi_var() {
1582 local flag=$1
1583 local abi
1584 if [ $# -gt 1 ]; then
1585 abi=$1
1586 elif [ -n "${ABI}" ]; then
1587 abi=${ABI}
1588 elif [ -n "${DEFAULT_ABI}" ]; then
1589 abi=${DEFAULT_ABI}
1590 else
1591 return ""
1592 fi
1593 eval echo \${${flag}_${abi}}
1594}
1595
1596get_abi_CFLAGS() { get_abi_var CFLAGS $1; }
1597get_abi_CXXFLAGS() { get_abi_var CXXFLAGS $1; }
1598get_abi_ASFLAGS() { get_abi_var ASFLAGS $1; }
1599get_abi_LIBDIR() { get_abi_var LIBDIR $1; }
1600
Legend:
Removed from v.1.119  
changed lines
  Added in v.1.128
  ViewVC Help
Powered by ViewVC 1.1.13