diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2009-11-04 16:25:06 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2009-11-04 16:25:06 +0000 |
| commit | 8016033467a72c66b4f86de3acb3eb0e79ba1eb9 (patch) | |
| tree | 73b8525bb0f269bdb54e5a642f2a9b416f08734d /sys-libs/uclibc | |
| parent | x86 stable, bug #214397 (diff) | |
| download | historical-8016033467a72c66b4f86de3acb3eb0e79ba1eb9.tar.gz historical-8016033467a72c66b4f86de3acb3eb0e79ba1eb9.tar.bz2 historical-8016033467a72c66b4f86de3acb3eb0e79ba1eb9.zip | |
Dont try installing ldd/ldconfig utils when shared library support is disabled #291787 by Petric Frank.
Package-Manager: portage-2.2_rc46/cvs/Linux x86_64
Diffstat (limited to 'sys-libs/uclibc')
| -rw-r--r-- | sys-libs/uclibc/ChangeLog | 6 | ||||
| -rw-r--r-- | sys-libs/uclibc/Manifest | 12 | ||||
| -rw-r--r-- | sys-libs/uclibc/uclibc-0.9.30.1-r1.ebuild | 11 |
3 files changed, 20 insertions, 9 deletions
diff --git a/sys-libs/uclibc/ChangeLog b/sys-libs/uclibc/ChangeLog index 653d7626f4d9..dadf719830e8 100644 --- a/sys-libs/uclibc/ChangeLog +++ b/sys-libs/uclibc/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sys-libs/uclibc # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/uclibc/ChangeLog,v 1.54 2009/10/17 21:35:16 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/uclibc/ChangeLog,v 1.55 2009/11/04 16:25:06 vapier Exp $ + + 04 Nov 2009; Mike Frysinger <vapier@gentoo.org> uclibc-0.9.30.1-r1.ebuild: + Dont try installing ldd/ldconfig utils when shared library support is + disabled #291787 by Petric Frank. 17 Oct 2009; Mike Frysinger <vapier@gentoo.org> uclibc-0.9.28.3-r8.ebuild: Stabilize for all #289522 by Ryan Hill. diff --git a/sys-libs/uclibc/Manifest b/sys-libs/uclibc/Manifest index aa2b9b1b5570..b295223fb466 100644 --- a/sys-libs/uclibc/Manifest +++ b/sys-libs/uclibc/Manifest @@ -19,15 +19,15 @@ EBUILD uclibc-0.9.28.3-r3.ebuild 14526 RMD160 fffcd2820419af75eed73352760a5b7b50 EBUILD uclibc-0.9.28.3-r7.ebuild 14524 RMD160 f828bfc251fcf2bf8187596bd4eb3ca9114c6135 SHA1 2bc4a94f76d77f9ec1bc7b7c662f0fdee30348bb SHA256 2a98cf02fea6cd62a6760aeffbeceb7ffb9893538b8ca584ec8f7bae273a262e EBUILD uclibc-0.9.28.3-r8.ebuild 14800 RMD160 78bac5d51a410d591ed9223872d141e77e29e112 SHA1 a93304ba245dc5409bf51238625d1f95bdb9fac2 SHA256 b232043e3833e27fc78aa647340359679c78ef7b3224297467cf51acf2baa64a EBUILD uclibc-0.9.28.3.ebuild 14521 RMD160 4eab80ad54021bfb86a84e0d4e323a34d4e6d204 SHA1 9b5d79dd559466fac8745eed2329778ed5b79870 SHA256 e489569eb02775c9686ccf3fa9e8911bcbee443dc5d62f12672a916b236125cc -EBUILD uclibc-0.9.30.1-r1.ebuild 11484 RMD160 f1a7c03b0bc89b108bc02ae066eb9680acf6da41 SHA1 f975c1ac26e50debb82a53c2b28f045e42656897 SHA256 6a5366eddb2cfe6cd2ebf57015a83b498628a1565e41f0712c43915b70af4f8f +EBUILD uclibc-0.9.30.1-r1.ebuild 11584 RMD160 aa43bcbd6650bc990df6cf2b02e758d7a487815f SHA1 0d49d6d6ba0a6858bb5377a053a750859ecd1326 SHA256 a48916e81d71607a5dc2c6fb4481dec64a7b4dae20505968f62ddf0746698c93 EBUILD uclibc-0.9.30.1.ebuild 11482 RMD160 62fe15e64f295d40b5d7e324acef2f454513e4ff SHA1 c49369ab32e4ca9362897fba6c8c380f184817b5 SHA256 16bcf4cfb962420472fc796692d5e863d8650b6249b8f51a98da99c14e070cad EBUILD uclibc-0.9.30.ebuild 13889 RMD160 97dd88539c3c2e95424e087d8961942404e62d73 SHA1 9514821289579f014d9484e9e6868804b7a13796 SHA256 2d702f9d5a5474b1bce66be60b6a134cc7fc2af1045d88923adf3ab019964554 -MISC ChangeLog 17684 RMD160 12485124d6528bd5d55d57ad583da14b971bd12c SHA1 ec617418da5aa2ab94d3bb4975def5edb639ec97 SHA256 ed874f33e63c95699dc8e443a8a2ef95a30c0613c62fb53fb955cbf15420ef3e +MISC ChangeLog 17870 RMD160 101b7289989a44178d2dd3559fe4005dea21c904 SHA1 4309fd4986608fd810cb69e52fc0f46b8f5c6617 SHA256 ec2c85efb18f72a3be2c25c6acd192f190234bc6cbe33b24c8bcb14996605a40 MISC metadata.xml 1469 RMD160 0c3640cb24a93c003e59cd0f9fd99587881ac63e SHA1 6be5e573878f88438a0121ff49841d52f07dedcd SHA256 e2f9e4727e826e87f735157c170a4e1f5f3ff572a2a2875f6a8889dfa5c648a3 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.11 (GNU/Linux) +Version: GnuPG v2.0.13 (GNU/Linux) -iEYEARECAAYFAkraOJoACgkQlPl3HsVfCDrM3ACfQjuXlauqDschyJUm6+oOx8mK -HpsAnin9GO5bNXPnzInflyi10ajIsn2T -=cbK5 +iEYEARECAAYFAkrxqzMACgkQlPl3HsVfCDqOTwCfSerqOyCzRjIl50zI/ujoIccO +2N0An1OiREIy4L0x/QkeV+c59Kn8U1it +=OcpX -----END PGP SIGNATURE----- diff --git a/sys-libs/uclibc/uclibc-0.9.30.1-r1.ebuild b/sys-libs/uclibc/uclibc-0.9.30.1-r1.ebuild index a4355b6db390..337e70488776 100644 --- a/sys-libs/uclibc/uclibc-0.9.30.1-r1.ebuild +++ b/sys-libs/uclibc/uclibc-0.9.30.1-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/uclibc/uclibc-0.9.30.1-r1.ebuild,v 1.6 2009/09/23 22:07:37 patrick Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/uclibc/uclibc-0.9.30.1-r1.ebuild,v 1.7 2009/11/04 16:25:06 vapier Exp $ #ESVN_REPO_URI="svn://uclibc.org/trunk/uClibc" #inherit subversion @@ -133,6 +133,13 @@ set_opt() { sed -i -e "/^\# $1 is not set/d" -e "/^$1=.*/d" .config echo "$1=$2" >> .config } +get_opt() { + ( + unset $1 + . ${2:-"${S}"/.config} + echo ${!1} + ) +} src_unpack() { [[ -n ${ESVN_REPO_URI} ]] \ @@ -341,7 +348,7 @@ src_install() { # system headers correctly. See gcc/doc/gccinstall.info if [[ ${CTARGET} != ${CHOST} ]] ; then dosym usr/include /usr/${CTARGET}/sys-include - if ! just_headers ; then + if ! just_headers && [[ -n $(get_opt HAVE_SHARED) ]] ; then newbin utils/ldconfig.host ${CTARGET}-ldconfig || die newbin utils/ldd.host ${CTARGET}-ldd || die fi |