diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2004-07-28 04:36:05 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2004-07-28 04:36:05 +0000 |
| commit | 0611ff352cc232be20c98a511bf51fbf93cf0a1a (patch) | |
| tree | 497750a1004fe26c01d1367d2f5bf1bdcdb95589 /dev-libs | |
| parent | gnuconfig loving (diff) | |
| download | historical-0611ff352cc232be20c98a511bf51fbf93cf0a1a.tar.gz historical-0611ff352cc232be20c98a511bf51fbf93cf0a1a.tar.bz2 historical-0611ff352cc232be20c98a511bf51fbf93cf0a1a.zip | |
better SYS_LIBC detection
Diffstat (limited to 'dev-libs')
| -rw-r--r-- | dev-libs/uclibc/Manifest | 8 | ||||
| -rw-r--r-- | dev-libs/uclibc/uclibc-0.9.26-r3.ebuild | 14 |
2 files changed, 9 insertions, 13 deletions
diff --git a/dev-libs/uclibc/Manifest b/dev-libs/uclibc/Manifest index 006e733dad1b..9cf7db67c336 100644 --- a/dev-libs/uclibc/Manifest +++ b/dev-libs/uclibc/Manifest @@ -6,7 +6,7 @@ MD5 f694d40cf09e6c5511ae52f755a5ffe5 metadata.xml 998 MD5 7fde305dfd21aeac12e0eb721e0f6a17 uclibc-0.9.21.ebuild 1096 MD5 648448f5b143b6002812f0fb0a78c683 uclibc-0.9.26-r1.ebuild 2555 MD5 ebf20118b3d6ced339721338685d97b0 uclibc-0.9.26-r2.ebuild 6191 -MD5 abe9787784f8e59a92920282b06428bf uclibc-0.9.26-r3.ebuild 6465 +MD5 cd337e4466963e5aa74864363e61aca7 uclibc-0.9.26-r3.ebuild 6333 MD5 d16f404e56abc9f0ab5c372b88a6905d files/Makefile-cp-order-fix.patch 897 MD5 799adc7fb6ec9ffd653831cea1d32dd5 files/digest-uclibc-0.9.21 67 MD5 02ffb023d5b3be46c7e0c9aadf48d304 files/digest-uclibc-0.9.26-r2 231 @@ -27,7 +27,7 @@ MD5 f7c264d37687f1a32f1c6e31239f2276 files/0.9.26/uclibc-0.9.26-noexecstack.patc -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.9.8 (GNU/Linux) -iD8DBQFBApbNHTu7gpaalycRArxgAJ9tJoOPK4Eisx2REfLzoBGhgsIGJQCfXaBs -VKIhAVGDuC4teKyZINQd2Hw= -=Ygsm +iD8DBQFBBy0/HTu7gpaalycRAuahAJ9yg1IqzQIuPRx2rxfbJablbOxAkgCg8A+m +kEi+3XxgBoO/D3VGlrXiAZ4= +=kFgy -----END PGP SIGNATURE----- diff --git a/dev-libs/uclibc/uclibc-0.9.26-r3.ebuild b/dev-libs/uclibc/uclibc-0.9.26-r3.ebuild index ea79f05a8ca2..6bb8b0d82939 100644 --- a/dev-libs/uclibc/uclibc-0.9.26-r3.ebuild +++ b/dev-libs/uclibc/uclibc-0.9.26-r3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/uclibc/uclibc-0.9.26-r3.ebuild,v 1.5 2004/07/24 17:05:10 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/uclibc/uclibc-0.9.26-r3.ebuild,v 1.6 2004/07/28 04:36:05 vapier Exp $ inherit eutils flag-o-matic gcc @@ -24,16 +24,12 @@ PROVIDE="virtual/glibc virtual/libc" S=${WORKDIR}/${MY_P} check_main_libc() { - if [ -f ${ROOT}/lib/libuClibc-*.so -a ! -f ${ROOT}/lib/libc.so.6 ] ; then - if echo "${CHOST}" | grep -q uclibc ; then - retval=0 - else - retval=1 - fi + if "${CHOST/uclibc}" != "${CHOST}" ; then + SYS_LIBC=uClibc else - retval=1 + SYS_LIBC=glibc fi - [ "${retval}" = "0" ] && SYS_LIBC=uClibc || SYS_LIBC=glibc + export SYS_LIBC echo einfo "We are building for ${SYS_LIBC} system library" echo |