diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2006-10-19 23:26:41 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2006-10-19 23:26:41 +0000 |
| commit | d6fd40ab712570a81b714479415d4bac396b9cb4 (patch) | |
| tree | edcac036360302198c8d9ead9aa4b70a809c648c /sys-libs | |
| parent | Cleanup (diff) | |
| download | historical-d6fd40ab712570a81b714479415d4bac396b9cb4.tar.gz historical-d6fd40ab712570a81b714479415d4bac396b9cb4.tar.bz2 historical-d6fd40ab712570a81b714479415d4bac396b9cb4.zip | |
let gcc parse the linux version.h rather than trying to sed/grep the value
Package-Manager: portage-2.1.2_pre3-r5
Diffstat (limited to 'sys-libs')
| -rw-r--r-- | sys-libs/glibc/Manifest | 14 | ||||
| -rw-r--r-- | sys-libs/glibc/glibc-2.5.ebuild | 22 |
2 files changed, 14 insertions, 22 deletions
diff --git a/sys-libs/glibc/Manifest b/sys-libs/glibc/Manifest index 154074ea66ae..228c809b0629 100644 --- a/sys-libs/glibc/Manifest +++ b/sys-libs/glibc/Manifest @@ -543,10 +543,10 @@ EBUILD glibc-2.4-r4.ebuild 38951 RMD160 eda3656b0e0ae136dbdc2833eb5fcad9f4ab67d6 MD5 cd19a7966244c0a44cc05ebfc5c58f48 glibc-2.4-r4.ebuild 38951 RMD160 eda3656b0e0ae136dbdc2833eb5fcad9f4ab67d6 glibc-2.4-r4.ebuild 38951 SHA256 3f7bceda1a825ec6d4beddb522149fdfcf5a714cadd475aafad1bbce1b766cad glibc-2.4-r4.ebuild 38951 -EBUILD glibc-2.5.ebuild 37110 RMD160 916936ae3d1adbed2a197ab7f3dc96d92fbffcc0 SHA1 fec1ec03fbc7555fbbf8c58965cad78a4b7aa6ce SHA256 a7ec1ffa9143258ac2fc85ad2f88d35c830eb142b4d3f946f1c45a0da7996ab0 -MD5 27535eab0e03c1b3a532877ec4570b09 glibc-2.5.ebuild 37110 -RMD160 916936ae3d1adbed2a197ab7f3dc96d92fbffcc0 glibc-2.5.ebuild 37110 -SHA256 a7ec1ffa9143258ac2fc85ad2f88d35c830eb142b4d3f946f1c45a0da7996ab0 glibc-2.5.ebuild 37110 +EBUILD glibc-2.5.ebuild 36975 RMD160 b8552a688e89d92df016d67b5d5f481bea7117c9 SHA1 5ec5b8a4fd07550d754f485a355c0bf23be7e53e SHA256 4bdf6d891d5c685de0e5c36ca2d367f0e0f9eae0d5e1979191ccefd05748d476 +MD5 b1355d5970958926d7cdb3147c771472 glibc-2.5.ebuild 36975 +RMD160 b8552a688e89d92df016d67b5d5f481bea7117c9 glibc-2.5.ebuild 36975 +SHA256 4bdf6d891d5c685de0e5c36ca2d367f0e0f9eae0d5e1979191ccefd05748d476 glibc-2.5.ebuild 36975 MISC ChangeLog 96915 RMD160 6638247fbeb52155ee5dbc94718ae509eef29887 SHA1 79c64a8e64c8afe0a6260879bae1295795f4be08 SHA256 be007ed552ea057e8d5307fcaeaf9e831e67be5ab57761d09ac657cf6862dd93 MD5 fcc6d857dd3a8e01a21737de96b7e24a ChangeLog 96915 RMD160 6638247fbeb52155ee5dbc94718ae509eef29887 ChangeLog 96915 @@ -606,7 +606,7 @@ SHA256 293715c9555467bb11443b48ae5c91f1ed175167d4de504cc14bfd3e95d0968c files/di -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.5 (GNU/Linux) -iD8DBQFFOAHlamhnQswr0vIRAsqjAJ9GNDTs8D99kSHjqSJDcqhD/zMrXQCfWtew -2Y0oXjPuA1gOrfhVzuk+fr0= -=xibX +iD8DBQFFOAnPamhnQswr0vIRAuAJAJ9ESqfvpbVCKe/e/AS5YkTUyKvJsACff8JW +apYSf1uLiYuqo2z5imzYRhM= +=S3FI -----END PGP SIGNATURE----- diff --git a/sys-libs/glibc/glibc-2.5.ebuild b/sys-libs/glibc/glibc-2.5.ebuild index 56ac3046b854..78bf631e945c 100644 --- a/sys-libs/glibc/glibc-2.5.ebuild +++ b/sys-libs/glibc/glibc-2.5.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.5.ebuild,v 1.9 2006/10/19 22:52:55 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.5.ebuild,v 1.10 2006/10/19 23:26:41 vapier Exp $ # Here's how the cross-compile logic breaks down ... # CTARGET - machine that will target the binaries @@ -688,20 +688,12 @@ setup_flags() { } check_kheader_version() { - local header="$(alt_build_headers)/linux/version.h" - - [[ -z $1 ]] && return 1 - - if [[ -f ${header} ]] ; then - local version=$(grep 'LINUX_VERSION_CODE' ${header} | \ - sed -e 's:^.*LINUX_VERSION_CODE[[:space:]]*::') - - if [[ ${version} -ge "$1" ]] ; then - return 0 - fi - fi - - return 1 + local version=$( + printf '#include <linux/version.h>\nLINUX_VERSION_CODE\n' | \ + $(tc-getCPP ${CTARGET}) | \ + tail -n 1 + ) + [[ ${version} -ge "$1" ]] } check_nptl_support() { |