From 0496e0443110379e852c3eb5691bcd2b377171b0 Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Wed, 16 Nov 2011 16:07:46 +0000 Subject: [PATCH] Convert USE=nptlonly to USE=linuxthreads. Package-Manager: portage-2.2.0_alpha74/cvs/Linux x86_64 --- sys-libs/glibc/ChangeLog | 10 ++++- sys-libs/glibc/Manifest | 38 +++++++++---------- sys-libs/glibc/files/eblits/common.eblit | 6 +-- sys-libs/glibc/files/eblits/pkg_preinst.eblit | 11 +----- sys-libs/glibc/files/eblits/pkg_setup.eblit | 9 +---- sys-libs/glibc/files/eblits/src_install.eblit | 4 +- sys-libs/glibc/glibc-2.10.1-r1.ebuild | 4 +- sys-libs/glibc/glibc-2.11.3.ebuild | 4 +- sys-libs/glibc/glibc-2.12.1-r3.ebuild | 4 +- sys-libs/glibc/glibc-2.12.2.ebuild | 4 +- sys-libs/glibc/glibc-2.13-r2.ebuild | 4 +- sys-libs/glibc/glibc-2.13-r4.ebuild | 4 +- sys-libs/glibc/glibc-2.14.1.ebuild | 4 +- sys-libs/glibc/glibc-2.14.ebuild | 4 +- sys-libs/glibc/glibc-2.9_p20081201-r3.ebuild | 4 +- sys-libs/glibc/glibc-9999.ebuild | 4 +- sys-libs/glibc/metadata.xml | 5 +-- 17 files changed, 57 insertions(+), 66 deletions(-) diff --git a/sys-libs/glibc/ChangeLog b/sys-libs/glibc/ChangeLog index c76eb972b257..df73c4aed405 100644 --- a/sys-libs/glibc/ChangeLog +++ b/sys-libs/glibc/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for sys-libs/glibc # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/ChangeLog,v 1.793 2011/11/07 23:11:18 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/ChangeLog,v 1.794 2011/11/16 16:07:46 vapier Exp $ + + 16 Nov 2011; Mike Frysinger + glibc-2.9_p20081201-r3.ebuild, glibc-2.10.1-r1.ebuild, glibc-2.11.3.ebuild, + glibc-2.12.1-r3.ebuild, glibc-2.12.2.ebuild, glibc-2.13-r2.ebuild, + glibc-2.13-r4.ebuild, glibc-2.14.ebuild, glibc-2.14.1.ebuild, + glibc-9999.ebuild, files/eblits/common.eblit, files/eblits/pkg_preinst.eblit, + files/eblits/pkg_setup.eblit, files/eblits/src_install.eblit, metadata.xml: + Convert USE=nptlonly to USE=linuxthreads. *glibc-2.14.1 (08 Nov 2011) diff --git a/sys-libs/glibc/Manifest b/sys-libs/glibc/Manifest index 439d5b849082..9de58c5aa83c 100644 --- a/sys-libs/glibc/Manifest +++ b/sys-libs/glibc/Manifest @@ -15,12 +15,12 @@ AUX 2.5/glibc-2.5-hardened-pie.patch 1569 RMD160 8746aeb9f9c68ca153d93cf92c9df93 AUX 2.6/glibc-2.6-gentoo-stack_chk_fail.c 9545 RMD160 9a21c9deb6ebca5d2245e3bb50b53ce035967a5f SHA1 11ad52117fa55bbe51b429043df49767c7f58de0 SHA256 1410ded812be80d452eada5f9d6b9bd7bdb504c14f01cc27dce3e36b6f92b92a AUX 2.6/glibc-2.6-hardened-inittls-nosysenter.patch 8674 RMD160 f4e7df0cb25292afc13e18332569d2ca288fdf92 SHA1 7f34ef26d6607321e0ec5ad0f389cb1aedf5e0da SHA256 cf58ded8fbe9fcb3dc094521feec2588c1520ff2c632b20c69d6a210325c4fcf AUX 2.7/glibc-2.7-hardened-inittls-nosysenter.patch 8755 RMD160 b674894f3b16f63193bb8040f8a5657dce82e1f9 SHA1 79fb3a4454b85af70dac95dd79134be3fe3a9201 SHA256 b0b1bf0746f7160b89cf281502b95c38dec9cb948d6a50a907b84fd6230a2dc3 -AUX eblits/common.eblit 9254 RMD160 2cd1b2fc996b59fff7533f94b43754a841236e8a SHA1 1973cd8da8cdd3a600a574332577c0ca8d36b1d3 SHA256 c85b74eb907e7f82b49455fa9c421abccfe93bdcf995627e30e6c2e678ac3436 +AUX eblits/common.eblit 9211 RMD160 5f3e02db1636eed143fdc5e5c6f3f271c299aea7 SHA1 c427bae5c94cb2931254535988bfdf6760259beb SHA256 c8fdc3a6856310ad6e52710260fa512c62148e60508662f66b16d0913c45ed9b AUX eblits/pkg_postinst.eblit 1159 RMD160 4b99846819bf0471d1104a8a17dd260796644f9d SHA1 4a2980fede3edebc7960d40db7cf935c7c854859 SHA256 76c403cf5c77a3a3bb7441566335f0c8da2584eaa21f05ab400e7bb00f9db810 -AUX eblits/pkg_preinst.eblit 3764 RMD160 f9a9d43e2d2d8df073be7e1b66655e651cb10740 SHA1 b987e2802201e0f44c357ffc7b92da4aa77cf377 SHA256 41baa253ea529156d628108247545235c4ec377b184e7824bd790eba1361299e -AUX eblits/pkg_setup.eblit 3318 RMD160 4a38e5f9a385d9134b54ab27a654e9a83eeb9258 SHA1 85341ef8fbf37e3270719cc940d26fd6f1168d6b SHA256 ca79f36240221519e460b8ff08e8453d624731991c3efc27d45068d8c15b756e +AUX eblits/pkg_preinst.eblit 3469 RMD160 a8f0831802ea5b5bec02b6379f08cd5f4f0ad27a SHA1 31a9a0815f11bd186c27d3cc44a394e4aee754be SHA256 7f947a83488dccd4c5169508d7c125d09fdd30ddd07d98b528ad12d83b9e2730 +AUX eblits/pkg_setup.eblit 3146 RMD160 f0575822d5364b5167c17ea7b0aabd821b61fb19 SHA1 e5e55694c18a4c7b8df2e76586866894b018f04e SHA256 c4a59e35b3c5847fa24cc35fb4af4c190a057587453ac8c463244189ff627d74 AUX eblits/src_compile.eblit 6030 RMD160 07c1916050bac9c13e472ea5b4c7f08d2fc80787 SHA1 b09709b15f37f029bad44f6f48ed50b5bfe6ce7c SHA256 4efa7dc520bc3f015f99816717f9e781e81fbdff3cfc8e41baf7e637520b206f -AUX eblits/src_install.eblit 7705 RMD160 2af9080a54569b6241ea2d30af2ffb57fa678c53 SHA1 2e784cc06d1a763aa70c1a72344c30029a19fe97 SHA256 a253b672ee0223e03bd923d5970cb9eb5a0ab8ca9034e4116072477c51aebeba +AUX eblits/src_install.eblit 7694 RMD160 6b228b485e8a743b9c2303b7dceb870bf009c98e SHA1 ddeb1b8ad2bdd18312d64dcb1ec979ddcf103b56 SHA256 9bb91c803f1392bf0926c1866c99cf234c983e30495810b99b58d2d8b18ea2bf AUX eblits/src_test.eblit 1172 RMD160 a70e31e655cd3e306af6a498002de85b72258566 SHA1 4aec15e6ab67279258fd23400701fd38c106a38b SHA256 e5a390761b7ec613460b8da26df3ffe2a137217261dd9f87f2b78c3fa2a12727 AUX eblits/src_unpack.eblit 5848 RMD160 8012ba4a31e689080ec2d70156c503b0c36e3119 SHA1 5aab07c312c3ab0624ead0e0a7f7d5cecfe1bf00 SHA256 19f73007557718580860a6e1b7613b4a69a4a639f17a9d3cb9ca2aba9576ccca AUX nscd 1621 RMD160 f6d20c4c3814f70d7741f3fa2e0b53ba32c37960 SHA1 5751fe798024c2021b7b3ed3e798618e2a38244a SHA256 6165db3a2fcb251d4f3655c0461e018ce9c92a37f7f22a8fd2b75178b5435bc8 @@ -49,22 +49,22 @@ DIST glibc-ports-2.11.tar.bz2 599606 RMD160 e7262cb903b42d27bd0666fb170d2abb4c8b DIST glibc-ports-2.12.1.tar.bz2 621800 RMD160 98b5d5f544336f16bfc8af193e5c447ee6c197ed SHA1 396c1e3958a7563ebdffc8ada8e142e0d6c0b225 SHA256 3986c166d08c30b83c9cc7d972651550b548386d5a02e4e4c985d9832de83110 DIST glibc-ports-2.13.tar.bz2 625945 RMD160 676406e35c8e4fdceb4fcfa83bfbdb1ef3a3aa6a SHA1 1cc771b4bf80f4b0872a342763f4aa4a9a9292cd SHA256 b11c4501ae929883447f409c31d65e82822b1c5693075a825a3d54612876ee5a DIST glibc-ports-6cc02c7.tar.bz2 630607 RMD160 070c9c0ef196e7f3f79ab920a98219b222cd125e SHA1 e178203449b5d882f7b89dd6d507a1d50d7d686b SHA256 23921bf3040c12b78fd3f99e564b301f141cc14fceee65e1ee431afea5f38583 -EBUILD glibc-2.10.1-r1.ebuild 8103 RMD160 6de245cbda314d6ed3902ab366cb40e5f741d304 SHA1 2cfc9417500ac169b1637bf9a4b222bb85f8e741 SHA256 b45417557815fa71411194e4c561dcf86300abcd09ffc6942f8764c6cf14c241 -EBUILD glibc-2.11.3.ebuild 8316 RMD160 5aae08c3ce0497fb7c3814f19302a81e8b819041 SHA1 adeceb83287355ebb06ce3c1d04bb273527a96be SHA256 1bb6581766113923ac654dedbec1b6d018183aab4cd014abe8e118a563ec8e7f -EBUILD glibc-2.12.1-r3.ebuild 8688 RMD160 36abee0dc606251706ad8182ec372ad6ccfaffe3 SHA1 f003efc7504db5406965e3a72c74f1af7dd80600 SHA256 617c9a15a092f1f444bac950c4138558822a5a9a13aa5f73dd76b1bc1d2023b0 -EBUILD glibc-2.12.2.ebuild 8689 RMD160 f6ec4cefbd89e7d1bf5cdc9fcebe92e3e64b2a39 SHA1 c207aeca0b9d38d5e1de54f830795ca8ed332016 SHA256 ef1965341afaaf02bfeb97b92c122036bb4b205156b131bd63258875f938093b -EBUILD glibc-2.13-r2.ebuild 8590 RMD160 ca0137ceb8871e79577d3377dac8f0aa0521725c SHA1 86c9319427309db3be77f9f7b93b5375c7c71774 SHA256 db294e72f2e7743ef27ef80ac7ab49b220dbc95413c22284e999cbfefe9fb176 -EBUILD glibc-2.13-r4.ebuild 8590 RMD160 bec0f41e112bf99eafbc4dd41ffc695abff16040 SHA1 3ec41cb0d4b484b9f0472e29fd3c889190ce06cc SHA256 b409f02e3801c230f467f8cee395697b437676e1bb0d132c411dffb938f80545 -EBUILD glibc-2.14.1.ebuild 8787 RMD160 fb4ca84ca18edfd927c5752f8796ae6f07e5db35 SHA1 8a37411661df85854d6bd951e5f95d7307fc7310 SHA256 084310d0900ee48a8c1484e6c4b88e8b4dd2abf124a0226c054724187babe4fa -EBUILD glibc-2.14.ebuild 8786 RMD160 45031928dfc8ce8fdf47e3d7329101b13a572166 SHA1 d60a737e3c34c39281a1c00850a138f2cd5a6440 SHA256 1e670c24e39377d74840a2d6f2cf721ffee062c25a42c8225867ffaca2ff611a -EBUILD glibc-2.9_p20081201-r3.ebuild 7749 RMD160 0896e4f14fa9df5ef663e61eea35dc85a8511903 SHA1 859d93f9829a301ba99edc8cfb90f604309d890f SHA256 b8e0b085e3e616a08720d236469f550793ac2869ad1ac50dd719ccb3c154e930 -EBUILD glibc-9999.ebuild 8785 RMD160 ebbd32d8a350f893d12b6c470f6c6a2a01d3c4f0 SHA1 88c914714bd1576de991f9e897d1557c366de098 SHA256 ee841b61a5e1ff1ee80dc092c94ba5b27a90e06ea46c33d05eee8438c110a38c -MISC ChangeLog 141623 RMD160 37588d751832e427b687648a689aca2acc2c3f87 SHA1 66caf1e79bf4084159cf5a89760492e1cb373ccc SHA256 69497d699f7cb3c07d5b89a1dd98689a2e40ff1042bd8f6d0c487942ff311f1c -MISC metadata.xml 332 RMD160 e7659a736d7c78284e28b8e9a0d295cbc1fdb87f SHA1 7a7a98ab40d45afaa2175656b23b04748e06d930 SHA256 32e7e4ccedeb7416e2399a3b5f5ffbd0722892548c427da0e62c8196a52a73f2 +EBUILD glibc-2.10.1-r1.ebuild 8107 RMD160 798b89a63ee0451e7075949b02db941f9e4ff634 SHA1 22bcd755c8598136ad04773b6a072abb5c0563af SHA256 044780395e2b461a15625ecd51586655abcc38b8cb72f2fa81cb11ca70d3fe20 +EBUILD glibc-2.11.3.ebuild 8321 RMD160 55d034a3be88ad8eea4b8608d425f23fedf17bce SHA1 c88d57842cafa2163e3118152f46b3b85f25669d SHA256 24c1127c9d2b9897ffe6bcf9d2c813c0670aea4b4d53e816e04f7abc85fac615 +EBUILD glibc-2.12.1-r3.ebuild 8692 RMD160 12a681950b6c34f65078129af40aa77e9fd74b35 SHA1 9990a8020060daba3c2d28b03371cf56c489e1e7 SHA256 05f0722404f9985d0a991e5bec6cb8ae9d9c43fc26216b610284d00de88b60f0 +EBUILD glibc-2.12.2.ebuild 8693 RMD160 69f9eec91640a91b067b9dac6dbe01130cf33569 SHA1 8c9f2a83186f2faefd8ece142bd8494832f60480 SHA256 375d805fbaf57d6e8c4ebe792bc2c7aee359b43c50e3d2d2f103693116477cc1 +EBUILD glibc-2.13-r2.ebuild 8594 RMD160 e255ba39aa10c0703b03d5a5d41f18b28f8dcdb9 SHA1 ae5be41f5102483d774438f24bacd4f63a72f9fc SHA256 42000c8046d3325ade13b6c1a34a9497d04801212002b571f303e9ccf1807ec6 +EBUILD glibc-2.13-r4.ebuild 8594 RMD160 660ba079f4decffe2feb22eaeb73d9228b742d43 SHA1 1780662824d4085c0401f26e474c65b95e749d19 SHA256 85ba4eb371b21de87aad3aeb2b0c28479146b9b401955bde4bcf65d245b218d0 +EBUILD glibc-2.14.1.ebuild 8791 RMD160 1a8102b2ab8f4b090a72e27b599b3006c2e87b00 SHA1 64ed0fc235e05d6764cd2bc36934b76791890342 SHA256 3c69d38435fd63827f0c21fde35372a2b4da35c238278184d145a9708a75fd3e +EBUILD glibc-2.14.ebuild 8790 RMD160 c808dcea9320f1f8a870b54ca50c023d10b034f1 SHA1 51f3046ddfe9f53224dc77f8b8e8881dfb6bd021 SHA256 b7f9c2a47dd0d5a6e1927db3cab51a8b7cb52d827df8213df0827e83754d901b +EBUILD glibc-2.9_p20081201-r3.ebuild 7753 RMD160 8d14a32be1c680e21128552fff3e7299710b0255 SHA1 92f5182dce11c5a77e91ebd9129c2c6ff6938974 SHA256 b90aa298fd49569090f711b2bd9368a66c73cb6c37e85525d1d929ef70e09a5b +EBUILD glibc-9999.ebuild 8789 RMD160 cb7c0aa7866c031533846c94dd632d26cde8b064 SHA1 e3619da20d49aa6b358b6c95b83c94bf34e5bfe4 SHA256 9e7a7444b0aeb1cd27e5689a94a029c637627971f4fd1fb2e4361a0e7b3d6fc9 +MISC ChangeLog 142087 RMD160 36ef42b6c6c6efa60ce0b5ca49e5c81c0a9fe417 SHA1 f7527143278bd7dae6903f2c874c4fd6bfb16ce5 SHA256 e6b33658e62cade0153d024ed40dbeaef95140c24af45105cad751567546b5a6 +MISC metadata.xml 423 RMD160 cf6f12db580ed1cff7cf7287723daece896268ae SHA1 ecd822cb67d353dea55f6a07d0e14a4b3a3644a7 SHA256 9e9a0143eff95971cf35957f2334ba791557e6408fff8784188fdba70d48f4b5 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.18 (GNU/Linux) -iF4EAREIAAYFAk64dNwACgkQaC/OocHi7JZd6wD/dbDG5QtvknEU6X7WhReHYbKl -XzA5hZ6epj+cv4C0HYgA/0w1dw+LOItk2AZFV7aAHXL8937gNElLDgfnIzQ+N07v -=8xQU +iF4EAREIAAYFAk7D390ACgkQaC/OocHi7JYvEAD+LXoekN6hMFl4RvuTUUWWSYr9 +U1zS06auf/WRbnP2ntUA/2wgbjL7vqz56jstesqQcR6bzZK0ZJuNvqZ5Ldd6fM/r +=Nabd -----END PGP SIGNATURE----- diff --git a/sys-libs/glibc/files/eblits/common.eblit b/sys-libs/glibc/files/eblits/common.eblit index 6ef9bd8af6e5..3aa16ef69c33 100644 --- a/sys-libs/glibc/files/eblits/common.eblit +++ b/sys-libs/glibc/files/eblits/common.eblit @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/files/eblits/common.eblit,v 1.22 2011/08/19 23:03:11 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/files/eblits/common.eblit,v 1.23 2011/11/16 16:07:46 vapier Exp $ # We need to be able to set alternative headers for # compiling for non-native platform @@ -210,9 +210,7 @@ want_nptl() { want_linuxthreads() { [[ -z ${LT_VER} ]] && return 1 - ! use nptlonly && return 0 - want_nptl || return 0 - return 1 + use linuxthreads } want_tls() { diff --git a/sys-libs/glibc/files/eblits/pkg_preinst.eblit b/sys-libs/glibc/files/eblits/pkg_preinst.eblit index dcde615cf738..8b2998ef9818 100644 --- a/sys-libs/glibc/files/eblits/pkg_preinst.eblit +++ b/sys-libs/glibc/files/eblits/pkg_preinst.eblit @@ -1,6 +1,6 @@ -# Copyright 1999-2010 Gentoo Foundation +# Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/files/eblits/pkg_preinst.eblit,v 1.3 2010/10/08 15:33:13 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/files/eblits/pkg_preinst.eblit,v 1.4 2011/11/16 16:07:46 vapier Exp $ fix_lib64_symlinks() { # the original Gentoo/AMD64 devs decided that since 64bit is the native @@ -52,13 +52,6 @@ eblit-glibc-pkg_preinst() { # It can be removed after 2004.3 has been purged from portage. { use amd64 || use ppc64; } && [ "$(get_libdir)" == "lib64" ] && ! has_multilib_profile && fix_lib64_symlinks - # it appears that /lib/tls is sometimes not removed. See bug - # 69258 for more info. - if [[ -d ${ROOT}/$(alt_libdir)/tls ]] && [[ ! -d ${D}/$(alt_libdir)/tls ]] ; then - ewarn "nptlonly or -nptl in USE, removing /${ROOT}$(alt_libdir)/tls..." - rm -r "${ROOT}"/$(alt_libdir)/tls || die - fi - # prepare /etc/ld.so.conf.d/ for files mkdir -p "${ROOT}"/etc/ld.so.conf.d diff --git a/sys-libs/glibc/files/eblits/pkg_setup.eblit b/sys-libs/glibc/files/eblits/pkg_setup.eblit index a0143c76ba27..806ad86de892 100644 --- a/sys-libs/glibc/files/eblits/pkg_setup.eblit +++ b/sys-libs/glibc/files/eblits/pkg_setup.eblit @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/files/eblits/pkg_setup.eblit,v 1.6 2011/03/20 22:23:47 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/files/eblits/pkg_setup.eblit,v 1.7 2011/11/16 16:07:46 vapier Exp $ glibc_compile_test() { local ret save_cflags=${CFLAGS} @@ -87,13 +87,6 @@ eblit-glibc-pkg_setup() { die "please fix your CHOST" fi - if [[ -n ${LT_VER} ]] ; then - if use nptlonly && ! use nptl ; then - eerror "If you want nptlonly, add nptl to your USE too ;p" - die "nptlonly without nptl" - fi - fi - if [[ -e /proc/xen ]] && [[ $(tc-arch) == "x86" ]] && ! is-flag -mno-tls-direct-seg-refs ; then ewarn "You are using Xen but don't have -mno-tls-direct-seg-refs in your CFLAGS." ewarn "This will result in a 50% performance penalty when running with a 32bit" diff --git a/sys-libs/glibc/files/eblits/src_install.eblit b/sys-libs/glibc/files/eblits/src_install.eblit index bb2d674f78ba..4208d1039851 100644 --- a/sys-libs/glibc/files/eblits/src_install.eblit +++ b/sys-libs/glibc/files/eblits/src_install.eblit @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/files/eblits/src_install.eblit,v 1.16 2011/10/11 21:20:30 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/files/eblits/src_install.eblit,v 1.17 2011/11/16 16:07:46 vapier Exp $ toolchain-glibc_src_install() { local GBUILDDIR @@ -15,7 +15,7 @@ toolchain-glibc_src_install() { if want_linuxthreads ; then cd "${WORKDIR}"/build-${ABI}-${CTARGET}-linuxthreads einfo "Installing GLIBC ${ABI} with linuxthreads ..." - else # nptlonly + else cd "${WORKDIR}"/build-${ABI}-${CTARGET}-nptl einfo "Installing GLIBC ${ABI} with NPTL ..." fi diff --git a/sys-libs/glibc/glibc-2.10.1-r1.ebuild b/sys-libs/glibc/glibc-2.10.1-r1.ebuild index 27029963af43..46ed0cfa56ff 100644 --- a/sys-libs/glibc/glibc-2.10.1-r1.ebuild +++ b/sys-libs/glibc/glibc-2.10.1-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.10.1-r1.ebuild,v 1.18 2011/09/29 21:13:44 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.10.1-r1.ebuild,v 1.19 2011/11/16 16:07:46 vapier Exp $ inherit eutils versionator libtool toolchain-funcs flag-o-matic gnuconfig multilib @@ -32,7 +32,7 @@ LT_VER="" # version of linuxthreads addon NPTL_KERN_VER=${NPTL_KERN_VER:-"2.6.9"} # min kernel version nptl requires #LT_KERN_VER=${LT_KERN_VER:-"2.4.1"} # min kernel version linuxthreads requires -IUSE="debug gd glibc-omitfp hardened multilib nls selinux profile vanilla crosscompile_opts_headers-only ${LT_VER:+glibc-compat20 nptl nptlonly}" +IUSE="debug gd glibc-omitfp hardened multilib nls selinux profile vanilla crosscompile_opts_headers-only ${LT_VER:+glibc-compat20 nptl linuxthreads}" S=${WORKDIR}/glibc-${RELEASE_VER}${SNAP_VER:+-${SNAP_VER}} # Here's how the cross-compile logic breaks down ... diff --git a/sys-libs/glibc/glibc-2.11.3.ebuild b/sys-libs/glibc/glibc-2.11.3.ebuild index 33148234b0d3..05115b3f7634 100644 --- a/sys-libs/glibc/glibc-2.11.3.ebuild +++ b/sys-libs/glibc/glibc-2.11.3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.11.3.ebuild,v 1.9 2011/09/29 21:13:44 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.11.3.ebuild,v 1.10 2011/11/16 16:07:46 vapier Exp $ inherit eutils versionator libtool toolchain-funcs flag-o-matic gnuconfig multilib @@ -31,7 +31,7 @@ LT_VER="" # version of linuxthreads addon NPTL_KERN_VER=${NPTL_KERN_VER:-"2.6.9"} # min kernel version nptl requires #LT_KERN_VER=${LT_KERN_VER:-"2.4.1"} # min kernel version linuxthreads requires -IUSE="debug gd glibc-omitfp hardened multilib nls selinux profile vanilla crosscompile_opts_headers-only ${LT_VER:+glibc-compat20 nptl nptlonly}" +IUSE="debug gd glibc-omitfp hardened multilib nls selinux profile vanilla crosscompile_opts_headers-only ${LT_VER:+glibc-compat20 nptl linuxthreads}" S=${WORKDIR}/glibc-${RELEASE_VER}${SNAP_VER:+-${SNAP_VER}} # Here's how the cross-compile logic breaks down ... diff --git a/sys-libs/glibc/glibc-2.12.1-r3.ebuild b/sys-libs/glibc/glibc-2.12.1-r3.ebuild index 70f22686a456..4178077d2021 100644 --- a/sys-libs/glibc/glibc-2.12.1-r3.ebuild +++ b/sys-libs/glibc/glibc-2.12.1-r3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.12.1-r3.ebuild,v 1.7 2011/09/29 21:13:44 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.12.1-r3.ebuild,v 1.8 2011/11/16 16:07:46 vapier Exp $ inherit eutils versionator libtool toolchain-funcs flag-o-matic gnuconfig multilib @@ -31,7 +31,7 @@ LT_VER="" # version of linuxthreads addon NPTL_KERN_VER=${NPTL_KERN_VER:-"2.6.9"} # min kernel version nptl requires #LT_KERN_VER=${LT_KERN_VER:-"2.4.1"} # min kernel version linuxthreads requires -IUSE="debug gd glibc-omitfp hardened multilib nls selinux profile vanilla crosscompile_opts_headers-only ${LT_VER:+glibc-compat20 nptl nptlonly}" +IUSE="debug gd glibc-omitfp hardened multilib nls selinux profile vanilla crosscompile_opts_headers-only ${LT_VER:+glibc-compat20 nptl linuxthreads}" S=${WORKDIR}/glibc-${RELEASE_VER}${SNAP_VER:+-${SNAP_VER}} # Here's how the cross-compile logic breaks down ... diff --git a/sys-libs/glibc/glibc-2.12.2.ebuild b/sys-libs/glibc/glibc-2.12.2.ebuild index b8940ae096cb..806d679ae267 100644 --- a/sys-libs/glibc/glibc-2.12.2.ebuild +++ b/sys-libs/glibc/glibc-2.12.2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.12.2.ebuild,v 1.11 2011/09/29 21:13:44 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.12.2.ebuild,v 1.12 2011/11/16 16:07:46 vapier Exp $ inherit eutils versionator libtool toolchain-funcs flag-o-matic gnuconfig multilib @@ -31,7 +31,7 @@ LT_VER="" # version of linuxthreads addon NPTL_KERN_VER=${NPTL_KERN_VER:-"2.6.9"} # min kernel version nptl requires #LT_KERN_VER=${LT_KERN_VER:-"2.4.1"} # min kernel version linuxthreads requires -IUSE="debug gd glibc-omitfp hardened multilib nls selinux profile vanilla crosscompile_opts_headers-only ${LT_VER:+glibc-compat20 nptl nptlonly}" +IUSE="debug gd glibc-omitfp hardened multilib nls selinux profile vanilla crosscompile_opts_headers-only ${LT_VER:+glibc-compat20 nptl linuxthreads}" S=${WORKDIR}/glibc-${RELEASE_VER}${SNAP_VER:+-${SNAP_VER}} # Here's how the cross-compile logic breaks down ... diff --git a/sys-libs/glibc/glibc-2.13-r2.ebuild b/sys-libs/glibc/glibc-2.13-r2.ebuild index 1d6f3fe65e46..94446f22728a 100644 --- a/sys-libs/glibc/glibc-2.13-r2.ebuild +++ b/sys-libs/glibc/glibc-2.13-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.13-r2.ebuild,v 1.7 2011/09/29 21:13:44 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.13-r2.ebuild,v 1.8 2011/11/16 16:07:46 vapier Exp $ inherit eutils versionator libtool toolchain-funcs flag-o-matic gnuconfig multilib @@ -31,7 +31,7 @@ LT_VER="" # version of linuxthreads addon NPTL_KERN_VER=${NPTL_KERN_VER:-"2.6.9"} # min kernel version nptl requires #LT_KERN_VER=${LT_KERN_VER:-"2.4.1"} # min kernel version linuxthreads requires -IUSE="debug gd glibc-omitfp hardened multilib nls selinux profile vanilla crosscompile_opts_headers-only ${LT_VER:+glibc-compat20 nptl nptlonly}" +IUSE="debug gd glibc-omitfp hardened multilib nls selinux profile vanilla crosscompile_opts_headers-only ${LT_VER:+glibc-compat20 nptl linuxthreads}" S=${WORKDIR}/glibc-${RELEASE_VER}${SNAP_VER:+-${SNAP_VER}} # Here's how the cross-compile logic breaks down ... diff --git a/sys-libs/glibc/glibc-2.13-r4.ebuild b/sys-libs/glibc/glibc-2.13-r4.ebuild index 6d2e8d5346df..7b074a99f35c 100644 --- a/sys-libs/glibc/glibc-2.13-r4.ebuild +++ b/sys-libs/glibc/glibc-2.13-r4.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.13-r4.ebuild,v 1.2 2011/09/29 21:13:44 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.13-r4.ebuild,v 1.3 2011/11/16 16:07:46 vapier Exp $ inherit eutils versionator libtool toolchain-funcs flag-o-matic gnuconfig multilib @@ -31,7 +31,7 @@ LT_VER="" # version of linuxthreads addon NPTL_KERN_VER=${NPTL_KERN_VER:-"2.6.9"} # min kernel version nptl requires #LT_KERN_VER=${LT_KERN_VER:-"2.4.1"} # min kernel version linuxthreads requires -IUSE="debug gd glibc-omitfp hardened multilib nls selinux profile vanilla crosscompile_opts_headers-only ${LT_VER:+glibc-compat20 nptl nptlonly}" +IUSE="debug gd glibc-omitfp hardened multilib nls selinux profile vanilla crosscompile_opts_headers-only ${LT_VER:+glibc-compat20 nptl linuxthreads}" S=${WORKDIR}/glibc-${RELEASE_VER}${SNAP_VER:+-${SNAP_VER}} # Here's how the cross-compile logic breaks down ... diff --git a/sys-libs/glibc/glibc-2.14.1.ebuild b/sys-libs/glibc/glibc-2.14.1.ebuild index 7639f7a749a7..9804e5e4ec32 100644 --- a/sys-libs/glibc/glibc-2.14.1.ebuild +++ b/sys-libs/glibc/glibc-2.14.1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.14.1.ebuild,v 1.1 2011/11/07 23:11:18 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.14.1.ebuild,v 1.2 2011/11/16 16:07:46 vapier Exp $ inherit eutils versionator libtool toolchain-funcs flag-o-matic gnuconfig multilib @@ -39,7 +39,7 @@ LT_VER="" # version of linuxthreads addon NPTL_KERN_VER=${NPTL_KERN_VER:-"2.6.9"} # min kernel version nptl requires #LT_KERN_VER=${LT_KERN_VER:-"2.4.1"} # min kernel version linuxthreads requires -IUSE="debug gd glibc-omitfp hardened multilib nls selinux profile vanilla crosscompile_opts_headers-only ${LT_VER:+glibc-compat20 nptl nptlonly}" +IUSE="debug gd glibc-omitfp hardened multilib nls selinux profile vanilla crosscompile_opts_headers-only ${LT_VER:+glibc-compat20 nptl linuxthreads}" [[ -n ${RELEASE_VER} ]] && S=${WORKDIR}/glibc-${RELEASE_VER}${SNAP_VER:+-${SNAP_VER}} # Here's how the cross-compile logic breaks down ... diff --git a/sys-libs/glibc/glibc-2.14.ebuild b/sys-libs/glibc/glibc-2.14.ebuild index f5d03917fd98..6a36da827ad3 100644 --- a/sys-libs/glibc/glibc-2.14.ebuild +++ b/sys-libs/glibc/glibc-2.14.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.14.ebuild,v 1.10 2011/09/29 21:13:44 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.14.ebuild,v 1.11 2011/11/16 16:07:46 vapier Exp $ inherit eutils versionator libtool toolchain-funcs flag-o-matic gnuconfig multilib @@ -39,7 +39,7 @@ LT_VER="" # version of linuxthreads addon NPTL_KERN_VER=${NPTL_KERN_VER:-"2.6.9"} # min kernel version nptl requires #LT_KERN_VER=${LT_KERN_VER:-"2.4.1"} # min kernel version linuxthreads requires -IUSE="debug gd glibc-omitfp hardened multilib nls selinux profile vanilla crosscompile_opts_headers-only ${LT_VER:+glibc-compat20 nptl nptlonly}" +IUSE="debug gd glibc-omitfp hardened multilib nls selinux profile vanilla crosscompile_opts_headers-only ${LT_VER:+glibc-compat20 nptl linuxthreads}" [[ -n ${RELEASE_VER} ]] && S=${WORKDIR}/glibc-${RELEASE_VER}${SNAP_VER:+-${SNAP_VER}} # Here's how the cross-compile logic breaks down ... diff --git a/sys-libs/glibc/glibc-2.9_p20081201-r3.ebuild b/sys-libs/glibc/glibc-2.9_p20081201-r3.ebuild index da061b0d763d..510209b7dd01 100644 --- a/sys-libs/glibc/glibc-2.9_p20081201-r3.ebuild +++ b/sys-libs/glibc/glibc-2.9_p20081201-r3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.9_p20081201-r3.ebuild,v 1.10 2011/09/29 21:13:44 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.9_p20081201-r3.ebuild,v 1.11 2011/11/16 16:07:46 vapier Exp $ inherit eutils versionator libtool toolchain-funcs flag-o-matic gnuconfig multilib @@ -31,7 +31,7 @@ LT_VER="" # version of linuxthreads addon NPTL_KERN_VER=${NPTL_KERN_VER:-"2.6.9"} # min kernel version nptl requires #LT_KERN_VER=${LT_KERN_VER:-"2.4.1"} # min kernel version linuxthreads requires -IUSE="debug gd glibc-omitfp hardened multilib nls selinux profile vanilla crosscompile_opts_headers-only ${LT_VER:+glibc-compat20 nptl nptlonly}" +IUSE="debug gd glibc-omitfp hardened multilib nls selinux profile vanilla crosscompile_opts_headers-only ${LT_VER:+glibc-compat20 nptl linuxthreads}" S=${WORKDIR}/glibc-${RELEASE_VER}${SNAP_VER+-${SNAP_VER}} # Here's how the cross-compile logic breaks down ... diff --git a/sys-libs/glibc/glibc-9999.ebuild b/sys-libs/glibc/glibc-9999.ebuild index 8025f4a26ef1..66c41cc23439 100644 --- a/sys-libs/glibc/glibc-9999.ebuild +++ b/sys-libs/glibc/glibc-9999.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-9999.ebuild,v 1.2 2011/09/29 21:13:44 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-9999.ebuild,v 1.3 2011/11/16 16:07:46 vapier Exp $ inherit eutils versionator libtool toolchain-funcs flag-o-matic gnuconfig multilib @@ -39,7 +39,7 @@ LT_VER="" # version of linuxthreads addon NPTL_KERN_VER=${NPTL_KERN_VER:-"2.6.9"} # min kernel version nptl requires #LT_KERN_VER=${LT_KERN_VER:-"2.4.1"} # min kernel version linuxthreads requires -IUSE="debug gd glibc-omitfp hardened multilib nls selinux profile vanilla crosscompile_opts_headers-only ${LT_VER:+glibc-compat20 nptl nptlonly}" +IUSE="debug gd glibc-omitfp hardened multilib nls selinux profile vanilla crosscompile_opts_headers-only ${LT_VER:+glibc-compat20 nptl linuxthreads}" [[ -n ${RELEASE_VER} ]] && S=${WORKDIR}/glibc-${RELEASE_VER}${SNAP_VER:+-${SNAP_VER}} # Here's how the cross-compile logic breaks down ... diff --git a/sys-libs/glibc/metadata.xml b/sys-libs/glibc/metadata.xml index 7983bd918b63..b7817a71eb11 100644 --- a/sys-libs/glibc/metadata.xml +++ b/sys-libs/glibc/metadata.xml @@ -3,8 +3,7 @@ toolchain - Configure glibc with --enable-omitfp which lets - the build system determine when it is safe to use - -fomit-frame-pointer + Configure with --enable-omitfp which lets the build system determine when it is safe to use -fomit-frame-pointer + Build linuxthreads support (only for kernels older than linux-2.6) -- 2.26.2