From: Mike Frysinger Date: Sat, 27 Jan 2007 02:21:17 +0000 (+0000) Subject: Fixup bash style in check_nptl_support so the checks actually work #164007 by Andrew... X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=3f238c3b7e78661b2922139bde5821e4ffa951fa;p=gentoo.git Fixup bash style in check_nptl_support so the checks actually work #164007 by Andrew Gaffney. Package-Manager: portage-2.1.2-r4 --- diff --git a/sys-libs/glibc/ChangeLog b/sys-libs/glibc/ChangeLog index 4fe7fcc23270..116b60b74441 100644 --- a/sys-libs/glibc/ChangeLog +++ b/sys-libs/glibc/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for sys-libs/glibc # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/ChangeLog,v 1.494 2007/01/16 18:04:54 gustavoz Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/ChangeLog,v 1.495 2007/01/27 02:21:17 vapier Exp $ + + 27 Jan 2007; Mike Frysinger glibc-2.3.6-r4.ebuild, + glibc-2.3.6-r5.ebuild, glibc-2.4-r3.ebuild, glibc-2.4-r4.ebuild, + glibc-2.5.ebuild: + Fixup bash style in check_nptl_support so the checks actually work #164007 + by Andrew Gaffney. 16 Jan 2007; Gustavo Zacarias glibc-2.5.ebuild: Give ~sparc keywords diff --git a/sys-libs/glibc/Manifest b/sys-libs/glibc/Manifest index d0bd211c12ea..545f9c5a03f2 100644 --- a/sys-libs/glibc/Manifest +++ b/sys-libs/glibc/Manifest @@ -527,30 +527,30 @@ EBUILD glibc-2.3.6-r3.ebuild 43142 RMD160 e5177acd37982abb941d4fc5490675181c7b06 MD5 5c96fe46ca5a4aa4c583e531e0e76fe8 glibc-2.3.6-r3.ebuild 43142 RMD160 e5177acd37982abb941d4fc5490675181c7b060a glibc-2.3.6-r3.ebuild 43142 SHA256 838946f57810f9f26dbf51f26eeb4182a60a8dd51059e12d5bc12431a101314c glibc-2.3.6-r3.ebuild 43142 -EBUILD glibc-2.3.6-r4.ebuild 37392 RMD160 f27d7ff6404a966c2b73c4711b3e8b6614f2e61e SHA1 f01ef0fa98ff4f587ac4f9b0cce5e368208c90f1 SHA256 c7dccd219ac1e2145185eb5c5905dfb4cd2cb60b69a715646f103bf1a4a831b6 -MD5 021c45d10c8d52d96116633239cc9545 glibc-2.3.6-r4.ebuild 37392 -RMD160 f27d7ff6404a966c2b73c4711b3e8b6614f2e61e glibc-2.3.6-r4.ebuild 37392 -SHA256 c7dccd219ac1e2145185eb5c5905dfb4cd2cb60b69a715646f103bf1a4a831b6 glibc-2.3.6-r4.ebuild 37392 -EBUILD glibc-2.3.6-r5.ebuild 37723 RMD160 2d7a782374265ffffa4efdba74a554a0ea71c1b5 SHA1 b5f3c7399b0b545f4c01f6b69bedb223184e7664 SHA256 b0868a718420933b8da583f4135af716bbad42c7a48e0a9d144d030b9f0f5bdb -MD5 a602a086f0f14a2e236c679f08b728e4 glibc-2.3.6-r5.ebuild 37723 -RMD160 2d7a782374265ffffa4efdba74a554a0ea71c1b5 glibc-2.3.6-r5.ebuild 37723 -SHA256 b0868a718420933b8da583f4135af716bbad42c7a48e0a9d144d030b9f0f5bdb glibc-2.3.6-r5.ebuild 37723 -EBUILD glibc-2.4-r3.ebuild 39370 RMD160 f4416a81f7f6e20f66679b107308091edf00958a SHA1 a93b767c6bacb79f8f9e93cd13786a76b2374d12 SHA256 6a39a922cad1b3f6b331198a8fbea353e7c618747a877c31086770c3d274c94d -MD5 d4b21ddd35ec224dcfa5aefe3b70aec1 glibc-2.4-r3.ebuild 39370 -RMD160 f4416a81f7f6e20f66679b107308091edf00958a glibc-2.4-r3.ebuild 39370 -SHA256 6a39a922cad1b3f6b331198a8fbea353e7c618747a877c31086770c3d274c94d glibc-2.4-r3.ebuild 39370 -EBUILD glibc-2.4-r4.ebuild 39180 RMD160 89c56dc97a1156cb7b25c1b46f703331f2ab02a3 SHA1 02e3766fc900229b7b18b37eccd30f24ad65ac61 SHA256 618ec8557dc5a0a30290cfc378706e5bf81bc0e654622cfc2f1fed0169e9d7fb -MD5 586919bb28b728a4c2ecb7f47df3a3fb glibc-2.4-r4.ebuild 39180 -RMD160 89c56dc97a1156cb7b25c1b46f703331f2ab02a3 glibc-2.4-r4.ebuild 39180 -SHA256 618ec8557dc5a0a30290cfc378706e5bf81bc0e654622cfc2f1fed0169e9d7fb glibc-2.4-r4.ebuild 39180 -EBUILD glibc-2.5.ebuild 37242 RMD160 b792979731ca812f8ace09ba6f1e3a4ed40aea13 SHA1 4fa95fed0fec507af53611017ee563f72f536ea3 SHA256 7081ba4f4f5af70c099077e6ff5a5151624b4692d2ebe0ac48f92bb691f94b6a -MD5 b020ec483f3c9f900a96f1fbccfc3dde glibc-2.5.ebuild 37242 -RMD160 b792979731ca812f8ace09ba6f1e3a4ed40aea13 glibc-2.5.ebuild 37242 -SHA256 7081ba4f4f5af70c099077e6ff5a5151624b4692d2ebe0ac48f92bb691f94b6a glibc-2.5.ebuild 37242 -MISC ChangeLog 97811 RMD160 cdb5bb7345c911844e3af1799e194850669c4420 SHA1 af15f6e26ba600348caff6b3ce207a61cd77ba42 SHA256 724571b57b76de9d18a6922cfddf54a321d8e5ec3610c12d8dbb8ce353b92e9c -MD5 3b5c3396b84a1e917d35ab8ca0223bcb ChangeLog 97811 -RMD160 cdb5bb7345c911844e3af1799e194850669c4420 ChangeLog 97811 -SHA256 724571b57b76de9d18a6922cfddf54a321d8e5ec3610c12d8dbb8ce353b92e9c ChangeLog 97811 +EBUILD glibc-2.3.6-r4.ebuild 37422 RMD160 f76d7439557576600276af4eaadedbe1465fc166 SHA1 9bce3ad13adfdb13fb830dacc81877974ed00630 SHA256 a7358904e19d2b188e0732982862637920f058192e069413cc50bd5bc506f427 +MD5 df7156a2bbf913e61c69ecf85e213df0 glibc-2.3.6-r4.ebuild 37422 +RMD160 f76d7439557576600276af4eaadedbe1465fc166 glibc-2.3.6-r4.ebuild 37422 +SHA256 a7358904e19d2b188e0732982862637920f058192e069413cc50bd5bc506f427 glibc-2.3.6-r4.ebuild 37422 +EBUILD glibc-2.3.6-r5.ebuild 37753 RMD160 9ce108780688927864342e44af19fc58b7a60e1c SHA1 3ca5e86d7f5cc6c206c8843c34a68342b51034fb SHA256 9ee131d40a13f1490cc36791da4708190273b10c2fb86a3f4595209f59787acc +MD5 7b9149cdfa24ffcfffee7bf726d34a47 glibc-2.3.6-r5.ebuild 37753 +RMD160 9ce108780688927864342e44af19fc58b7a60e1c glibc-2.3.6-r5.ebuild 37753 +SHA256 9ee131d40a13f1490cc36791da4708190273b10c2fb86a3f4595209f59787acc glibc-2.3.6-r5.ebuild 37753 +EBUILD glibc-2.4-r3.ebuild 39400 RMD160 447258420c06d9b4f6ce5efd2e0de4409b539e43 SHA1 baf31321aa119adbba4bad07566c277a1693b968 SHA256 8a5b256929fb50b3fbba8bcbf6153891c76705b07b606974f2d5fb069025522a +MD5 3b888101bb4e4af2929500fab4ff58fe glibc-2.4-r3.ebuild 39400 +RMD160 447258420c06d9b4f6ce5efd2e0de4409b539e43 glibc-2.4-r3.ebuild 39400 +SHA256 8a5b256929fb50b3fbba8bcbf6153891c76705b07b606974f2d5fb069025522a glibc-2.4-r3.ebuild 39400 +EBUILD glibc-2.4-r4.ebuild 39210 RMD160 fd782b08e862bd1889b9d6dc73386f6ff43ce676 SHA1 56ee88ee5e6fc8a238a8bad50601329ec1f8d9ea SHA256 d05fc7bf0c6cd701443f61328afb4e80ce6ff6d7d364de346cfdc297ffedc5df +MD5 f7e1022963b4ac00d04110ef57c1a0eb glibc-2.4-r4.ebuild 39210 +RMD160 fd782b08e862bd1889b9d6dc73386f6ff43ce676 glibc-2.4-r4.ebuild 39210 +SHA256 d05fc7bf0c6cd701443f61328afb4e80ce6ff6d7d364de346cfdc297ffedc5df glibc-2.4-r4.ebuild 39210 +EBUILD glibc-2.5.ebuild 37272 RMD160 0636ea399177bfe2afa56e971067ef08e3dc049e SHA1 d13f5f7e8f59b3e1d08b4c63574f535f49e98523 SHA256 9626d70c2811c403d5172f10acfe751c08c87c367154dc0d60e1ba624ee099c4 +MD5 915b2468f10ffbf29eaf816276c3cebc glibc-2.5.ebuild 37272 +RMD160 0636ea399177bfe2afa56e971067ef08e3dc049e glibc-2.5.ebuild 37272 +SHA256 9626d70c2811c403d5172f10acfe751c08c87c367154dc0d60e1ba624ee099c4 glibc-2.5.ebuild 37272 +MISC ChangeLog 98068 RMD160 7d9632b48fc3ee9ce65572e0ee9a632421caf17d SHA1 db9caa5037b02cc7621adff3a0b7157cc444f066 SHA256 5db0447a68aeba3fcb8cd7d88cff4bbb7682ba26c223d3f07ea53231ecb287b2 +MD5 bdc17ca9d074735eeda1da78567c7b0a ChangeLog 98068 +RMD160 7d9632b48fc3ee9ce65572e0ee9a632421caf17d ChangeLog 98068 +SHA256 5db0447a68aeba3fcb8cd7d88cff4bbb7682ba26c223d3f07ea53231ecb287b2 ChangeLog 98068 MISC metadata.xml 162 RMD160 d002486a43522f2116b1d9d59828c484956d66e2 SHA1 d6b4923897f6ae673b4f93646f5b4ba61d5a2c3c SHA256 65a915d44de1f01d4b7f72d313b4192c38374a9835d24988c00c1e73dca5805a MD5 567094e03359ffc1c95af7356395228d metadata.xml 162 RMD160 d002486a43522f2116b1d9d59828c484956d66e2 metadata.xml 162 @@ -606,7 +606,7 @@ SHA256 f65c057f070beb912fdc31c87bdec28342093306c3387f73aa831178e3a8d875 files/di -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.1 (GNU/Linux) -iD8DBQFFsffD8bi6rjpTunYRAhOPAJ417a38QL3WZbjST+2toijJ8PFtYgCfYhBT -NgLvbYMcAy0RsNhvBFt8vHw= -=YuLm +iD8DBQFFurdQ8bi6rjpTunYRAuOnAJ91dFBeTAPhwE8th5/LRa/uvX/nCwCbBsHW +eucoLpSR5TZtcam8cALnA5w= +=0K3o -----END PGP SIGNATURE----- diff --git a/sys-libs/glibc/glibc-2.3.6-r4.ebuild b/sys-libs/glibc/glibc-2.3.6-r4.ebuild index 806a1646b059..c00615860fc8 100644 --- a/sys-libs/glibc/glibc-2.3.6-r4.ebuild +++ b/sys-libs/glibc/glibc-2.3.6-r4.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2006 Gentoo Foundation +# Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.6-r4.ebuild,v 1.32 2006/09/29 23:08:20 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.6-r4.ebuild,v 1.33 2007/01/27 02:21:17 vapier Exp $ # Here's how the cross-compile logic breaks down ... # CTARGET - machine that will target the binaries @@ -720,7 +720,7 @@ check_nptl_support() { echo ebegin "Checking gcc for __thread support" - if ! eend $(want__thread) ; then + if ! eend $(want__thread ; echo $?) ; then echo eerror "Could not find a gcc that supports the __thread directive!" eerror "Please update your binutils/gcc and try again." @@ -730,7 +730,7 @@ check_nptl_support() { if ! is_crosscompile && ! tc-is-cross-compiler ; then # Building fails on an non-supporting kernel ebegin "Checking kernel version (>=${NPTL_KERNEL_VERSION})" - if ! eend $([[ $(get_KV) -ge ${min_kernel_version} ]]) ; then + if ! eend $([[ $(get_KV) -ge ${min_kernel_version} ]] ; echo $?) ; then echo eerror "You need a kernel of at least version ${NPTL_KERNEL_VERSION}" eerror "for NPTL support!" @@ -740,7 +740,7 @@ check_nptl_support() { # Building fails with too low linux-headers ebegin "Checking linux-headers version (>=${NPTL_KERNEL_VERSION})" - if ! eend $(check_kheader_version "${min_kernel_version}") ; then + if ! eend $(check_kheader_version "${min_kernel_version}" ; echo $?) ; then echo eerror "You need linux-headers of at least version ${NPTL_KERNEL_VERSION}" eerror "for NPTL support!" diff --git a/sys-libs/glibc/glibc-2.3.6-r5.ebuild b/sys-libs/glibc/glibc-2.3.6-r5.ebuild index 384e9ec40388..f325e7ad5892 100644 --- a/sys-libs/glibc/glibc-2.3.6-r5.ebuild +++ b/sys-libs/glibc/glibc-2.3.6-r5.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2006 Gentoo Foundation +# Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.6-r5.ebuild,v 1.18 2006/11/26 16:26:33 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.6-r5.ebuild,v 1.19 2007/01/27 02:21:17 vapier Exp $ # Here's how the cross-compile logic breaks down ... # CTARGET - machine that will target the binaries @@ -725,7 +725,7 @@ check_nptl_support() { echo ebegin "Checking gcc for __thread support" - if ! eend $(want__thread) ; then + if ! eend $(want__thread ; echo $?) ; then echo eerror "Could not find a gcc that supports the __thread directive!" eerror "Please update your binutils/gcc and try again." @@ -735,7 +735,7 @@ check_nptl_support() { if ! is_crosscompile && ! tc-is-cross-compiler ; then # Building fails on an non-supporting kernel ebegin "Checking kernel version (>=${NPTL_KERNEL_VERSION})" - if ! eend $([[ $(get_KV) -ge ${min_kernel_version} ]]) ; then + if ! eend $([[ $(get_KV) -ge ${min_kernel_version} ]] ; echo $?) ; then echo eerror "You need a kernel of at least version ${NPTL_KERNEL_VERSION}" eerror "for NPTL support!" @@ -745,7 +745,7 @@ check_nptl_support() { # Building fails with too low linux-headers ebegin "Checking linux-headers version (>=${NPTL_KERNEL_VERSION})" - if ! eend $(check_kheader_version "${min_kernel_version}") ; then + if ! eend $(check_kheader_version "${min_kernel_version}" ; echo $?) ; then echo eerror "You need linux-headers of at least version ${NPTL_KERNEL_VERSION}" eerror "for NPTL support!" diff --git a/sys-libs/glibc/glibc-2.4-r3.ebuild b/sys-libs/glibc/glibc-2.4-r3.ebuild index 52d99d3000be..d3f408443e33 100644 --- a/sys-libs/glibc/glibc-2.4-r3.ebuild +++ b/sys-libs/glibc/glibc-2.4-r3.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2006 Gentoo Foundation +# Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.4-r3.ebuild,v 1.25 2006/09/29 23:08:20 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.4-r3.ebuild,v 1.26 2007/01/27 02:21:17 vapier Exp $ # Here's how the cross-compile logic breaks down ... # CTARGET - machine that will target the binaries @@ -751,7 +751,7 @@ check_nptl_support() { echo ebegin "Checking gcc for __thread support" - if ! eend $(want__thread) ; then + if ! eend $(want__thread ; echo $?) ; then echo eerror "Could not find a gcc that supports the __thread directive!" eerror "Please update your binutils/gcc and try again." @@ -761,7 +761,7 @@ check_nptl_support() { if ! is_crosscompile && ! tc-is-cross-compiler ; then # Building fails on an non-supporting kernel ebegin "Checking kernel version (>=${NPTL_KERNEL_VERSION})" - if ! eend $([[ $(get_KV) -ge ${min_kernel_version} ]]) ; then + if ! eend $([[ $(get_KV) -ge ${min_kernel_version} ]] ; echo $?) ; then echo eerror "You need a kernel of at least version ${NPTL_KERNEL_VERSION}" eerror "for NPTL support!" @@ -771,7 +771,7 @@ check_nptl_support() { # Building fails with too low linux-headers ebegin "Checking linux-headers version (>=${NPTL_KERNEL_VERSION})" - if ! eend $(check_kheader_version "${min_kernel_version}") ; then + if ! eend $(check_kheader_version "${min_kernel_version}" ; echo $?) ; then echo eerror "You need linux-headers of at least version ${NPTL_KERNEL_VERSION}" eerror "for NPTL support!" diff --git a/sys-libs/glibc/glibc-2.4-r4.ebuild b/sys-libs/glibc/glibc-2.4-r4.ebuild index c8a4c6e8b35e..c7cf67b83fd2 100644 --- a/sys-libs/glibc/glibc-2.4-r4.ebuild +++ b/sys-libs/glibc/glibc-2.4-r4.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2006 Gentoo Foundation +# Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.4-r4.ebuild,v 1.15 2006/12/03 06:45:05 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.4-r4.ebuild,v 1.16 2007/01/27 02:21:17 vapier Exp $ # Here's how the cross-compile logic breaks down ... # CTARGET - machine that will target the binaries @@ -733,7 +733,7 @@ check_nptl_support() { echo ebegin "Checking gcc for __thread support" - if ! eend $(want__thread) ; then + if ! eend $(want__thread ; echo $?) ; then echo eerror "Could not find a gcc that supports the __thread directive!" eerror "Please update your binutils/gcc and try again." @@ -743,7 +743,7 @@ check_nptl_support() { if ! is_crosscompile && ! tc-is-cross-compiler ; then # Building fails on an non-supporting kernel ebegin "Checking kernel version (>=${NPTL_KERNEL_VERSION})" - if ! eend $([[ $(get_KV) -ge ${min_kernel_version} ]]) ; then + if ! eend $([[ $(get_KV) -ge ${min_kernel_version} ]] ; echo $?) ; then echo eerror "You need a kernel of at least version ${NPTL_KERNEL_VERSION}" eerror "for NPTL support!" @@ -753,7 +753,7 @@ check_nptl_support() { # Building fails with too low linux-headers ebegin "Checking linux-headers version (>=${NPTL_KERNEL_VERSION})" - if ! eend $(check_kheader_version "${min_kernel_version}") ; then + if ! eend $(check_kheader_version "${min_kernel_version}" ; echo $?) ; then echo eerror "You need linux-headers of at least version ${NPTL_KERNEL_VERSION}" eerror "for NPTL support!" diff --git a/sys-libs/glibc/glibc-2.5.ebuild b/sys-libs/glibc/glibc-2.5.ebuild index 6c6b9761a944..2b3bb371c222 100644 --- a/sys-libs/glibc/glibc-2.5.ebuild +++ b/sys-libs/glibc/glibc-2.5.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 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.21 2007/01/20 11:06:23 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.5.ebuild,v 1.22 2007/01/27 02:21:17 vapier Exp $ # Here's how the cross-compile logic breaks down ... # CTARGET - machine that will target the binaries @@ -706,7 +706,7 @@ check_nptl_support() { echo ebegin "Checking gcc for __thread support" - if ! eend $(want__thread) ; then + if ! eend $(want__thread ; echo $?) ; then echo eerror "Could not find a gcc that supports the __thread directive!" eerror "Please update your binutils/gcc and try again." @@ -716,7 +716,7 @@ check_nptl_support() { if ! is_crosscompile && ! tc-is-cross-compiler ; then # Building fails on an non-supporting kernel ebegin "Checking kernel version (>=${NPTL_KERNEL_VERSION})" - if ! eend $([[ $(get_KV) -ge ${min_kernel_version} ]]) ; then + if ! eend $([[ $(get_KV) -ge ${min_kernel_version} ]] ; echo $?) ; then echo eerror "You need a kernel of at least version ${NPTL_KERNEL_VERSION}" eerror "for NPTL support!" @@ -726,7 +726,7 @@ check_nptl_support() { # Building fails with too low linux-headers ebegin "Checking linux-headers version (>=${NPTL_KERNEL_VERSION})" - if ! eend $(check_kheader_version "${min_kernel_version}") ; then + if ! eend $(check_kheader_version "${min_kernel_version}" ; echo $?) ; then echo eerror "You need linux-headers of at least version ${NPTL_KERNEL_VERSION}" eerror "for NPTL support!"