From 71bc00c87bba1ce31de0dac6c3b7fd1aee6917fc Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 14 Jul 2018 20:52:04 +0100 Subject: gentoo resync : 14.07.2018 --- sys-libs/glibc/Manifest | 2 +- sys-libs/glibc/glibc-9999.ebuild | 40 +++++++++++++++++++++------------------- 2 files changed, 22 insertions(+), 20 deletions(-) (limited to 'sys-libs/glibc') diff --git a/sys-libs/glibc/Manifest b/sys-libs/glibc/Manifest index 2d32a47d25d5..fb2cbef2a9c3 100644 --- a/sys-libs/glibc/Manifest +++ b/sys-libs/glibc/Manifest @@ -46,5 +46,5 @@ EBUILD glibc-2.25-r11.ebuild 4975 BLAKE2B cef32f5d160644845e7cf45a9dd4c8cef1dcff EBUILD glibc-2.26-r7.ebuild 25619 BLAKE2B 46b2940a19af94728e94544243f12f0ae6eb2c4d7c0b82b9406ef0d4bfe3bd948f60ad605e01a092f6837f29b6ada840f8c70d0fb5adff4ba649ec2b49c52ee0 SHA512 7b6c0c2f844d782267de387e74ea74410b10ceccb6253c3906a7ca93b0fa69e85aff51ae6657a5933c771ab87516db1547c93648963ea7489008776d74265e73 EBUILD glibc-2.27-r4.ebuild 41434 BLAKE2B ad24af35925a429c5680824554f9b388fec11f574ec6be63a327aaca485a3d80c2656d29c25c6562634580ef1f22022fb748c794d8e1b7482cef404f4f7d1e4d SHA512 58b98614032c0a7c383a833dffdb93862b30c1e19dff8d0d62c4363c5f4d18ce7edc5b481ad5ee58d12511b682c962ed8db4e411a68d069dbf340f9a23f1a268 EBUILD glibc-2.27-r5.ebuild 41596 BLAKE2B adbdb3342101e38e4889f63fffab3ac76ac1e0356017281a036d699f937939e3a5686a6ab83c52e313b43af3043f50f0e3abd953d36800bf564f4d71c0b8cdc8 SHA512 fe028a242b7efe5847b00d35be9883385fd42565277d3bd193c7cc6813f5b3f9ad509ed724669ead8d8db55c0a7d6174862c9c6287761c18586f0f4939e56979 -EBUILD glibc-9999.ebuild 41675 BLAKE2B 0a29bde72aa5a1005cb53327ffcd9b0f562014bfbacf43d33274becda680733bf169126ef83d1b6837b4909c5a07f7a78facc08fc20994e0b1e7c53c758bdd26 SHA512 923aa805b438b3c105338cfabed3a6a50ae1451d920b1bf920db21a07c39eeb0895bf48fc30b2d2f1dc270b1b4d295d5442bbd7defc3e206eceed336a8140b59 +EBUILD glibc-9999.ebuild 41740 BLAKE2B 16a6bd98fc191faedbafc30bdbe19d3cd39a065d0f10129fdeffc7799bc28751a7deabb5024d09ab250e5648fe77f7d48bf77eff66e81191edee59d4df86b719 SHA512 e066a346324f5c7984e0e1c4905072725e636c94326d1bbfdc5d0f2d19d7df488ada4155f438c95653ed7d78749de96becef0ceb8ac1d10442c8284f2399e3cd MISC metadata.xml 1149 BLAKE2B 653840c6693ac06ed5c45d826f0ac3b0007719883fdaadffb89ce7c87686562ad9e15ccdf5987bb78e616a07f989fdadc7db515b1e53c15af6685de042c2771c SHA512 9ba7c1143839e863347a834bf92d1dcef34ab08c22f962a02bc20068c3acbd58d3c2f6106895b194546c5d656d2720f89609c1e50651bcbdd1dabb3ceb8da997 diff --git a/sys-libs/glibc/glibc-9999.ebuild b/sys-libs/glibc/glibc-9999.ebuild index 8fe8178fbb4c..a0c2c4f3d45e 100644 --- a/sys-libs/glibc/glibc-9999.ebuild +++ b/sys-libs/glibc/glibc-9999.ebuild @@ -684,12 +684,6 @@ sanity_prechecks() { # When we actually have to compile something... if ! just_headers ; then - local run_kv build_kv want_kv - - run_kv=$(g_get_running_KV) - build_kv=$(g_int_to_KV $(get_kheader_version)) - want_kv=${MIN_KERN_VER} - ebegin "Checking gcc for __thread support" if ! eend $(want__thread ; echo $?) ; then echo @@ -698,21 +692,29 @@ sanity_prechecks() { die "No __thread support in gcc!" fi - if ! is_crosscompile && ! tc-is-cross-compiler ; then - # Building fails on an non-supporting kernel - ebegin "Checking running kernel version (${run_kv} >= ${want_kv})" - if ! eend_KV ${run_kv} ${want_kv} ; then - echo - eerror "You need a kernel of at least ${want_kv}!" - die "Kernel version too low!" + if [[ ${CTARGET} == *-linux* ]] ; then + local run_kv build_kv want_kv + + run_kv=$(g_get_running_KV) + build_kv=$(g_int_to_KV $(get_kheader_version)) + want_kv=${MIN_KERN_VER} + + if ! is_crosscompile && ! tc-is-cross-compiler ; then + # Building fails on an non-supporting kernel + ebegin "Checking running kernel version (${run_kv} >= ${want_kv})" + if ! eend_KV ${run_kv} ${want_kv} ; then + echo + eerror "You need a kernel of at least ${want_kv}!" + die "Kernel version too low!" + fi fi - fi - ebegin "Checking linux-headers version (${build_kv} >= ${want_kv})" - if ! eend_KV ${build_kv} ${want_kv} ; then - echo - eerror "You need linux-headers of at least ${want_kv}!" - die "linux-headers version too low!" + ebegin "Checking linux-headers version (${build_kv} >= ${want_kv})" + if ! eend_KV ${build_kv} ${want_kv} ; then + echo + eerror "You need linux-headers of at least ${want_kv}!" + die "linux-headers version too low!" + fi fi fi } -- cgit v1.2.3