From: Mike Frysinger Date: Fri, 16 Jun 2006 04:24:43 +0000 (+0000) Subject: old X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=69b5a9fc8345328ceb390f5ad5a2eaedc1a21489;p=gentoo.git old Package-Manager: portage-2.1 --- diff --git a/sys-libs/glibc/Manifest b/sys-libs/glibc/Manifest index 821de7268438..a870c1fe8184 100644 --- a/sys-libs/glibc/Manifest +++ b/sys-libs/glibc/Manifest @@ -443,20 +443,13 @@ DIST glibc-2.3.4.20041102-patches-1.0.tar.bz2 14157 RMD160 0318adf8d132c306a3f9b DIST glibc-2.3.4.tar.bz2 13213560 RMD160 bb2bc1669de7c7b08903be5767753f75709e98c5 SHA256 bbf86a81932c14d3bb9cc384202463e31971b0101e06830137534bd4782a732b DIST glibc-2.3.5-patches-1.13.tar.bz2 24793 RMD160 1940f068e05222738a95baa566a0da78ca8eb3ab SHA256 167da2eba108780b54e6f6ec8e9c2f4caf30eb65121e916c6d8813bbb46a2216 DIST glibc-2.3.5-patches-1.16.tar.bz2 28401 RMD160 ef56df1c2ed60df01b027f805755463a834f3760 SHA256 371dfd8f8dfc90be4fdd8057fb58090119db95d26aa550ac1a7b3bcc828e754b -DIST glibc-2.3.5-patches-1.4.tar.bz2 19222 RMD160 8ddfa7b17bbaae91bc6a4c913811e3cd0084e973 SHA256 92df29d100ae763d188e593a4e64ca11211be99684a82c1095401a0377964ae5 DIST glibc-2.3.5.tar.bz2 13583139 RMD160 ebdda60cd848fd5b30b5e3345fb481d3c5663540 SHA256 de97b9c15d75ac86b7a079a20315100a5c9833bb3c217b448913041a5bd988a5 -DIST glibc-2.3.6-patches-1.1.tar.bz2 27272 DIST glibc-2.3.6-patches-1.12.tar.bz2 154256 RMD160 b25755801ca2bd219ddafd82a1a9ecb5aa8a15ab SHA256 68ea378c64e27d1e47cca3b6e1ab2404246f1ee40445f8d1cf5d672c4cb7221c -DIST glibc-2.3.6-patches-1.3.tar.bz2 32154 RMD160 ce5b23c88c5fb19b6bcd32fcd3eb8b0eda39868a SHA256 6dbc297b792e8e82299a892a9a45cb0c1decd93cdb854660dd1b0bc9977b0bbd -DIST glibc-2.3.6-patches-1.4.tar.bz2 32540 RMD160 0bc7104122cea654b7b13d9dc867a3c0ce9c1c7c SHA1 d823984d9cca295b0b212e3955f050e914a5537d SHA256 0fa384e3b7c0ca282a5e9c7ee88bc667f11ca8fbca04ded468caae3d91609fde DIST glibc-2.3.6-patches-1.8.tar.bz2 132799 RMD160 fe94d79a0cd6ca8e860924fc3daafe550faa4244 SHA1 06e2242274a338821f327b4921b94988006685a6 SHA256 8a96a2fcd6800ab47f23d669fc9752978e0bfc0ff5f634351ae49a33c7a0060e DIST glibc-2.3.6.tar.bz2 14014977 RMD160 04b4f71cc3e89581e02ee2dbf5ab05f61e868bf1 SHA1 82d0487419f1bdbf2dee439c344e89d6af47e558 SHA256 e73ff5eddea95d09238b41d3c9c4d9ccddcf99fcc93d04956599c91c704f4a8e -DIST glibc-2.4-patches-1.13.tar.bz2 120328 RMD160 2e16b87403b6560d7e379a8f7267af171a145afb SHA256 fb6e73dadf2cb115471b34bb47181c9c922efe41d3d9c65177684ee535960604 DIST glibc-2.4-patches-1.15.tar.bz2 121247 RMD160 dfb7e90ee02a8162393c3d3c0ddbae81a1e56ff8 SHA256 fca9951f5fb10ac85507f1b636a15549c00aebc1af7342887c183d843cc8f670 -DIST glibc-2.4-patches-1.3.tar.bz2 106325 RMD160 44c515536754d10be15731285842de7638136d13 SHA1 9e9d6edf73c2329ebec285a0cc4eea53d9221c0a SHA256 76b74f08a3ba10f219af2221951b0d402fc78f08a4613767c3a5ad4937c70d93 DIST glibc-2.4.tar.bz2 15202445 RMD160 ee2712a0e6fab8e086958c1f23221f8d07af3de1 SHA1 35c636e4b474cda0f06e361d5e9caec092fd73d3 SHA256 27aaaaa78b4ab5da76bb29385dc9be087ba7b855a9102eaaa78ce3ec5e2e7fcd DIST glibc-fedora-20041219T2331.tar.bz2 761998 RMD160 cfc859a7e0a904cfb340c832267d3377e850cf6e SHA1 31e10b882bb9288831e1a1b2ed0ddece7099ffbd SHA256 e36ffa84388ebb746cb80c37d6fd1acc9e45e07b85c30b0a2ad9f511fae59cec -DIST glibc-fedora-20060306T1239.tar.bz2 728767 RMD160 d59c8601340fde01e3a5a5b0613d3051a7e8fd9c SHA1 800a14c72284e18f1d4dce6e89f214a40e2be767 SHA256 37794c31136164c41d0495788255badc23e7b6c347a6c97dfb4bf75e028cec29 DIST glibc-fedora-20060501T0751.tar.bz2 727641 RMD160 4f6eeeac6f315a26c1a64f2c35587eca9106ef2d SHA1 2efa5c82e7aaa6c381664cc308db2f3cee5ddb73 SHA256 cfba2cded39fbd42643eaa1f1795221e0b11a503beec7d66ba31f3728526efec DIST glibc-hppa-patches-2004-06-04.tar.gz 9528 RMD160 df2b086cac83979033f274ccfe2b58e67ae73d0c SHA256 6efebc08997ff83487058f443c009417c646d756b55d760e4192748aa8dacf2e DIST glibc-hppa-patches-2004-08-24.tar.gz 9739 RMD160 1956d3d0e11c892521db1607699fadbd3bed9f9d SHA256 0254e1febd00a79674861f5523628b0ba08bc69259f98b5cde3655ce1c677c89 @@ -474,7 +467,6 @@ DIST glibc-linuxthreads-2.3.2.tar.bz2 216310 RMD160 9be07e5896f5e4e728bdbbebb00d DIST glibc-linuxthreads-2.3.4.tar.bz2 236183 RMD160 fd13b9bf5c9991e6855c01fb34f4f3a87b49f57e SHA256 1c312c9c9f33d5cdf6622af390e5698e92f950e411b7795024aab089e0249a78 DIST glibc-linuxthreads-2.3.5.tar.bz2 236946 RMD160 b86afc7e2359165704d09c4c3b0d84826c636890 SHA256 3fec798bb944c2f89f1d95ec7bb38f60e1393c9db0da6bdbb922606e023108b5 DIST glibc-linuxthreads-2.3.6.tar.bz2 243534 RMD160 bb89ac687419cede738314923bc952d191d8d252 SHA1 10190168bf948556afdfff46f87f9208402d810f SHA256 6c3bc4a247d1e5308fb14f81956802f09095d3683219859fcad5795aa3aea638 -DIST glibc-linuxthreads-20060508.tar.bz2 247271 RMD160 8e964693b730188cb308927782b6eacde50e46a6 SHA1 8f8ed5bcc229cd059c040cc4abec998fc57632cd SHA256 05da1929a6726b5358c30295c0860f8f87692eab67d1237b0b5bba51c9306269 DIST glibc-linuxthreads-20060605.tar.bz2 247200 RMD160 aaa0a150eec4d63787f86ae04ded4d92a10c6f29 SHA1 1e0cf861de45f22d01d7d305482bacb0a869262f SHA256 1d15e236926fff6daa81e6af34e7903206b67f849f828ca976ab077b4677fb52 DIST glibc-manpages-2.3.4-r1.tar.bz2 22276 RMD160 456e229ae92f2c5951be5ecebbc9685e8e1bffef SHA256 fda127a2d7784b945276c08e38d220c4d48c7cb057fd9a3380bde6d4d955554d DIST glibc-manpages-2.3.4.tar.bz2 14759 RMD160 56a648a9eb327568c0e6681aaa47a5c7bb93f84f SHA256 a512d0302005168bcb77860468884823b13f9f5ec2c9981b86b46e729e3e318d @@ -514,30 +506,14 @@ EBUILD glibc-2.3.4.20050125-r1.ebuild 39616 RMD160 65dcb51e3776bd0efbcd710628806 MD5 bbd507a5f3867962e25f68e3d0fc00d7 glibc-2.3.4.20050125-r1.ebuild 39616 RMD160 65dcb51e3776bd0efbcd7106288067416f084ef9 glibc-2.3.4.20050125-r1.ebuild 39616 SHA256 11dbcac405f38f061ca28a5b7026d511c82b54960d94736d83d9aabdd5709f44 glibc-2.3.4.20050125-r1.ebuild 39616 -EBUILD glibc-2.3.5-r1.ebuild 41159 RMD160 bca8e2d737bff6eb3d3fddb5f4a150a42d39539b SHA1 e8e8588d925b8ccae0ac40a18ffb87ca111c7bae SHA256 ef5253c08e49d5fe35d68085a37b3cf730bbcc0b9cc037a523c3b73d4916e1b1 -MD5 f3ddab70f7f6721ca5b0d45ec78fb906 glibc-2.3.5-r1.ebuild 41159 -RMD160 bca8e2d737bff6eb3d3fddb5f4a150a42d39539b glibc-2.3.5-r1.ebuild 41159 -SHA256 ef5253c08e49d5fe35d68085a37b3cf730bbcc0b9cc037a523c3b73d4916e1b1 glibc-2.3.5-r1.ebuild 41159 EBUILD glibc-2.3.5-r2.ebuild 39485 RMD160 841c0310fa9f91df69d0b1acd17917dc9c01c830 SHA1 67ef6ece02d74202c2a82744c4a4f9fa09722ac7 SHA256 88a4459f3700d1592439c224343565b1c9fbbbd7d58c68481f57dcbcb8158350 MD5 310725ef11028d6f562bbccfb8ea33f0 glibc-2.3.5-r2.ebuild 39485 RMD160 841c0310fa9f91df69d0b1acd17917dc9c01c830 glibc-2.3.5-r2.ebuild 39485 SHA256 88a4459f3700d1592439c224343565b1c9fbbbd7d58c68481f57dcbcb8158350 glibc-2.3.5-r2.ebuild 39485 -EBUILD glibc-2.3.5-r3.ebuild 39090 RMD160 32697592386c9bfdbfe8e580fb9d9f858945ab46 SHA1 505aae24c3b17a0ea28ccf988b0ef4b96fc11d82 SHA256 fe9650d31ed96d8cf59ca20f9748caa60bb24928e8f345293301b80f53c82e2b -MD5 02467735be0664d56214633aa49a5eec glibc-2.3.5-r3.ebuild 39090 -RMD160 32697592386c9bfdbfe8e580fb9d9f858945ab46 glibc-2.3.5-r3.ebuild 39090 -SHA256 fe9650d31ed96d8cf59ca20f9748caa60bb24928e8f345293301b80f53c82e2b glibc-2.3.5-r3.ebuild 39090 -EBUILD glibc-2.3.5.ebuild 40293 RMD160 deeb10b7f7bf142df2b620468ec3ac537b48449c SHA1 4b6f4ef83f260436d24a32f067fb6a6545063026 SHA256 babd8b2912fdc1ce115daaf82ae6df3c4a45516478a85ba0876e4426b35a5249 -MD5 c3e2acb432f23ae3369d8689a650ac53 glibc-2.3.5.ebuild 40293 -RMD160 deeb10b7f7bf142df2b620468ec3ac537b48449c glibc-2.3.5.ebuild 40293 -SHA256 babd8b2912fdc1ce115daaf82ae6df3c4a45516478a85ba0876e4426b35a5249 glibc-2.3.5.ebuild 40293 -EBUILD glibc-2.3.6-r1.ebuild 41870 RMD160 6b76874b5ad06567b714764f96c3df0a6d7fab1f SHA1 aa2502014fe9e87ee9dbf029af743e93335310ca SHA256 d56b41a938d08f000f193048135f1368e07e119994dfc91ca11da1b4a6a95cd0 -MD5 4277a580ce382d8aedd6b8567bb45e4d glibc-2.3.6-r1.ebuild 41870 -RMD160 6b76874b5ad06567b714764f96c3df0a6d7fab1f glibc-2.3.6-r1.ebuild 41870 -SHA256 d56b41a938d08f000f193048135f1368e07e119994dfc91ca11da1b4a6a95cd0 glibc-2.3.6-r1.ebuild 41870 -EBUILD glibc-2.3.6-r2.ebuild 42379 RMD160 fea247d1b0718fd4251de62d0b929da48c0acf57 SHA1 ae49f1af9bdcbeaabe0b625e2a8079890c5dee35 SHA256 47377913a905edc287859b273e97e54d0d5ce54d9537e900098163cff6202abb -MD5 465ceed9144294989596519409f357a2 glibc-2.3.6-r2.ebuild 42379 -RMD160 fea247d1b0718fd4251de62d0b929da48c0acf57 glibc-2.3.6-r2.ebuild 42379 -SHA256 47377913a905edc287859b273e97e54d0d5ce54d9537e900098163cff6202abb glibc-2.3.6-r2.ebuild 42379 +EBUILD glibc-2.3.5-r3.ebuild 39094 RMD160 e9709b80cddda1e4adbe7f4212c199156933ffa2 SHA1 7ac27c6f070c9f4321408c0ac46b34061078086e SHA256 9b64eaae268e6f74ff199c2b554a9e246008ffca8a99d84185d741e283aff012 +MD5 4612564c52a9e74628474eead7b04508 glibc-2.3.5-r3.ebuild 39094 +RMD160 e9709b80cddda1e4adbe7f4212c199156933ffa2 glibc-2.3.5-r3.ebuild 39094 +SHA256 9b64eaae268e6f74ff199c2b554a9e246008ffca8a99d84185d741e283aff012 glibc-2.3.5-r3.ebuild 39094 EBUILD glibc-2.3.6-r3.ebuild 42710 RMD160 5a6ba9bd1e2c6a47115fac3a1ec67da9db06b684 SHA1 97d91cce1fba1432ed7c58639ab041b19985a5f6 SHA256 8965552b0fe2b092bb26ea191c89c8704ca3943a5c523377befb69f9a4c9d2e5 MD5 c2e89fc966f597b9a2fc19e0168e28f4 glibc-2.3.6-r3.ebuild 42710 RMD160 5a6ba9bd1e2c6a47115fac3a1ec67da9db06b684 glibc-2.3.6-r3.ebuild 42710 @@ -546,18 +522,6 @@ EBUILD glibc-2.3.6-r4.ebuild 37076 RMD160 7e09d5223ef21556e86a8438c73d3a23689a69 MD5 f4bd5701854f74732fbdf747875a3d4c glibc-2.3.6-r4.ebuild 37076 RMD160 7e09d5223ef21556e86a8438c73d3a23689a69be glibc-2.3.6-r4.ebuild 37076 SHA256 5e48dfad390635ea9782e198abdd9e93d58feeeda10593a05521cf211abcd1f0 glibc-2.3.6-r4.ebuild 37076 -EBUILD glibc-2.3.6.ebuild 40292 RMD160 8febf77b26885d558aef326d1148fa8c6ba0a1ad SHA1 81d58772e125403f3c060d61976f01bb1d4a32fe SHA256 c5c2827e76d1059e69c83b32f53646b151ad8d0b5f368703ee2c6770b3bd73d1 -MD5 414a857c086d19883215882d92f5c74c glibc-2.3.6.ebuild 40292 -RMD160 8febf77b26885d558aef326d1148fa8c6ba0a1ad glibc-2.3.6.ebuild 40292 -SHA256 c5c2827e76d1059e69c83b32f53646b151ad8d0b5f368703ee2c6770b3bd73d1 glibc-2.3.6.ebuild 40292 -EBUILD glibc-2.4-r1.ebuild 42558 RMD160 603720d28a10bff0c33d145c4aa87c34380aa7a2 SHA1 4761c1cb06b4c423ce5b8d3545cec0097663425e SHA256 414daf601f33fb6035b3390a09148a458c309b8ba0edcd2f5c069ba0586bd6ff -MD5 aff0a528021d5ed69f2887fa79fd2f18 glibc-2.4-r1.ebuild 42558 -RMD160 603720d28a10bff0c33d145c4aa87c34380aa7a2 glibc-2.4-r1.ebuild 42558 -SHA256 414daf601f33fb6035b3390a09148a458c309b8ba0edcd2f5c069ba0586bd6ff glibc-2.4-r1.ebuild 42558 -EBUILD glibc-2.4-r2.ebuild 38570 RMD160 43491d6149dbc31dbd4eda3e537725aa2fb0b794 SHA1 e49fbbccb8bfa1ccd4321ce75b051a77b6c74b43 SHA256 35187f3c3c43a42194215bae79f58e7b054de4ca635b4e9055859444fbbdf79c -MD5 6077b88b117ee136b1c95150bf6f8f6b glibc-2.4-r2.ebuild 38570 -RMD160 43491d6149dbc31dbd4eda3e537725aa2fb0b794 glibc-2.4-r2.ebuild 38570 -SHA256 35187f3c3c43a42194215bae79f58e7b054de4ca635b4e9055859444fbbdf79c glibc-2.4-r2.ebuild 38570 EBUILD glibc-2.4-r3.ebuild 38578 RMD160 a64d07c3eeeb9ebc52b5a4f73dd1bc5d87487419 SHA1 755749d0d70d93fa67545ff22b154219f6da5ecb SHA256 49300f7b832ff77a48de2c3d5fd229580df05ec106bfba2be0b434a863270389 MD5 2fd02d9f0101a90f5557da55e35a2d88 glibc-2.4-r3.ebuild 38578 RMD160 a64d07c3eeeb9ebc52b5a4f73dd1bc5d87487419 glibc-2.4-r3.ebuild 38578 @@ -594,39 +558,18 @@ SHA256 03b369cd9de46452cbc74f690cce61136c34f79d2e8c677b11b201f9dffa3282 files/di MD5 39c880349de6e0508665e6eccae0eb17 files/digest-glibc-2.3.4.20050125-r1 1885 RMD160 900beeef8b73913fb706329848dba78755976909 files/digest-glibc-2.3.4.20050125-r1 1885 SHA256 b83805d1f271204046e74ae55a81d11d8a037b4a29ccd85b4ccc9c9a67d1548d files/digest-glibc-2.3.4.20050125-r1 1885 -MD5 624d53a4e1d8ee6052d9146b1baecb33 files/digest-glibc-2.3.5 1876 -RMD160 85dd7b01b31a0b64e72aeef7036e937cc81ddcce files/digest-glibc-2.3.5 1876 -SHA256 83ee5322eb81af93424b395fa00519410393e87153fae68d8f72daf070ac1951 files/digest-glibc-2.3.5 1876 -MD5 dbbfcd761d39206864294c9d3515c592 files/digest-glibc-2.3.5-r1 1870 -RMD160 97a3efa476ab13225ae185729e315549bab1cf21 files/digest-glibc-2.3.5-r1 1870 -SHA256 7c1853069551f27fc8cfbf8c9965c01aabfb23cd6048412a413c2ae58469fcb7 files/digest-glibc-2.3.5-r1 1870 MD5 dbbfcd761d39206864294c9d3515c592 files/digest-glibc-2.3.5-r2 1870 RMD160 97a3efa476ab13225ae185729e315549bab1cf21 files/digest-glibc-2.3.5-r2 1870 SHA256 7c1853069551f27fc8cfbf8c9965c01aabfb23cd6048412a413c2ae58469fcb7 files/digest-glibc-2.3.5-r2 1870 MD5 5ba9db951648c3fb60e92da639147153 files/digest-glibc-2.3.5-r3 1870 RMD160 6039fe9e29fce7eff6eed73b262f2afc2a7642a4 files/digest-glibc-2.3.5-r3 1870 SHA256 77ccc09d56cf5a8b4a7c2d847eb28074668e0319777e632be7a1c29e33a7db5c files/digest-glibc-2.3.5-r3 1870 -MD5 654fa369b24008cdc59f6697f973b524 files/digest-glibc-2.3.6 1677 -RMD160 a02a70a029a9ae0217bbc34b8cde90b354175cdf files/digest-glibc-2.3.6 1677 -SHA256 f376dabcc15bff26ed7d52f1f665383c9b1c879ba567362784ecdf1f7adc411c files/digest-glibc-2.3.6 1677 -MD5 94bcc07398ebc3b686e0bf2d2fade5a9 files/digest-glibc-2.3.6-r1 1873 -RMD160 02269de01d0549a4d26c197d9bdc22d43cfd215e files/digest-glibc-2.3.6-r1 1873 -SHA256 65aa12d27efd68800228f53d7bd2a28a209a567329f81c43f65ea4e6d8f9bd10 files/digest-glibc-2.3.6-r1 1873 -MD5 e967be06a33d670df445a60c01f33805 files/digest-glibc-2.3.6-r2 1873 -RMD160 19f083a816b4d78d20b23d32188f5f381e4ce531 files/digest-glibc-2.3.6-r2 1873 -SHA256 b21bc3b189e78f3951e3d56c81cb3f12f1ad68d53df65890fe7d647a91184c17 files/digest-glibc-2.3.6-r2 1873 MD5 a9b2d44d0396a4996c59e30664cd3643 files/digest-glibc-2.3.6-r3 1876 RMD160 cc9d6cfcd8541c7dc518560eb50dfd8c61f98ab8 files/digest-glibc-2.3.6-r3 1876 SHA256 8ec9b852e961654f255e4ae73c2fcc51482fb1b0519834688dba4614f8353216 files/digest-glibc-2.3.6-r3 1876 MD5 65ffa2864df0def835bc8a28216a6ca1 files/digest-glibc-2.3.6-r4 1879 RMD160 03e013f6a24b6e4a38611038ed38a6bb54948aa4 files/digest-glibc-2.3.6-r4 1879 SHA256 0a779c01e5f4514e282d060ccfc284939b77132cd76af234bc5fdc5c553f6139 files/digest-glibc-2.3.6-r4 1879 -MD5 7f238701dc80be184d3b46a3babaee2b files/digest-glibc-2.4-r1 1292 -RMD160 2973b76f09f44d280289e9dec583f88ee4c636b2 files/digest-glibc-2.4-r1 1292 -SHA256 2cee383fdb2b7f9d72d4a87fcc9ae92e952f2c5bdf5cf940054bc52cf27df25e files/digest-glibc-2.4-r1 1292 -MD5 7e7d21a148fcd5048ab07fc8190b57d8 files/digest-glibc-2.4-r2 1858 -RMD160 f452d2ba0df3481ee04bfc905c62335b5f4bef05 files/digest-glibc-2.4-r2 1858 -SHA256 6d50f38daf3891071ee27e54352092e358eb2ef39e9b242f0e3f1af44baf82bd files/digest-glibc-2.4-r2 1858 MD5 5524c1eed817c3bc0c2f372b7d4921f6 files/digest-glibc-2.4-r3 1858 RMD160 3e86bb0d977e2bae59d448996978e725e34c38e6 files/digest-glibc-2.4-r3 1858 SHA256 1a332288a00003f21a227e271cfda7c726007fdbe00b5fd66d7ec4fdb73378a8 files/digest-glibc-2.4-r3 1858 diff --git a/sys-libs/glibc/files/digest-glibc-2.3.5 b/sys-libs/glibc/files/digest-glibc-2.3.5 deleted file mode 100644 index 08e5740a4403..000000000000 --- a/sys-libs/glibc/files/digest-glibc-2.3.5 +++ /dev/null @@ -1,21 +0,0 @@ -MD5 607613148fedcfd7af356950ddd2083f glibc-2.3.5-patches-1.4.tar.bz2 19222 -RMD160 8ddfa7b17bbaae91bc6a4c913811e3cd0084e973 glibc-2.3.5-patches-1.4.tar.bz2 19222 -SHA256 92df29d100ae763d188e593a4e64ca11211be99684a82c1095401a0377964ae5 glibc-2.3.5-patches-1.4.tar.bz2 19222 -MD5 93d9c51850e0513aa4846ac0ddcef639 glibc-2.3.5.tar.bz2 13583139 -RMD160 ebdda60cd848fd5b30b5e3345fb481d3c5663540 glibc-2.3.5.tar.bz2 13583139 -SHA256 de97b9c15d75ac86b7a079a20315100a5c9833bb3c217b448913041a5bd988a5 glibc-2.3.5.tar.bz2 13583139 -MD5 2c183c16b572f533d07525472d64cdc7 glibc-fedora-20041219T2331.tar.bz2 761998 -RMD160 cfc859a7e0a904cfb340c832267d3377e850cf6e glibc-fedora-20041219T2331.tar.bz2 761998 -SHA256 e36ffa84388ebb746cb80c37d6fd1acc9e45e07b85c30b0a2ad9f511fae59cec glibc-fedora-20041219T2331.tar.bz2 761998 -MD5 04166455bebb5563bb9a8feca2e3c26c glibc-infopages-2.3.4-r1.tar.bz2 1294898 -RMD160 c72229ee6b3576f507aa8051f273ea9cf1cabaf6 glibc-infopages-2.3.4-r1.tar.bz2 1294898 -SHA256 e8eadffa855ee4ade919daccbaa79e02e7c65688bc0aea9c7337d52827827779 glibc-infopages-2.3.4-r1.tar.bz2 1294898 -MD5 86ae1273e22af8766297ec21c0232743 glibc-libidn-2.3.5.tar.bz2 101118 -RMD160 d54fd0351a4e0dc2c2ea1211bc94b04872addc48 glibc-libidn-2.3.5.tar.bz2 101118 -SHA256 8e06f030b5980a285a33a2b2c0783c36afbf614d5d5925358112d288479275ec glibc-libidn-2.3.5.tar.bz2 101118 -MD5 77011b0898393c56b799bc011a0f37bf glibc-linuxthreads-2.3.5.tar.bz2 236946 -RMD160 b86afc7e2359165704d09c4c3b0d84826c636890 glibc-linuxthreads-2.3.5.tar.bz2 236946 -SHA256 3fec798bb944c2f89f1d95ec7bb38f60e1393c9db0da6bdbb922606e023108b5 glibc-linuxthreads-2.3.5.tar.bz2 236946 -MD5 8c9a699dc6c24afe646ab4fba121a486 glibc-manpages-2.3.5.tar.bz2 22148 -RMD160 ecd70af5f77deaa15a1f97df5c9ba6151e988d86 glibc-manpages-2.3.5.tar.bz2 22148 -SHA256 b49a5cf3996e2671bc8246c9a077016b7d74cdbb8a4f6a6410247fcbe34d2b5a glibc-manpages-2.3.5.tar.bz2 22148 diff --git a/sys-libs/glibc/files/digest-glibc-2.3.5-r1 b/sys-libs/glibc/files/digest-glibc-2.3.5-r1 deleted file mode 100644 index f83a54b82898..000000000000 --- a/sys-libs/glibc/files/digest-glibc-2.3.5-r1 +++ /dev/null @@ -1,21 +0,0 @@ -MD5 f4ca3a5089ab3e49bfb0a47cfbefe70d glibc-2.3.5-patches-1.13.tar.bz2 24793 -RMD160 1940f068e05222738a95baa566a0da78ca8eb3ab glibc-2.3.5-patches-1.13.tar.bz2 24793 -SHA256 167da2eba108780b54e6f6ec8e9c2f4caf30eb65121e916c6d8813bbb46a2216 glibc-2.3.5-patches-1.13.tar.bz2 24793 -MD5 93d9c51850e0513aa4846ac0ddcef639 glibc-2.3.5.tar.bz2 13583139 -RMD160 ebdda60cd848fd5b30b5e3345fb481d3c5663540 glibc-2.3.5.tar.bz2 13583139 -SHA256 de97b9c15d75ac86b7a079a20315100a5c9833bb3c217b448913041a5bd988a5 glibc-2.3.5.tar.bz2 13583139 -MD5 2c183c16b572f533d07525472d64cdc7 glibc-fedora-20041219T2331.tar.bz2 761998 -RMD160 cfc859a7e0a904cfb340c832267d3377e850cf6e glibc-fedora-20041219T2331.tar.bz2 761998 -SHA256 e36ffa84388ebb746cb80c37d6fd1acc9e45e07b85c30b0a2ad9f511fae59cec glibc-fedora-20041219T2331.tar.bz2 761998 -MD5 893b344ace4f554f5c31b614ec7ab003 glibc-infopages-2.3.5.tar.bz2 1273846 -RMD160 14a587e5df98ad113fa1499d2a958efbb47c437a glibc-infopages-2.3.5.tar.bz2 1273846 -SHA256 79a602955e3cf4288fa9967240b397281594acab18c263d2ef864e7d71aa54e1 glibc-infopages-2.3.5.tar.bz2 1273846 -MD5 86ae1273e22af8766297ec21c0232743 glibc-libidn-2.3.5.tar.bz2 101118 -RMD160 d54fd0351a4e0dc2c2ea1211bc94b04872addc48 glibc-libidn-2.3.5.tar.bz2 101118 -SHA256 8e06f030b5980a285a33a2b2c0783c36afbf614d5d5925358112d288479275ec glibc-libidn-2.3.5.tar.bz2 101118 -MD5 77011b0898393c56b799bc011a0f37bf glibc-linuxthreads-2.3.5.tar.bz2 236946 -RMD160 b86afc7e2359165704d09c4c3b0d84826c636890 glibc-linuxthreads-2.3.5.tar.bz2 236946 -SHA256 3fec798bb944c2f89f1d95ec7bb38f60e1393c9db0da6bdbb922606e023108b5 glibc-linuxthreads-2.3.5.tar.bz2 236946 -MD5 8c9a699dc6c24afe646ab4fba121a486 glibc-manpages-2.3.5.tar.bz2 22148 -RMD160 ecd70af5f77deaa15a1f97df5c9ba6151e988d86 glibc-manpages-2.3.5.tar.bz2 22148 -SHA256 b49a5cf3996e2671bc8246c9a077016b7d74cdbb8a4f6a6410247fcbe34d2b5a glibc-manpages-2.3.5.tar.bz2 22148 diff --git a/sys-libs/glibc/files/digest-glibc-2.3.6 b/sys-libs/glibc/files/digest-glibc-2.3.6 deleted file mode 100644 index 800690b34878..000000000000 --- a/sys-libs/glibc/files/digest-glibc-2.3.6 +++ /dev/null @@ -1,19 +0,0 @@ -MD5 aa47d71dc34d2cc6c017fed8fae0d9ac glibc-2.3.6-patches-1.1.tar.bz2 27272 -MD5 bfdce99f82d6dbcb64b7f11c05d6bc96 glibc-2.3.6.tar.bz2 14014977 -RMD160 04b4f71cc3e89581e02ee2dbf5ab05f61e868bf1 glibc-2.3.6.tar.bz2 14014977 -SHA256 e73ff5eddea95d09238b41d3c9c4d9ccddcf99fcc93d04956599c91c704f4a8e glibc-2.3.6.tar.bz2 14014977 -MD5 2c183c16b572f533d07525472d64cdc7 glibc-fedora-20041219T2331.tar.bz2 761998 -RMD160 cfc859a7e0a904cfb340c832267d3377e850cf6e glibc-fedora-20041219T2331.tar.bz2 761998 -SHA256 e36ffa84388ebb746cb80c37d6fd1acc9e45e07b85c30b0a2ad9f511fae59cec glibc-fedora-20041219T2331.tar.bz2 761998 -MD5 1c7fa36de8bdb130e4b697d25cc672cd glibc-infopages-2.3.6.tar.bz2 1298413 -RMD160 5a83ca63c4153e5677797c0c0043aec0b55a6fe3 glibc-infopages-2.3.6.tar.bz2 1298413 -SHA256 651701bb5d8431401fa0f2252ad1cd37f69dc3a2aa28e4ce3405b4417b5e2c22 glibc-infopages-2.3.6.tar.bz2 1298413 -MD5 49dbe06ce830fc73874d6b38bdc5b4db glibc-libidn-2.3.6.tar.bz2 101041 -RMD160 7bc8e8fa310d2ae543802ea036c036c60d09270d glibc-libidn-2.3.6.tar.bz2 101041 -SHA256 99a20232c1ad994e8a6dcd15c34e413eed94e7dd558bed7b832649dce09fb4f2 glibc-libidn-2.3.6.tar.bz2 101041 -MD5 d4eeda37472666a15cc1f407e9c987a9 glibc-linuxthreads-2.3.6.tar.bz2 243534 -RMD160 bb89ac687419cede738314923bc952d191d8d252 glibc-linuxthreads-2.3.6.tar.bz2 243534 -SHA256 6c3bc4a247d1e5308fb14f81956802f09095d3683219859fcad5795aa3aea638 glibc-linuxthreads-2.3.6.tar.bz2 243534 -MD5 0b5f8f3e19c4c4efd1ab15a3823c4538 glibc-manpages-2.3.6-1.tar.bz2 22216 -RMD160 a69fc155366d1b263acecd026718dc536c2b12b8 glibc-manpages-2.3.6-1.tar.bz2 22216 -SHA256 2ba9c7fff2f02f888160dbadd013356fe4a6e9f3d71ac583f5ba6a1d73cb2ab6 glibc-manpages-2.3.6-1.tar.bz2 22216 diff --git a/sys-libs/glibc/files/digest-glibc-2.3.6-r1 b/sys-libs/glibc/files/digest-glibc-2.3.6-r1 deleted file mode 100644 index 3eff77e1c880..000000000000 --- a/sys-libs/glibc/files/digest-glibc-2.3.6-r1 +++ /dev/null @@ -1,21 +0,0 @@ -MD5 43c87f75815f039f999dbc80e556e4ec glibc-2.3.6-patches-1.3.tar.bz2 32154 -RMD160 ce5b23c88c5fb19b6bcd32fcd3eb8b0eda39868a glibc-2.3.6-patches-1.3.tar.bz2 32154 -SHA256 6dbc297b792e8e82299a892a9a45cb0c1decd93cdb854660dd1b0bc9977b0bbd glibc-2.3.6-patches-1.3.tar.bz2 32154 -MD5 bfdce99f82d6dbcb64b7f11c05d6bc96 glibc-2.3.6.tar.bz2 14014977 -RMD160 04b4f71cc3e89581e02ee2dbf5ab05f61e868bf1 glibc-2.3.6.tar.bz2 14014977 -SHA256 e73ff5eddea95d09238b41d3c9c4d9ccddcf99fcc93d04956599c91c704f4a8e glibc-2.3.6.tar.bz2 14014977 -MD5 2c183c16b572f533d07525472d64cdc7 glibc-fedora-20041219T2331.tar.bz2 761998 -RMD160 cfc859a7e0a904cfb340c832267d3377e850cf6e glibc-fedora-20041219T2331.tar.bz2 761998 -SHA256 e36ffa84388ebb746cb80c37d6fd1acc9e45e07b85c30b0a2ad9f511fae59cec glibc-fedora-20041219T2331.tar.bz2 761998 -MD5 1c7fa36de8bdb130e4b697d25cc672cd glibc-infopages-2.3.6.tar.bz2 1298413 -RMD160 5a83ca63c4153e5677797c0c0043aec0b55a6fe3 glibc-infopages-2.3.6.tar.bz2 1298413 -SHA256 651701bb5d8431401fa0f2252ad1cd37f69dc3a2aa28e4ce3405b4417b5e2c22 glibc-infopages-2.3.6.tar.bz2 1298413 -MD5 49dbe06ce830fc73874d6b38bdc5b4db glibc-libidn-2.3.6.tar.bz2 101041 -RMD160 7bc8e8fa310d2ae543802ea036c036c60d09270d glibc-libidn-2.3.6.tar.bz2 101041 -SHA256 99a20232c1ad994e8a6dcd15c34e413eed94e7dd558bed7b832649dce09fb4f2 glibc-libidn-2.3.6.tar.bz2 101041 -MD5 d4eeda37472666a15cc1f407e9c987a9 glibc-linuxthreads-2.3.6.tar.bz2 243534 -RMD160 bb89ac687419cede738314923bc952d191d8d252 glibc-linuxthreads-2.3.6.tar.bz2 243534 -SHA256 6c3bc4a247d1e5308fb14f81956802f09095d3683219859fcad5795aa3aea638 glibc-linuxthreads-2.3.6.tar.bz2 243534 -MD5 0b5f8f3e19c4c4efd1ab15a3823c4538 glibc-manpages-2.3.6-1.tar.bz2 22216 -RMD160 a69fc155366d1b263acecd026718dc536c2b12b8 glibc-manpages-2.3.6-1.tar.bz2 22216 -SHA256 2ba9c7fff2f02f888160dbadd013356fe4a6e9f3d71ac583f5ba6a1d73cb2ab6 glibc-manpages-2.3.6-1.tar.bz2 22216 diff --git a/sys-libs/glibc/files/digest-glibc-2.3.6-r2 b/sys-libs/glibc/files/digest-glibc-2.3.6-r2 deleted file mode 100644 index 246636e29e45..000000000000 --- a/sys-libs/glibc/files/digest-glibc-2.3.6-r2 +++ /dev/null @@ -1,21 +0,0 @@ -MD5 8d717d2071a5c3dbde4ecf8c397d617c glibc-2.3.6-patches-1.4.tar.bz2 32540 -RMD160 0bc7104122cea654b7b13d9dc867a3c0ce9c1c7c glibc-2.3.6-patches-1.4.tar.bz2 32540 -SHA256 0fa384e3b7c0ca282a5e9c7ee88bc667f11ca8fbca04ded468caae3d91609fde glibc-2.3.6-patches-1.4.tar.bz2 32540 -MD5 bfdce99f82d6dbcb64b7f11c05d6bc96 glibc-2.3.6.tar.bz2 14014977 -RMD160 04b4f71cc3e89581e02ee2dbf5ab05f61e868bf1 glibc-2.3.6.tar.bz2 14014977 -SHA256 e73ff5eddea95d09238b41d3c9c4d9ccddcf99fcc93d04956599c91c704f4a8e glibc-2.3.6.tar.bz2 14014977 -MD5 2c183c16b572f533d07525472d64cdc7 glibc-fedora-20041219T2331.tar.bz2 761998 -RMD160 cfc859a7e0a904cfb340c832267d3377e850cf6e glibc-fedora-20041219T2331.tar.bz2 761998 -SHA256 e36ffa84388ebb746cb80c37d6fd1acc9e45e07b85c30b0a2ad9f511fae59cec glibc-fedora-20041219T2331.tar.bz2 761998 -MD5 1c7fa36de8bdb130e4b697d25cc672cd glibc-infopages-2.3.6.tar.bz2 1298413 -RMD160 5a83ca63c4153e5677797c0c0043aec0b55a6fe3 glibc-infopages-2.3.6.tar.bz2 1298413 -SHA256 651701bb5d8431401fa0f2252ad1cd37f69dc3a2aa28e4ce3405b4417b5e2c22 glibc-infopages-2.3.6.tar.bz2 1298413 -MD5 49dbe06ce830fc73874d6b38bdc5b4db glibc-libidn-2.3.6.tar.bz2 101041 -RMD160 7bc8e8fa310d2ae543802ea036c036c60d09270d glibc-libidn-2.3.6.tar.bz2 101041 -SHA256 99a20232c1ad994e8a6dcd15c34e413eed94e7dd558bed7b832649dce09fb4f2 glibc-libidn-2.3.6.tar.bz2 101041 -MD5 d4eeda37472666a15cc1f407e9c987a9 glibc-linuxthreads-2.3.6.tar.bz2 243534 -RMD160 bb89ac687419cede738314923bc952d191d8d252 glibc-linuxthreads-2.3.6.tar.bz2 243534 -SHA256 6c3bc4a247d1e5308fb14f81956802f09095d3683219859fcad5795aa3aea638 glibc-linuxthreads-2.3.6.tar.bz2 243534 -MD5 0b5f8f3e19c4c4efd1ab15a3823c4538 glibc-manpages-2.3.6-1.tar.bz2 22216 -RMD160 a69fc155366d1b263acecd026718dc536c2b12b8 glibc-manpages-2.3.6-1.tar.bz2 22216 -SHA256 2ba9c7fff2f02f888160dbadd013356fe4a6e9f3d71ac583f5ba6a1d73cb2ab6 glibc-manpages-2.3.6-1.tar.bz2 22216 diff --git a/sys-libs/glibc/files/digest-glibc-2.4-r1 b/sys-libs/glibc/files/digest-glibc-2.4-r1 deleted file mode 100644 index 4491cdd88b2b..000000000000 --- a/sys-libs/glibc/files/digest-glibc-2.4-r1 +++ /dev/null @@ -1,15 +0,0 @@ -MD5 a367eb55060cb285a8b73d68cf031a36 glibc-2.4-patches-1.3.tar.bz2 106325 -RMD160 44c515536754d10be15731285842de7638136d13 glibc-2.4-patches-1.3.tar.bz2 106325 -SHA256 76b74f08a3ba10f219af2221951b0d402fc78f08a4613767c3a5ad4937c70d93 glibc-2.4-patches-1.3.tar.bz2 106325 -MD5 7e9a88dcd41fbc53801dbe5bdacaf245 glibc-2.4.tar.bz2 15202445 -RMD160 ee2712a0e6fab8e086958c1f23221f8d07af3de1 glibc-2.4.tar.bz2 15202445 -SHA256 27aaaaa78b4ab5da76bb29385dc9be087ba7b855a9102eaaa78ce3ec5e2e7fcd glibc-2.4.tar.bz2 15202445 -MD5 f4732d93d3749c864b1909e9f9d39524 glibc-fedora-20060306T1239.tar.bz2 728767 -RMD160 d59c8601340fde01e3a5a5b0613d3051a7e8fd9c glibc-fedora-20060306T1239.tar.bz2 728767 -SHA256 37794c31136164c41d0495788255badc23e7b6c347a6c97dfb4bf75e028cec29 glibc-fedora-20060306T1239.tar.bz2 728767 -MD5 e2d892b40d654c523ab26a26b7dd86a1 glibc-libidn-2.4.tar.bz2 102305 -RMD160 76b2e15e7613c4ac8db3bf90e90929c0e369ab04 glibc-libidn-2.4.tar.bz2 102305 -SHA256 2f29ec2b2b2f75f787a1eed8fdea20aff212dc3bad97651ca376914c49181977 glibc-libidn-2.4.tar.bz2 102305 -MD5 7bb1b35654e94994925e66676acabd4e glibc-ports-2.4.tar.bz2 381472 -RMD160 72987098f9fbd5a1ad617bf2136081c0db80a429 glibc-ports-2.4.tar.bz2 381472 -SHA256 2fbbcaad8a9f8560485c398a9066959fe2713c8bc7e653ec476fb56fed21d19a glibc-ports-2.4.tar.bz2 381472 diff --git a/sys-libs/glibc/files/digest-glibc-2.4-r2 b/sys-libs/glibc/files/digest-glibc-2.4-r2 deleted file mode 100644 index d374976b30bf..000000000000 --- a/sys-libs/glibc/files/digest-glibc-2.4-r2 +++ /dev/null @@ -1,21 +0,0 @@ -MD5 619290a9cc1c21330bc4620481c74fdb glibc-2.4-patches-1.13.tar.bz2 120328 -RMD160 2e16b87403b6560d7e379a8f7267af171a145afb glibc-2.4-patches-1.13.tar.bz2 120328 -SHA256 fb6e73dadf2cb115471b34bb47181c9c922efe41d3d9c65177684ee535960604 glibc-2.4-patches-1.13.tar.bz2 120328 -MD5 7e9a88dcd41fbc53801dbe5bdacaf245 glibc-2.4.tar.bz2 15202445 -RMD160 ee2712a0e6fab8e086958c1f23221f8d07af3de1 glibc-2.4.tar.bz2 15202445 -SHA256 27aaaaa78b4ab5da76bb29385dc9be087ba7b855a9102eaaa78ce3ec5e2e7fcd glibc-2.4.tar.bz2 15202445 -MD5 4614be8c9cb9dad6d1caef6d3ce96b46 glibc-fedora-20060501T0751.tar.bz2 727641 -RMD160 4f6eeeac6f315a26c1a64f2c35587eca9106ef2d glibc-fedora-20060501T0751.tar.bz2 727641 -SHA256 cfba2cded39fbd42643eaa1f1795221e0b11a503beec7d66ba31f3728526efec glibc-fedora-20060501T0751.tar.bz2 727641 -MD5 e2d892b40d654c523ab26a26b7dd86a1 glibc-libidn-2.4.tar.bz2 102305 -RMD160 76b2e15e7613c4ac8db3bf90e90929c0e369ab04 glibc-libidn-2.4.tar.bz2 102305 -SHA256 2f29ec2b2b2f75f787a1eed8fdea20aff212dc3bad97651ca376914c49181977 glibc-libidn-2.4.tar.bz2 102305 -MD5 b021d19b29b8cfef2d36ef52bc1188eb glibc-linuxthreads-20060508.tar.bz2 247271 -RMD160 8e964693b730188cb308927782b6eacde50e46a6 glibc-linuxthreads-20060508.tar.bz2 247271 -SHA256 05da1929a6726b5358c30295c0860f8f87692eab67d1237b0b5bba51c9306269 glibc-linuxthreads-20060508.tar.bz2 247271 -MD5 7bb1b35654e94994925e66676acabd4e glibc-ports-2.4.tar.bz2 381472 -RMD160 72987098f9fbd5a1ad617bf2136081c0db80a429 glibc-ports-2.4.tar.bz2 381472 -SHA256 2fbbcaad8a9f8560485c398a9066959fe2713c8bc7e653ec476fb56fed21d19a glibc-ports-2.4.tar.bz2 381472 -MD5 f576b5601b86a89165c17fdddb92d1cc glibc-powerpc-cpu-addon-v0.01.tgz 22422 -RMD160 3483c94ec55819b36aa66fc60462317f8d15e4df glibc-powerpc-cpu-addon-v0.01.tgz 22422 -SHA256 0ffa9a432fffb9bfed99c529b631a27534ba848c7ec1d707732338b73a4a8ce9 glibc-powerpc-cpu-addon-v0.01.tgz 22422 diff --git a/sys-libs/glibc/glibc-2.3.5-r1.ebuild b/sys-libs/glibc/glibc-2.3.5-r1.ebuild deleted file mode 100644 index 3cc41873dd48..000000000000 --- a/sys-libs/glibc/glibc-2.3.5-r1.ebuild +++ /dev/null @@ -1,1345 +0,0 @@ -# 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.3.5-r1.ebuild,v 1.53 2006/05/30 19:45:22 eradicator Exp $ - -# Here's how the cross-compile logic breaks down ... -# CTARGET - machine that will target the binaries -# CHOST - machine that will host the binaries -# CBUILD - machine that will build the binaries -# If CTARGET != CHOST, it means you want a libc for cross-compiling. -# If CHOST != CBUILD, it means you want to cross-compile the libc. -# CBUILD = CHOST = CTARGET - native build/install -# CBUILD != (CHOST = CTARGET) - cross-compile a native build -# (CBUILD = CHOST) != CTARGET - libc for cross-compiler -# CBUILD != CHOST != CTARGET - cross-compile a libc for a cross-compiler -# For install paths: -# CHOST = CTARGET - install into / -# CHOST != CTARGET - install into /usr/CTARGET/ - -KEYWORDS="-* amd64 arm -hppa ~ia64 m68k ~mips ~ppc ~ppc64 ~s390 sh ~sparc x86" - -BRANCH_UPDATE="" - -# From linuxthreads/man -GLIBC_MANPAGE_VERSION="2.3.5" - -# From manual -GLIBC_INFOPAGE_VERSION="2.3.5" - -# Gentoo patchset -PATCH_VER="1.13" - -# C Stubbs addon (contained in fedora, so ignoring) -#CSTUBS_VER="2.1.2" -#CSTUBS_TARBALL="c_stubs-${CSTUBS_VER}.tar.bz2" -#CSTUBS_URI="mirror://gentoo/${CSTUBS_TARBALL}" - -# Fedora addons (from RHEL's glibc-2.3.4-2.src.rpm) -FEDORA_VER="20041219T2331" -FEDORA_TARBALL="glibc-fedora-${FEDORA_VER}.tar.bz2" -FEDORA_URI="mirror://gentoo/${FEDORA_TARBALL}" - -GENTOO_TOOLCHAIN_BASE_URI="mirror://gentoo" - -### PUNT OUT TO ECLASS?? ### -inherit eutils versionator libtool toolchain-funcs flag-o-matic gnuconfig multilib - -DESCRIPTION="GNU libc6 (also called glibc2) C library" -HOMEPAGE="http://www.gnu.org/software/libc/libc.html" -LICENSE="LGPL-2" - -IUSE="nls pic build nptl nptlonly erandom hardened userlocales multilib selinux glibc-compat20 glibc-omitfp linuxthreads-tls profile" - -export CBUILD=${CBUILD:-${CHOST}} -export CTARGET=${CTARGET:-${CHOST}} -if [[ ${CTARGET} == ${CHOST} ]] ; then - if [[ ${CATEGORY/cross-} != ${CATEGORY} ]] ; then - export CTARGET=${CATEGORY/cross-} - fi -fi -if [[ ${CTARGET} == ${CHOST} ]] ; then - PROVIDE="virtual/libc" -fi - -is_crosscompile() { - [[ ${CHOST} != ${CTARGET} ]] -} - -GLIBC_RELEASE_VER=$(get_version_component_range 1-3) - -# Don't set this to :-, - allows BRANCH_UPDATE="" -BRANCH_UPDATE=${BRANCH_UPDATE-$(get_version_component_range 4)} - -# (Recent snapshots fails with 2.6.5 and earlier with NPTL) -NPTL_KERNEL_VERSION=${NPTL_KERNEL_VERSION:-"2.6.6"} -LT_KERNEL_VERSION=${LT_KERNEL_VERSION:-"2.4.1"} - -### SRC_URI ### - -# This function handles the basics of setting the SRC_URI for a glibc ebuild. -# To use, set SRC_URI with: -# -# SRC_URI="$(get_glibc_src_uri)" -# -# Other than the variables normally set by portage, this function's behavior -# can be altered by setting the following: -# -# GENTOO_TOOLCHAIN_BASE_URI -# This sets the base URI for all gentoo-specific patch files. Note -# that this variable is only important for a brief period of time, -# before your source files get picked up by mirrors. However, it is -# still highly suggested that you keep files in this location -# available. -# -# BRANCH_UPDATE -# If set, this variable signals that we should be using the main -# release tarball (determined by ebuild version) and applying a -# CVS branch update patch against it. The location of this branch -# update patch is assumed to be in ${GENTOO_TOOLCHAIN_BASE_URI}. -# Just like with SNAPSHOT, this variable is ignored if the ebuild -# has a _pre suffix. -# -# PATCH_VER -# PATCH_GLIBC_VER -# This should be set to the version of the gentoo patch tarball. -# The resulting filename of this tarball will be: -# ${PN}-${PATCH_GLIBC_VER:-${GLIBC_RELEASE_VER}}-patches-${PATCH_VER}.tar.bz2 -# -# GLIBC_MANPAGE_VERSION -# GLIBC_INFOPAGE_VERSION -# The version of glibc for which we will download pages. This will -# default to ${GLIBC_RELEASE_VER}, but we may not want to pre-generate man pages -# for prerelease test ebuilds for example. This allows you to -# continue using pre-generated manpages from the last stable release. -# If set to "none", this will prevent the downloading of manpages, -# which is useful for individual library targets. -# -get_glibc_src_uri() { - # This variable should be set to the devspace of whoever is currently - # maintaining GLIBC. Please dont set this to mirror, that would just - # make the files unavailable until they get mirrored. - local devspace_uri="mirror://gentoo/" - GENTOO_TOOLCHAIN_BASE_URI=${GENTOO_TOOLCHAIN_BASE_URI:-${devspace_uri}} - -# GLIBC_SRC_URI="http://ftp.gnu.org/gnu/glibc/${PN}-${GLIBC_RELEASE_VER}.tar.bz2 -# http://ftp.gnu.org/gnu/glibc/${PN}-linuxthreads-${GLIBC_RELEASE_VER}.tar.bz2 -# http://ftp.gnu.org/gnu/glibc/${PN}-libidn-${GLIBC_RELEASE_VER}.tar.bz2 - GLIBC_SRC_URI="mirror://gnu/glibc/${PN}-${GLIBC_RELEASE_VER}.tar.bz2 - mirror://gnu/glibc/${PN}-linuxthreads-${GLIBC_RELEASE_VER}.tar.bz2 - mirror://gnu/glibc/${PN}-libidn-${GLIBC_RELEASE_VER}.tar.bz2" - - if [[ -n ${BRANCH_UPDATE} ]] ; then - GLIBC_SRC_URI="${GLIBC_SRC_URI} - ${GENTOO_TOOLCHAIN_BASE_URI}/${PN}-${GLIBC_RELEASE_VER}-branch-update-${BRANCH_UPDATE}.patch.bz2" - fi - - if [[ -n ${PATCH_VER} ]] ; then - GLIBC_SRC_URI="${GLIBC_SRC_URI} - ${GENTOO_TOOLCHAIN_BASE_URI}/${PN}-${PATCH_GLIBC_VER:-${GLIBC_RELEASE_VER}}-patches-${PATCH_VER}.tar.bz2" - fi - - if [[ ${GLIBC_MANPAGE_VERSION} != "none" ]] ; then - GLIBC_SRC_URI="${GLIBC_SRC_URI} - ${GENTOO_TOOLCHAIN_BASE_URI}/${PN}-manpages-${GLIBC_MANPAGE_VERSION:-${GLIBC_RELEASE_VER}}.tar.bz2" - fi - - if [[ ${GLIBC_INFOPAGE_VERSION} != "none" ]] ; then - GLIBC_SRC_URI="${GLIBC_SRC_URI} - ${GENTOO_TOOLCHAIN_BASE_URI}/${PN}-infopages-${GLIBC_INFOPAGE_VERSION:-${GLIBC_RELEASE_VER}}.tar.bz2" - fi - - if [[ -n ${CSTUBS_URI} ]] ; then - GLIBC_SRC_URI="${GLIBC_SRC_URI} ${CSTUBS_URI}" - fi - - if [[ -n ${FEDORA_URI} ]] ; then - GLIBC_SRC_URI="${GLIBC_SRC_URI} ${FEDORA_URI}" - fi - - echo "${GLIBC_SRC_URI}" -} - -SRC_URI=$(get_glibc_src_uri) -S=${WORKDIR}/${PN}-${GLIBC_RELEASE_VER} - -### EXPORTED FUNCTIONS ### -toolchain-glibc_src_unpack() { - # Check NPTL support _before_ we unpack things to save some time - want_nptl && check_nptl_support - - unpack ${PN}-${GLIBC_RELEASE_VER}.tar.bz2 - - cd "${S}" - unpack ${PN}-linuxthreads-${GLIBC_RELEASE_VER}.tar.bz2 - unpack ${PN}-libidn-${GLIBC_RELEASE_VER}.tar.bz2 - - [[ -n ${CSTUBS_TARBALL} ]] && unpack ${CSTUBS_TARBALL} - [[ -n ${FEDORA_TARBALL} ]] && unpack ${FEDORA_TARBALL} - - if [[ -n ${PATCH_VER} ]] ; then - cd "${WORKDIR}" - unpack ${PN}-${PATCH_GLIBC_VER:-${GLIBC_RELEASE_VER}}-patches-${PATCH_VER}.tar.bz2 - fi - - # XXX: We should do the branchupdate, before extracting the manpages and - # infopages else it does not help much (mtimes change if there is a change - # to them with branchupdate) - if [[ -n ${BRANCH_UPDATE} ]] ; then - cd "${S}" - epatch "${DISTDIR}"/${PN}-${GLIBC_RELEASE_VER}-branch-update-${BRANCH_UPDATE}.patch.bz2 - - # Snapshot date patch - einfo "Patching version to display snapshot date ..." - sed -i -e "s:\(#define RELEASE\).*:\1 \"${BRANCH_UPDATE}\":" version.h - fi - - if [[ ${GLIBC_MANPAGE_VERSION} != "none" ]] ; then - cd "${WORKDIR}" - unpack ${PN}-manpages-${GLIBC_MANPAGE_VERSION:-${GLIBC_RELEASE_VER}}.tar.bz2 - fi - - if [[ ${GLIBC_INFOPAGE_VERSION} != "none" ]] ; then - cd "${S}" - unpack ${PN}-infopages-${GLIBC_INFOPAGE_VERSION:-${GLIBC_RELEASE_VER}}.tar.bz2 - fi - - if [[ -n ${PATCH_VER} ]] ; then - cd "${S}" - EPATCH_MULTI_MSG="Applying Gentoo Glibc Patchset ${PATCH_GLIBC_VER:-${GLIBC_RELEASE_VER}}-${PATCH_VER} ..." \ - EPATCH_EXCLUDE=${GLIBC_PATCH_EXCLUDE} \ - EPATCH_SUFFIX="patch" \ - ARCH=$(tc-arch) \ - epatch "${WORKDIR}"/patches - fi -} - -toolchain-glibc_src_compile() { - # Set gconvdir to /usr/$(get_libdir)/gconv on archs with multiple ABIs - local MAKEFLAGS="" - has_multilib_profile && MAKEFLAGS="gconvdir=$(alt_usrlibdir)/gconv" - - echo - for v in ABI CBUILD CHOST CTARGET CBUILD_OPT CTARGET_OPT CC CFLAGS ; do - einfo " $(printf '%15s' ${v}:) ${!v}" - done - echo - - if want_linuxthreads ; then - glibc_do_configure linuxthreads - einfo "Building GLIBC with linuxthreads..." - make PARALLELMFLAGS="${MAKEOPTS} -j1" ${MAKEFLAGS} || die - fi - if want_nptl ; then - # ... and then do the optional nptl build - unset LD_ASSUME_KERNEL - glibc_do_configure nptl - einfo "Building GLIBC with NPTL..." - make PARALLELMFLAGS="${MAKEOPTS} -j1" ${MAKEFLAGS} || die - fi -} - -toolchain-glibc_src_test() { - # This is wrong, but glibc's tests fail bad when screwing - # around with sandbox, so lets just punt it - unset LD_PRELOAD - - # do the linuxthreads build unless we're using nptlonly - if want_linuxthreads ; then - cd "${WORKDIR}"/build-${ABI}-${CTARGET}-linuxthreads - einfo "Checking GLIBC with linuxthreads..." - make check || die "linuxthreads glibc did not pass make check" - fi - if want_nptl ; then - cd "${WORKDIR}"/build-${ABI}-${CTARGET}-nptl - unset LD_ASSUME_KERNEL || : - einfo "Checking GLIBC with NPTL..." - make check || die "nptl glibc did not pass make check" - fi -} - -toolchain-glibc_pkg_preinst() { - # PPC64+others may want to eventually be added to this logic if they - # decide to be multilib compatible and FHS compliant. note that this - # chunk of FHS compliance only applies to 64bit archs where 32bit - # compatibility is a major concern (not IA64, for example). - - # amd64's 2005.0 is the first amd64 profile to not need this code. - # 2005.0 is setup properly, and this is executed as part of the - # 2004.3 -> 2005.0 upgrade script. - # 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 ]] && ! { want_nptl && want_linuxthreads; }; then - addwrite "${ROOT}"/$(alt_libdir)/ - ewarn "nptlonly or -nptl in USE, removing /${ROOT}$(alt_libdir)/tls..." - rm -r "${ROOT}"/$(alt_libdir)/tls || die - fi - - # Shouldnt need to keep this updated - [[ -e ${ROOT}/etc/locales.build ]] && rm -f "${D}"/etc/locales.build -} - -toolchain-glibc_src_install() { - # Need to dodir first because it might not exist (bad amd64 profiles) - dodir $(alt_usrlibdir) - - # These should not be set, else the - # zoneinfo do not always get installed ... - unset LANGUAGE LANG LC_ALL - - if want_linuxthreads ; then - cd "${WORKDIR}"/build-${ABI}-${CTARGET}-linuxthreads - einfo "Installing GLIBC ${ABI} with linuxthreads ..." - make PARALLELMFLAGS="${MAKEOPTS} -j1" \ - install_root="${D}" \ - install || die - else # nptlonly - cd "${WORKDIR}"/build-${ABI}-${CTARGET}-nptl - einfo "Installing GLIBC ${ABI} with NPTL ..." - make PARALLELMFLAGS="${MAKEOPTS} -j1" \ - install_root="${D}" \ - install || die - fi - - if is_crosscompile ; then - # Glibc doesn't setup multilib crosscompiled dirs right, but it - # sets up native multilib dirs right, so just do this when we - # crosscompile. - if [[ $(get_libdir) != "lib" && -d ${D}$(alt_prefix)/lib ]] ; then - dodir $(alt_libdir) - mv "${D}"$(alt_prefix)/lib/* "${D}"$(alt_libdir) - fi - - # punt all the junk not needed by a cross-compiler - rm -rf "${D}"$(alt_prefix)/{bin,etc,$(get_libdir)/gconv,sbin,share} - fi - - if want_linuxthreads && want_nptl ; then - einfo "Installing NPTL to $(alt_libdir)/tls/..." - cd "${WORKDIR}"/build-${ABI}-${CTARGET}-nptl - mkdir -p "${D}"$(alt_libdir)/tls/ - - libcsofile=$(basename "${D}"$(alt_libdir)/libc-*.so) - cp -a libc.so "${D}"$(alt_libdir)/tls/${libcsofile} || die - dosym ${libcsofile} $(alt_libdir)/tls/$(ls libc.so.*) - - libmsofile=$(basename "${D}"$(alt_libdir)/libm-*.so) - pushd math > /dev/null - cp -a libm.so "${D}"$(alt_libdir)/tls/${libmsofile} || die - dosym ${libmsofile} $(alt_libdir)/tls/$(ls libm.so.*) - popd > /dev/null - - librtsofile=$(basename "${D}"$(alt_libdir)/librt-*.so) - pushd rt > /dev/null - cp -a librt.so "${D}"$(alt_libdir)/tls/${librtsofile} || die - dosym ${librtsofile} $(alt_libdir)/tls/$(ls librt.so.*) - popd > /dev/null - - libthreaddbsofile=$(basename "${D}"$(alt_libdir)/libthread_db-*.so) - pushd nptl_db > /dev/null - cp -a libthread_db.so "${D}"$(alt_libdir)/tls/${libthreaddbsofile} || die - dosym ${libthreaddbsofile} $(alt_libdir)/tls/$(ls libthread_db.so.*) - popd > /dev/null - - libpthreadsofile=libpthread-${GLIBC_RELEASE_VER}.so - cp -a nptl/libpthread.so "${D}"$(alt_libdir)/tls/${libpthreadsofile} || die - dosym ${libpthreadsofile} $(alt_libdir)/tls/libpthread.so.0 - - # and now for the static libs - mkdir -p "${D}"$(alt_usrlibdir)/nptl - cp -a libc.a nptl/libpthread.a nptl/libpthread_nonshared.a rt/librt.a \ - "${D}"$(alt_usrlibdir)/nptl - - # linker script crap - for lib in libc libpthread; do - sed -e "s:$(alt_libdir)/${lib}.so:$(alt_libdir)/tls/${lib}.so:g" \ - -e "s:$(alt_usrlibdir)/${lib}_nonshared.a:$(alt_usrlibdir)/nptl/${lib}_nonshared.a:g" \ - "${D}"$(alt_usrlibdir)/${lib}.so \ - > "${D}"$(alt_usrlibdir)/nptl/${lib}.so - - chmod 755 "${D}"$(alt_usrlibdir)/nptl/${lib}.so - done - - dosym ../librt.so $(alt_usrlibdir)/nptl/librt.so - - # last but not least... headers. - mkdir -p "${D}"/nptl "${D}"$(alt_headers)/nptl - make install_root="${D}"/nptl install-headers PARALLELMFLAGS="${MAKEOPTS} -j1" - pushd "${D}"/nptl/$(alt_headers) > /dev/null - for i in $(find . -type f) ; do - if ! [[ -f ${D}$(alt_headers)/$i ]] \ - || ! cmp -s $i ${D}$(alt_headers)/$i; then - mkdir -p ${D}$(alt_headers)/nptl/`dirname $i` - cp -a $i ${D}$(alt_headers)/nptl/$i - fi - done - popd > /dev/null - rm -rf ${D}/nptl - fi - - if use pic && [[ $(tc-arch) != "amd64" ]] ; then - find ${S}/${buildtarget}/ -name "soinit.os" -exec cp {} ${D}$(alt_libdir)/soinit.o \; - find ${S}/${buildtarget}/ -name "sofini.os" -exec cp {} ${D}$(alt_libdir)/sofini.o \; - find ${S}/${buildtarget}/ -name "*_pic.a" -exec cp {} ${D}$(alt_libdir) \; - find ${S}/${buildtarget}/ -name "*.map" -exec cp {} ${D}$(alt_libdir) \; - - for i in ${D}$(alt_libdir)/*.map; do - mv ${i} ${i%.map}_pic.map - done - fi - - # We'll take care of the cache ourselves - rm -f ${D}/etc/ld.so.cache - - # Some things want this, notably ash. - dosym libbsd-compat.a $(alt_usrlibdir)/libbsd.a - - # Handle includes for different ABIs - prep_ml_includes $(alt_headers) - - ################################################################# - # EVERYTHING AFTER THIS POINT IS FOR NATIVE GLIBC INSTALLS ONLY # - # Make sure we install the sys-include symlink so that when - # we build a 2nd stage cross-compiler, gcc finds the target - # system headers correctly. See gcc/doc/gccinstall.info - if is_crosscompile ; then - dosym include $(alt_prefix)/sys-include - dosym . $(alt_prefix)/usr - return 0 - fi - - # Everything past this point just needs to be done once... don't waste time building locale files twice... - is_final_abi || return 0 - - if want_linuxthreads ; then - MYMAINBUILDDIR=build-${ABI}-${CTARGET}-linuxthreads - else - MYMAINBUILDDIR=build-${ABI}-${CTARGET}-nptl - fi - cd "${WORKDIR}"/${MYMAINBUILDDIR} - if ! use build ; then - if ! has noinfo ${FEATURES} && [[ ${GLIBC_INFOPAGE_VERSION} != "none" ]] ; then - einfo "Installing info pages..." - - make PARALLELMFLAGS="${MAKEOPTS} -j1" \ - install_root=${D} \ - info -i - fi - - setup_locales - - if [[ ${GLIBC_MANPAGE_VERSION} != "none" ]] ; then - einfo "Installing man pages..." - - # Install linuxthreads man pages even if nptl is enabled - cd "${WORKDIR}"/man - doman *.3thr - fi - - # Install nscd config file - insinto /etc - doins ${FILESDIR}/nscd.conf - doins "${FILESDIR}"/nsswitch.conf - - doinitd "${FILESDIR}"/nscd - - cd ${S} - dodoc BUGS ChangeLog* CONFORMANCE FAQ INTERFACE NEWS NOTES PROJECTS README* - else - rm -rf ${D}/usr/share - for dir in $(get_all_libdirs); do - rm -rf ${D}/usr/${dir}/gconv &> /dev/null - done - - einfo "Installing Timezone data..." - make PARALLELMFLAGS="${MAKEOPTS} -j1" \ - install_root=${D} \ - timezone/install-others || die - fi - - # Is this next line actually needed or does the makefile get it right? - # It previously has 0755 perms which was killing things. - fperms 4711 $(alt_prefix)/lib/misc/glibc/pt_chown - - # Prevent overwriting of the /etc/localtime symlink. We'll handle the - # creation of the "factory" symlink in pkg_postinst(). - rm -f ${D}/etc/localtime - - insinto /etc - # This is our new config file for building locales - doins ${FILESDIR}/locales.build - # example host.conf with multicast dns disabled by default - doins ${FILESDIR}/2.3.4/host.conf - - # simple test to make sure our new glibc isnt completely broken. - # for now, skip the multilib scenario. also make sure we don't - # test with statically built binaries since they will fail. - [[ ${CBUILD} != ${CHOST} ]] && return 0 - [[ $(get_libdir) != "lib" ]] && return 0 - for x in date env ls true uname ; do - x=$(type -p ${x}) - [[ -z ${x} ]] && continue - striptest=$(file -L ${x} 2>/dev/null) - [[ -z ${striptest} ]] && continue - [[ ${striptest/statically linked} != "${striptest}" ]] && continue - "${D}"/$(get_libdir)/ld-*.so \ - --library-path "${D}"/$(get_libdir) \ - ${x} > /dev/null \ - || die "simple run test (${x}) failed" - done -} - -toolchain-glibc_pkg_postinst() { - # Mixing nptlonly and -nptlonly glibc can prove dangerous if libpthread - # isn't removed in unmerge which happens sometimes. See bug #87671 - if ! is_crosscompile && want_linuxthreads ; then - for libdir in $(get_all_libdirs) ; do - for f in ${ROOT}/${libdir}/libpthread-2.* ${ROOT}/${libdir}/libpthread-0.6* ; do - if [[ -f ${f} ]] ; then - rm -f ${f} - ldconfig - fi - done - done - fi - - # Correct me if I am wrong here, but my /etc/localtime is a file - # created by zic .... - # I am thinking that it should only be recreated if no /etc/localtime - # exists, or if it is an invalid symlink. - # - # For invalid symlink: - # -f && -e will fail - # -L will succeed - # - if [ ! -e "${ROOT}/etc/localtime" ] ; then - echo "Please remember to set your timezone using the zic command." - rm -f ${ROOT}/etc/localtime - ln -s ../usr/share/zoneinfo/Factory ${ROOT}/etc/localtime - fi - - if ! is_crosscompile && [ -x "${ROOT}/usr/sbin/iconvconfig" ] ; then - # Generate fastloading iconv module configuration file. - ${ROOT}/usr/sbin/iconvconfig --prefix=${ROOT} - fi - - if [ ! -e "${ROOT}/lib/ld.so.1" ] && use ppc64 && ! has_multilib_profile ; then - ## SHOULDN'T THIS BE lib64?? - ln -s ld64.so.1 ${ROOT}/lib/ld.so.1 - fi - - # Reload init ... - if ! is_crosscompile && [ "${ROOT}" = "/" ] ; then - /sbin/init U &> /dev/null - fi - - # warn the few multicast-dns-by-default users we've had about the change - # in behavior... - echo - einfo "Gentoo's glibc now disables multicast dns by default in our" - einfo "example host.conf. To re-enable this functionality, simply" - einfo "remove the line that disables it (mdns off)." - echo - - if want_nptl && want_linuxthreads ; then - einfo "The default behavior of glibc on your system is to use NPTL. If" - einfo "you want to use linuxthreads for a particular program, start it" - einfo "by executing 'LD_ASSUME_KERNEL=${LT_KERNEL_VERSION} []'" - echo - fi -} - -### SUPPORT FUNCTIONS ### -# We need to be able to set alternative headers for -# compiling for non-native platform -# Will also become useful for testing kernel-headers without screwing up -# the whole system. -# note: intentionally undocumented. -alt_headers() { - if [[ -z ${ALT_HEADERS} ]] ; then - if is_crosscompile ; then - ALT_HEADERS="/usr/${CTARGET}/include" - else - ALT_HEADERS="/usr/include" - fi - fi - echo "${ALT_HEADERS}" -} -alt_build_headers() { - if [[ -z ${ALT_BUILD_HEADERS} ]] ; then - ALT_BUILD_HEADERS=$(alt_headers) - tc-is-cross-compiler && ALT_BUILD_HEADERS=${ROOT}$(alt_headers) - fi - echo "${ALT_BUILD_HEADERS}" -} - -alt_prefix() { - if is_crosscompile ; then - echo /usr/${CTARGET} - else - echo /usr - fi -} - -alt_libdir() { - if is_crosscompile ; then - echo /usr/${CTARGET}/$(get_libdir) - else - echo /$(get_libdir) - fi -} - -alt_usrlibdir() { - if is_crosscompile ; then - echo /usr/${CTARGET}/$(get_libdir) - else - echo /usr/$(get_libdir) - fi -} - -setup_flags() { - # Over-zealous CFLAGS can often cause problems. What may work for one - # person may not work for another. To avoid a large influx of bugs - # relating to failed builds, we strip most CFLAGS out to ensure as few - # problems as possible. - strip-flags - strip-unsupported-flags - filter-flags -m32 -m64 -mabi=* - - has_multilib_profile && CTARGET_OPT=$(get_abi_CHOST) - - case $(tc-arch) in - amd64) - CFLAGS_x86="-m32" - ;; - ppc) - append-flags "-freorder-blocks" - ;; - sparc) - # Both sparc and sparc64 can use -fcall-used-g6. -g7 is bad, though. - filter-flags "-fcall-used-g7" - append-flags "-fcall-used-g6" - filter-flags "-mvis" - - if is_crosscompile || [[ ${PROFILE_ARCH} == "sparc64" ]] || { has_multilib_profile && ! tc-is-cross-compiler; } ; then - case ${ABI} in - sparc64) - if is-flag "-mcpu=ultrasparc3"; then - CTARGET_OPT="sparc64b-unknown-linux-gnu" - CFLAGS_sparc64="$(get_abi_CFLAGS) -Wa,-xarch=v9b" - else - CTARGET_OPT="sparc64-unknown-linux-gnu" - CFLAGS_sparc64="$(get_abi_CFLAGS) -Wa,-xarch=v9a" - fi - - filter-flags -Wa,-xarch -Wa,-A - ;; - *) - if is-flag "-mcpu=ultrasparc3"; then - CTARGET_OPT="sparcv9b-unknown-linux-gnu" - else - CTARGET_OPT="sparcv9-unknown-linux-gnu" - fi - ;; - esac - else - if is-flag "-mcpu=ultrasparc3"; then - CTARGET_OPT="sparcv9b-unknown-linux-gnu" - elif { is_crosscompile && want_nptl; } || is-flag "-mcpu=ultrasparc2" || is-flag "-mcpu=ultrasparc"; then - CTARGET_OPT="sparcv9-unknown-linux-gnu" - fi - fi - ;; - esac - - if [[ -n ${CTARGET_OPT} && ${CBUILD} == ${CHOST} ]] && ! is_crosscompile; then - CBUILD_OPT=${CTARGET_OPT} - fi - - if $(tc-getCC ${CTARGET}) -v 2>&1 | grep -q 'gcc version 3.[0123]'; then - append-flags -finline-limit=2000 - fi - - # We don't want these flags for glibc - filter-ldflags -pie - - # Lock glibc at -O2 -- linuxthreads needs it and we want to be - # conservative here - filter-flags -O? - append-flags -O2 -} - -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 -} - -check_nptl_support() { - local min_kernel_version="$(KV_to_int "${NPTL_KERNEL_VERSION}")" - - echo - - einfon "Checking gcc for __thread support ... " - if want__thread ; then - echo "yes" - else - echo "no" - echo - eerror "Could not find a gcc that supports the __thread directive!" - eerror "please update to gcc-3.2.2-r1 or later, and try again." - die "No __thread support in gcc!" - fi - - # Building fails on an non-supporting kernel - einfon "Checking kernel version (>=${NPTL_KERNEL_VERSION}) ... " - if [ "`get_KV`" -lt "${min_kernel_version}" ] ; then - echo "no" - echo - eerror "You need a kernel of at least version ${NPTL_KERNEL_VERSION}" - eerror "for NPTL support!" - die "Kernel version too low!" - else - echo "yes" - fi - - # Building fails with too low linux-headers - einfon "Checking linux-headers version (>=${NPTL_KERNEL_VERSION}) ... " - if ! check_kheader_version "${min_kernel_version}"; then - echo "no" - echo - eerror "You need linux-headers of at least version ${NPTL_KERNEL_VERSION}" - eerror "for NPTL support!" - die "linux-headers version too low!" - else - echo "yes" - fi - - echo -} - -want_nptl() { - want_tls || return 1 - use nptl || return 1 - - # Archs that can use NPTL - case $(tc-arch) in - alpha|amd64|ia64|mips|ppc|ppc64|s390|x86) - return 0; - ;; - sparc) - # >= v9 is needed for nptl. - [[ "${PROFILE_ARCH}" == "sparc" ]] && return 1 - return 0; - ;; - esac - - return 1 -} - -want_linuxthreads() { - ! use nptlonly && return 0 - want_nptl || return 0 - return 1 -} - -want_tls() { - # Archs that can use TLS (Thread Local Storage) - case $(tc-arch) in - alpha|amd64|ia64|mips|ppc|ppc64|s390) - return 0; - ;; - sparc) - # 2.3.6 should have tls support on sparc64 - # when using newer binutils - case ${CTARGET/-*} in - sparc64*) return 1 ;; - *) return 0 ;; - esac - ;; - x86) - # requires i486 or better #106556 - [[ ${CTARGET} == i[4567]86* ]] && return 0 - ;; - esac - - return 1 -} - -want__thread() { - want_tls || return 1 - - # For some reason --with-tls --with__thread is causing segfaults on sparc32. - [[ ${PROFILE_ARCH} == "sparc" ]] && return 1 - - [[ -n ${WANT__THREAD} ]] && return ${WANT__THREAD} - - $(tc-getCC ${CTARGET}) -c ${FILESDIR}/test-__thread.c -o ${T}/test2.o &> /dev/null - WANT__THREAD=$? - - return ${WANT__THREAD} -} - -install_locales() { - unset LANGUAGE LANG LC_ALL - cd "${WORKDIR}"/${MYMAINBUILDDIR} || die "${WORKDIR}/${MYMAINBUILDDIR}" - make PARALLELMFLAGS="${MAKEOPTS} -j1" \ - install_root=${D} localedata/install-locales || die -} - -setup_locales() { - if use !userlocales ; then - einfo "userlocales not enabled, installing -ALL- locales..." - install_locales || die - elif [ -e /etc/locales.build ] ; then - einfo "Installing locales in /etc/locales.build..." - echo 'SUPPORTED-LOCALES=\' > SUPPORTED.locales - cat /etc/locales.build | grep -v -e ^$ -e ^\# | sed 's/$/\ \\/g' \ - >> SUPPORTED.locales - cat SUPPORTED.locales > ${S}/localedata/SUPPORTED || die - install_locales || die - elif [ -e ${FILESDIR}/locales.build ] ; then - einfo "Installing locales in ${FILESDIR}/locales.build..." - echo 'SUPPORTED-LOCALES=\' > SUPPORTED.locales - cat ${FILESDIR}/locales.build | grep -v -e ^$ -e ^\# | sed 's/$/\ \\/g' \ - >> SUPPORTED.locales - cat SUPPORTED.locales > ${S}/localedata/SUPPORTED || die - install_locales || die - else - einfo "Installing -ALL- locales..." - install_locales || die - fi -} - -glibc_do_configure() { - local myconf - - # These should not be set, else the - # zoneinfo do not always get installed ... - unset LANGUAGE LANG LC_ALL - # silly users - unset LD_RUN_PATH - - # set addons - pushd ${S} > /dev/null - ADDONS=$(echo */configure | sed -e 's!/configure!!g;s!\(linuxthreads\|nptl\|rtkaio\|glibc-compat\)\( \|$\)!!g;s! \+$!!;s! !,!g;s!^!,!;/^,\*$/d') - use glibc-compat20 && [[ -d glibc-compat ]] && ADDONS="${ADDONS},glibc-compat" - popd > /dev/null - - use nls || myconf="${myconf} --disable-nls" - use erandom || myconf="${myconf} --disable-dev-erandom" - - use glibc-omitfp && myconf="${myconf} --enable-omitfp" - - [[ ${CTARGET} == *-softfloat-* ]] && myconf="${myconf} --without-fp" - - if [ "$1" == "linuxthreads" ] ; then - if want_tls && [[ ${CTARGET} != i[45]86-* ]] ; then - myconf="${myconf} --with-tls" - - if want__thread && use linuxthreads-tls ; then - myconf="${myconf} --with-__thread" - else - myconf="${myconf} --without-__thread" - fi - else - myconf="${myconf} --without-tls --without-__thread" - fi - - myconf="${myconf} --enable-add-ons=linuxthreads${ADDONS}" - myconf="${myconf} --enable-kernel=${LT_KERNEL_VERSION}" - elif [ "$1" == "nptl" ] ; then - myconf="${myconf} --with-tls --with-__thread" - myconf="${myconf} --enable-add-ons=nptl${ADDONS}" - myconf="${myconf} --enable-kernel=${NPTL_KERNEL_VERSION}" - else - die "invalid pthread option" - fi - - # Since SELinux support is only required for nscd, only enable it if: - # 1. USE selinux - # 2. ! USE build - # 3. only for the primary ABI on multilib systems - if use selinux && ! use build; then - if use multilib || has_multilib_profile; then - if is_final_abi; then - myconf="${myconf} --with-selinux" - else - myconf="${myconf} --without-selinux" - fi - else - myconf="${myconf} --with-selinux" - fi - else - myconf="${myconf} --without-selinux" - fi - - # Pick out the correct location for build headers - myconf="${myconf} - --without-cvs - --enable-bind-now - --build=${CBUILD_OPT:-${CBUILD}} - --host=${CTARGET_OPT:-${CTARGET}} - $(use_enable profile) - --without-gd - --with-headers=$(alt_build_headers) - --prefix=$(alt_prefix) - --mandir=$(alt_prefix)/share/man - --infodir=$(alt_prefix)/share/info - --libexecdir=$(alt_prefix)/lib/misc/glibc - ${EXTRA_ECONF}" - - export CC="$(tc-getCC ${CTARGET})" - - GBUILDDIR=${WORKDIR}/build-${ABI}-${CTARGET}-$1 - mkdir -p ${GBUILDDIR} - cd ${GBUILDDIR} - einfo "Configuring GLIBC for $1 with: ${myconf// /\n\t\t}" - ${S}/configure ${myconf} || die "failed to configure glibc" -} - -fix_lib64_symlinks() { - # the original Gentoo/AMD64 devs decided that since 64bit is the native - # bitdepth for AMD64, lib should be used for 64bit libraries. however, - # this ignores the FHS and breaks multilib horribly... especially - # since it wont even work without a lib64 symlink anyways. *rolls eyes* - # see bug 59710 for more information. - # Travis Tilley (08 Aug 2004) - if [ -L ${ROOT}/lib64 ] ; then - ewarn "removing /lib64 symlink and moving lib to lib64..." - ewarn "dont hit ctrl-c until this is done" - addwrite ${ROOT}/ - rm ${ROOT}/lib64 - # now that lib64 is gone, nothing will run without calling ld.so - # directly. luckily the window of brokenness is almost non-existant - use amd64 && /lib/ld-linux-x86-64.so.2 /bin/mv ${ROOT}/lib ${ROOT}/lib64 - use ppc64 && /lib/ld64.so.1 /bin/mv ${ROOT}/lib ${ROOT}/lib64 - # all better :) - ldconfig - ln -s lib64 ${ROOT}/lib - einfo "done! :-)" - einfo "fixed broken lib64/lib symlink in ${ROOT}" - fi - if [ -L ${ROOT}/usr/lib64 ] ; then - addwrite ${ROOT}/usr - rm ${ROOT}/usr/lib64 - mv ${ROOT}/usr/lib ${ROOT}/usr/lib64 - ln -s lib64 ${ROOT}/usr/lib - einfo "fixed broken lib64/lib symlink in ${ROOT}/usr" - fi - if [ -L ${ROOT}/usr/X11R6/lib64 ] ; then - addwrite ${ROOT}/usr/X11R6 - rm ${ROOT}/usr/X11R6/lib64 - mv ${ROOT}/usr/X11R6/lib ${ROOT}/usr/X11R6/lib64 - ln -s lib64 ${ROOT}/usr/X11R6/lib - einfo "fixed broken lib64/lib symlink in ${ROOT}/usr/X11R6" - fi -} - -use_multilib() { - case ${CTARGET} in - sparc64*|mips64*|amd64|ppc64) - is_crosscompile || has_multilib_profile || use multilib ;; - *) false ;; - esac -} - -# Setup toolchain variables that would be defined in the profiles for these archs. -setup_env() { - setup_flags - - if is_crosscompile || tc-is-cross-compiler ; then - case ${CTARGET} in - x86_64*) - export CFLAGS_x86=${CFLAGS_x86--m32} - export CHOST_x86=${CTARGET/x86_64/i686} - export CDEFINE_x86="__i386__" - export LIBDIR_x86="lib" - - export CFLAGS_amd64=${CFLAGS_amd64--m64} - export CHOST_amd64=${CTARGET} - export CDEFINE_amd64="__x86_64__" - export LIBDIR_amd64="lib64" - - export MULTILIB_ABIS="amd64" - export DEFAULT_ABI="amd64" - ;; - mips64*) - export CFLAGS_o32=${CFLAGS_o32--mabi=32} - export CHOST_o32=${CTARGET/mips64/mips} - export CDEFINE_o32="_MIPS_SIM == _ABIO32" - export LIBDIR_o32="lib" - - export CFLAGS_n32=${CFLAGS_n32--mabi=n32} - export CHOST_n32=${CTARGET} - export CDEFINE_n32="_MIPS_SIM == _ABIN32" - export LIBDIR_n32="lib32" - - export CFLAGS_n64=${CFLAGS_n64--mabi=64} - export CHOST_n64=${CTARGET} - export CDEFINE_n64="_MIPS_SIM == _ABI64" - export LIBDIR_n64="lib64" - - export MULTILIB_ABIS="n64 n32" - export DEFAULT_ABI="n32" - ;; - powerpc64*) - export CFLAGS_ppc=${CFLAGS_ppc--m32} - export CHOST_ppc=${CTARGET/powerpc64/powerpc} - export CDEFINE_ppc="!__powerpc64__" - export LIBDIR_ppc="lib" - - export CFLAGS_ppc64=${CFLAGS_ppc64--m64} - export CHOST_ppc64=${CTARGET} - export CDEFINE_ppc64="__powerpc64__" - export LIBDIR_ppc64="lib64" - - export MULTILIB_ABIS="ppc64" - export DEFAULT_ABI="ppc64" - ;; - sparc64*) - export CFLAGS_sparc32=${CFLAGS_sparc--m32} - export CHOST_sparc32=${CTARGET/sparc64/sparc} - export CDEFINE_sparc32="!__arch64__" - export LIBDIR_sparc32="lib" - - export CFLAGS_sparc64=${CFLAGS_sparc64--m64} - export CHOST_sparc64=${CTARGET} - export CDEFINE_sparc64="__arch64__" - export LIBDIR_sparc64="lib64" - - export MULTILIB_ABIS="sparc64" - export DEFAULT_ABI="sparc64" - ;; - *) - export MULTILIB_ABIS="default" - export DEFAULT_ABI="default" - esac - fi - - export ABI=${ABI:-${DEFAULT_ABI:-default}} - - if is_crosscompile || tc-is-cross-compiler ; then - # We need to export CFLAGS with abi information in them because - # glibc's configure script checks CFLAGS for some targets (like mips) - local VAR=CFLAGS_${CTARGET//-/_} - export CFLAGS=${!VAR--O2} - VAR=CFLAGS_${ABI} - export CFLAGS="${CFLAGS} ${!VAR}" - fi -} - -### /ECLASS PUNTAGE ### - -if is_crosscompile ; then - SLOT="${CTARGET}-2.2" -else - SLOT="2.2" -fi - -# we'll handle stripping ourself #46186 -RESTRICT="nostrip multilib-pkg-force" - -# We need new cleanup attribute support from gcc for NPTL among things ... -# We also need linux26-headers if using NPTL. Including kernel headers is -# incredibly unreliable, and this new linux-headers release from plasmaroo -# should work with userspace apps, at least on amd64 and ppc64. -# -# The gcc-config dep is for the cross-compile multilib stuff -DEPEND=">=sys-devel/gcc-3.2.3-r1 - nptl? ( >=sys-devel/gcc-3.3.1-r1 >=sys-kernel/linux-headers-${NPTL_KERNEL_VERSION} ) - >=sys-devel/binutils-2.14.90.0.6-r1 - || ( app-admin/eselect-compiler >=sys-devel/gcc-config-1.3.9 ) - virtual/os-headers - nls? ( sys-devel/gettext ) - selinux? ( !build? ( sys-libs/libselinux ) )" -RDEPEND="nls? ( sys-devel/gettext ) - selinux? ( !build? ( sys-libs/libselinux ) )" - -if [[ ${CATEGORY/cross-} != ${CATEGORY} ]] ; then - DEPEND="${DEPEND} ${CATEGORY}/gcc" - - if [[ ${CATEGORY} == *-linux* ]] ; then - if [[ ${CATEGORY/mips} != ${CATEGORY} ]] ; then - DEPEND="${DEPEND} >=${CATEGORY}/mips-headers-2.6.10" - else - DEPEND="${DEPEND} ${CATEGORY}/linux-headers" - fi - fi -fi - -pkg_setup() { - if use nptlonly && ! use nptl ; then - eerror "If you want nptlonly, add nptl to your USE too ;p" - die "nptlonly without nptl" - fi - - - # give some sort of warning about the nptl logic changes... - if want_nptl && want_linuxthreads ; then - - if use ppc ; then - eerror "glibc doesn't currently work with nptl and linuxthreads" - eerror "please select either nptlonly or -nptl" - die "nptlonly not set on ppc" - fi - ewarn "Warning! Gentoo's GLIBC with NPTL enabled now behaves like the" - ewarn "glibc from almost every other distribution out there. This means" - ewarn "that glibc is compiled -twice-, once with linuxthreads and once" - ewarn "with nptl. The NPTL version is installed to lib/tls and is still" - ewarn "used by default. If you do not need nor want the linuxthreads" - ewarn "fallback, you can disable this behavior by adding nptlonly to" - ewarn "USE to save yourself some compile time." - - ebeep - epause 5 - fi -} - -src_unpack() { - setup_env - - case $(tc-arch) in - hppa) - GLIBC_PATCH_EXCLUDE="${GLIBC_PATCH_EXCLUDE} 2000-all-2.3.2-propolice-guard-functions-v3.patch" - use hardened || GLIBC_PATCH_EXCLUDE="${GLIBC_PATCH_EXCLUDE} 6490_hppa_hardened-disable__init_arrays.patch" - ;; - mips) - GLIBC_PATCH_EXCLUDE="${GLIBC_PATCH_EXCLUDE} 3000-all-2.3.4-dl_execstack-PaX-support.patch" - use_multilib \ - && GLIBC_PATCH_EXCLUDE="${GLIBC_PATCH_EXCLUDE} 6680_mips_nolib3264.patch" \ - || GLIBC_PATCH_EXCLUDE="${GLIBC_PATCH_EXCLUDE} 5005_all_enable-multilib-with-cross-compile.patch" - ;; - amd64) - if ! has_multilib_profile && ! is_crosscompile ; then - # the gentoo-libdir patch hack conflicts with these - GLIBC_PATCH_EXCLUDE="${GLIBC_PATCH_EXCLUDE} 5005_all_enable-multilib-with-cross-compile.patch" - fi - ;; - esac - - GLIBC_PATCH_EXCLUDE="${GLIBC_PATCH_EXCLUDE} 5020_all_nomalloccheck.patch" - - toolchain-glibc_src_unpack - - # XXX: do not package ssp up into tarballs, leave it in FILESDIR - cd "${S}" - cp "${FILESDIR}"/2.3.5/ssp.c sysdeps/unix/sysv/linux/ || die "could not find ssp.c" - rm -f "${WORKDIR}"/patches/2* - epatch "${FILESDIR}"/2.3.5/glibc-2.3.5-propolice-guard-functions.patch - epatch "${FILESDIR}"/2.3.5/glibc-2.3.5-frandom-detect.patch - - case $(tc-arch) in - alpha) - # Is this still needed? - rm -f sysdeps/alpha/alphaev6/memcpy.S - ;; - amd64) - if ! has_multilib_profile && ! is_crosscompile; then - # CONF_LIBDIR support - epatch ${FILESDIR}/2.3.4/glibc-gentoo-libdir.patch - sed -i -e "s:@GENTOO_LIBDIR@:$(get_libdir):g" ${S}/sysdeps/unix/sysv/linux/configure - fi - ;; - ppc64) - # setup lib -- seems like a good place to set this up - has_multilib_profile || get_libdir_override lib64 - ;; - esac - - # disable binutils -as-needed - sed -e 's/^have-as-needed.*/have-as-needed = no/' -i ${S}/config.make.in - - # Glibc is stupid sometimes, and doesn't realize that with a - # static C-Only gcc, -lgcc_eh doesn't exist. - # http://sources.redhat.com/ml/libc-alpha/2003-09/msg00100.html - # http://sourceware.org/ml/libc-alpha/2005-02/msg00042.html - echo 'int main(){}' > ${T}/gcc_eh_test.c - if ! $(tc-getCC ${CTARGET}) ${T}/gcc_eh_test.c -lgcc_eh 2>/dev/null ; then - sed -i -e 's:-lgcc_eh::' Makeconfig || die "sed gcc_eh" - fi - - # Some configure checks fail on the first emerge through because they - # try to link. This doesn't work well if we don't have a libc yet. - # http://sourceware.org/ml/libc-alpha/2005-02/msg00042.html - if is_crosscompile && use build; then - rm ${S}/sysdeps/sparc/sparc64/elf/configure{,.in} - rm ${S}/nptl/sysdeps/pthread/configure{,.in} - fi - - cd "${WORKDIR}" - find . -type f '(' -size 0 -o -name "*.orig" ')' -exec rm -f {} \; - find . -name configure -exec touch {} \; - - # Fix permissions on some of the scripts - chmod u+x "${S}"/scripts/*.sh -} - -src_compile() { - setup_env - - if [[ -z ${OABI} ]] && has_multilib_profile ; then - # MULTILIB-CLEANUP: Fix this when FEATURES=multilib-pkg is in portage - local MLTEST=$(type dyn_unpack) - if [[ ${MLTEST/set_abi} == "${MLTEST}" ]] ; then - OABI=${ABI} - einfo "Building multilib glibc for ABIs: $(get_install_abis)" - for ABI in $(get_install_abis) ; do - export ABI - src_compile - done - ABI=${OABI} - unset OABI - return 0 - fi - unset MLTEST - fi - - toolchain-glibc_src_compile -} - -src_test() { - setup_env - - if [[ -z ${OABI} ]] && has_multilib_profile ; then - # MULTILIB-CLEANUP: Fix this when FEATURES=multilib-pkg is in portage - local MLTEST=$(type dyn_unpack) - if [[ ${MLTEST/set_abi} == "${MLTEST}" ]] ; then - OABI=${ABI} - einfo "Testing multilib glibc for ABIs: $(get_install_abis)" - for ABI in $(get_install_abis) ; do - export ABI - einfo " Testing ${ABI} glibc" - src_test - done - ABI=${OABI} - unset OABI - return 0 - fi - unset MLTEST - fi - - toolchain-glibc_src_test -} - -src_strip() { - # Now, strip everything but the thread libs #46186, as well as the dynamic - # linker, else we cannot set breakpoints in shared libraries due to bugs in - # gdb. Also want to grab stuff in tls subdir. whee. -#when new portage supports this ... -# env \ -# -uRESTRICT \ -# CHOST=${CTARGET} \ -# STRIP_MASK="/*/{,tls/}{ld-,lib{pthread,thread_db}}*" \ -# prepallstrip - pushd "${D}" > /dev/null - - if ! is_crosscompile ; then - mkdir -p "${T}"/strip-backup - for x in $(find "${D}" -maxdepth 3 \ - '(' -name 'ld-*' -o -name 'libpthread*' -o -name 'libthread_db*' ')' \ - -a '(' '!' -name '*.a' ')' -type f -printf '%P ') - do - mkdir -p "${T}/strip-backup/${x%/*}" - cp -a -- "${D}/${x}" "${T}/strip-backup/${x}" || die "backing up ${x}" - done - fi - env -uRESTRICT CHOST=${CTARGET} prepallstrip - if ! is_crosscompile ; then - cp -a -- "${T}"/strip-backup/* "${D}"/ || die "restoring non-stripped libs" - fi - - popd > /dev/null -} - -src_install() { - setup_env - - if [[ -z ${OABI} ]] && has_multilib_profile ; then - # MULTILIB-CLEANUP: Fix this when FEATURES=multilib-pkg is in portage - local MLTEST=$(type dyn_unpack) - if [[ ${MLTEST/set_abi} == "${MLTEST}" ]] ; then - OABI=${ABI} - einfo "Installing multilib glibc for ABIs: $(get_install_abis)" - for ABI in $(get_install_abis) ; do - export ABI - src_install - done - ABI=${OABI} - unset OABI - src_strip - return 0 - fi - unset MLTEST - fi - - # Handle stupid lib32 BS - unset OLD_LIBDIR - if ! is_crosscompile ; then - if [[ $(tc-arch) == "amd64" && ${ABI} == "x86" && $(get_libdir) != "lib" ]] ; then - OLD_LIBDIR=$(get_libdir) - LIBDIR_x86="lib" - fi - - if [[ $(tc-arch) == "ppc64" && ${ABI} == "ppc" && $(get_libdir) != "lib" ]] ; then - OLD_LIBDIR=$(get_libdir) - LIBDIR_ppc="lib" - fi - fi - - toolchain-glibc_src_install - [[ -z ${OABI} ]] && src_strip - - # Handle stupid lib32 BS on amd64 and ppc64 - if [[ -n ${OLD_LIBDIR} ]] ; then - cd "${S}" - [[ $(tc-arch) == "amd64" ]] && LIBDIR_x86=${OLD_LIBDIR} - [[ $(tc-arch) == "ppc64" ]] && LIBDIR_ppc=${OLD_LIBDIR} - unset OLD_LIBDIR - - mv "${D}"/lib "${D}"/$(get_libdir) - mv "${D}"/usr/lib "${D}"/usr/$(get_libdir) - dodir /lib - dodir /usr/lib - mv "${D}"/usr/$(get_libdir)/locale "${D}"/usr/lib - [[ $(tc-arch) == "amd64" ]] && dosym ../$(get_libdir)/ld-linux.so.2 /lib/ld-linux.so.2 - [[ $(tc-arch) == "ppc64" ]] && dosym ../$(get_libdir)/ld.so.1 /lib/ld.so.1 - - for f in "${D}"/usr/$(get_libdir)/*.so; do - local basef=$(basename "${f}") - if [[ -L ${f} ]] ; then - local target=$(readlink "${f}") - target=${target/\/lib\//\/$(get_libdir)\/} - rm "${f}" - dosym "${target}" /usr/$(get_libdir)/"${basef}" - fi - done - - dosed "s:/lib/:/$(get_libdir)/:g" /usr/$(get_libdir)/lib{c,pthread}.so - - if want_nptl && want_linuxthreads ; then - dosed "s:/lib/:/$(get_libdir)/:g" /usr/$(get_libdir)/nptl/lib{c,pthread}.so - fi - fi -} - -pkg_preinst() { - toolchain-glibc_pkg_preinst -} - -pkg_postinst() { - toolchain-glibc_pkg_postinst -} diff --git a/sys-libs/glibc/glibc-2.3.5.ebuild b/sys-libs/glibc/glibc-2.3.5.ebuild deleted file mode 100644 index 0eb264f167fb..000000000000 --- a/sys-libs/glibc/glibc-2.3.5.ebuild +++ /dev/null @@ -1,1337 +0,0 @@ -# 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.3.5.ebuild,v 1.55 2006/05/30 19:45:22 eradicator Exp $ - -# Here's how the cross-compile logic breaks down ... -# CTARGET - machine that will target the binaries -# CHOST - machine that will host the binaries -# CBUILD - machine that will build the binaries -# If CTARGET != CHOST, it means you want a libc for cross-compiling. -# If CHOST != CBUILD, it means you want to cross-compile the libc. -# CBUILD = CHOST = CTARGET - native build/install -# CBUILD != (CHOST = CTARGET) - cross-compile a native build -# (CBUILD = CHOST) != CTARGET - libc for cross-compiler -# CBUILD != CHOST != CTARGET - cross-compile a libc for a cross-compiler -# For install paths: -# CHOST = CTARGET - install into / -# CHOST != CTARGET - install into /usr/CTARGET/ - -KEYWORDS="amd64 arm ~ia64 mips ~ppc ~ppc64 ~sparc x86" - -BRANCH_UPDATE="" - -# From linuxthreads/man -GLIBC_MANPAGE_VERSION="2.3.5" - -# From manual -GLIBC_INFOPAGE_VERSION="2.3.4-r1" - -# Gentoo patchset -PATCH_VER="1.4" - -# C Stubbs addon (contained in fedora, so ignoring) -#CSTUBS_VER="2.1.2" -#CSTUBS_TARBALL="c_stubs-${CSTUBS_VER}.tar.bz2" -#CSTUBS_URI="mirror://gentoo/${CSTUBS_TARBALL}" - -# Fedora addons (from RHEL's glibc-2.3.4-2.src.rpm) -FEDORA_VER="20041219T2331" -FEDORA_TARBALL="glibc-fedora-${FEDORA_VER}.tar.bz2" -FEDORA_URI="mirror://gentoo/${FEDORA_TARBALL}" - -GENTOO_TOOLCHAIN_BASE_URI="mirror://gentoo" - -### PUNT OUT TO ECLASS?? ### -inherit eutils versionator libtool toolchain-funcs flag-o-matic gnuconfig multilib - -DESCRIPTION="GNU libc6 (also called glibc2) C library" -HOMEPAGE="http://www.gnu.org/software/libc/libc.html" -LICENSE="LGPL-2" - -IUSE="nls pic build nptl nptlonly erandom hardened debug userlocales multilib selinux" - -export CBUILD=${CBUILD:-${CHOST}} -export CTARGET=${CTARGET:-${CHOST}} -if [[ ${CTARGET} == ${CHOST} ]] ; then - if [[ ${CATEGORY/cross-} != ${CATEGORY} ]] ; then - export CTARGET=${CATEGORY/cross-} - fi -fi -if [[ ${CTARGET} == ${CHOST} ]] ; then - PROVIDE="virtual/libc" -fi - -is_crosscompile() { - [[ ${CHOST} != ${CTARGET} ]] -} - -GLIBC_RELEASE_VER=$(get_version_component_range 1-3) - -# Don't set this to :-, - allows BRANCH_UPDATE="" -BRANCH_UPDATE=${BRANCH_UPDATE-$(get_version_component_range 4)} - -# (Recent snapshots fails with 2.6.5 and earlier with NPTL) -NPTL_KERNEL_VERSION=${NPTL_KERNEL_VERSION:-"2.6.6"} -LT_KERNEL_VERSION=${LT_KERNEL_VERSION:-"2.4.1"} - -### SRC_URI ### - -# This function handles the basics of setting the SRC_URI for a glibc ebuild. -# To use, set SRC_URI with: -# -# SRC_URI="$(get_glibc_src_uri)" -# -# Other than the variables normally set by portage, this function's behavior -# can be altered by setting the following: -# -# GENTOO_TOOLCHAIN_BASE_URI -# This sets the base URI for all gentoo-specific patch files. Note -# that this variable is only important for a brief period of time, -# before your source files get picked up by mirrors. However, it is -# still highly suggested that you keep files in this location -# available. -# -# BRANCH_UPDATE -# If set, this variable signals that we should be using the main -# release tarball (determined by ebuild version) and applying a -# CVS branch update patch against it. The location of this branch -# update patch is assumed to be in ${GENTOO_TOOLCHAIN_BASE_URI}. -# Just like with SNAPSHOT, this variable is ignored if the ebuild -# has a _pre suffix. -# -# PATCH_VER -# PATCH_GLIBC_VER -# This should be set to the version of the gentoo patch tarball. -# The resulting filename of this tarball will be: -# ${PN}-${PATCH_GLIBC_VER:-${GLIBC_RELEASE_VER}}-patches-${PATCH_VER}.tar.bz2 -# -# GLIBC_MANPAGE_VERSION -# GLIBC_INFOPAGE_VERSION -# The version of glibc for which we will download pages. This will -# default to ${GLIBC_RELEASE_VER}, but we may not want to pre-generate man pages -# for prerelease test ebuilds for example. This allows you to -# continue using pre-generated manpages from the last stable release. -# If set to "none", this will prevent the downloading of manpages, -# which is useful for individual library targets. -# -get_glibc_src_uri() { - # This variable should be set to the devspace of whoever is currently - # maintaining GLIBC. Please dont set this to mirror, that would just - # make the files unavailable until they get mirrored. - local devspace_uri="mirror://gentoo/" - GENTOO_TOOLCHAIN_BASE_URI=${GENTOO_TOOLCHAIN_BASE_URI:-${devspace_uri}} - -# GLIBC_SRC_URI="http://ftp.gnu.org/gnu/glibc/${PN}-${GLIBC_RELEASE_VER}.tar.bz2 -# http://ftp.gnu.org/gnu/glibc/${PN}-linuxthreads-${GLIBC_RELEASE_VER}.tar.bz2 -# http://ftp.gnu.org/gnu/glibc/${PN}-libidn-${GLIBC_RELEASE_VER}.tar.bz2 - GLIBC_SRC_URI="mirror://gnu/glibc/${PN}-${GLIBC_RELEASE_VER}.tar.bz2 - mirror://gnu/glibc/${PN}-linuxthreads-${GLIBC_RELEASE_VER}.tar.bz2 - mirror://gnu/glibc/${PN}-libidn-${GLIBC_RELEASE_VER}.tar.bz2" - - if [[ -n ${BRANCH_UPDATE} ]] ; then - GLIBC_SRC_URI="${GLIBC_SRC_URI} - ${GENTOO_TOOLCHAIN_BASE_URI}/${PN}-${GLIBC_RELEASE_VER}-branch-update-${BRANCH_UPDATE}.patch.bz2" - fi - - if [[ -n ${PATCH_VER} ]] ; then - GLIBC_SRC_URI="${GLIBC_SRC_URI} - ${GENTOO_TOOLCHAIN_BASE_URI}/${PN}-${PATCH_GLIBC_VER:-${GLIBC_RELEASE_VER}}-patches-${PATCH_VER}.tar.bz2" - fi - - if [[ ${GLIBC_MANPAGE_VERSION} != "none" ]] ; then - GLIBC_SRC_URI="${GLIBC_SRC_URI} - ${GENTOO_TOOLCHAIN_BASE_URI}/${PN}-manpages-${GLIBC_MANPAGE_VERSION:-${GLIBC_RELEASE_VER}}.tar.bz2" - fi - - if [[ ${GLIBC_INFOPAGE_VERSION} != "none" ]] ; then - GLIBC_SRC_URI="${GLIBC_SRC_URI} - ${GENTOO_TOOLCHAIN_BASE_URI}/${PN}-infopages-${GLIBC_INFOPAGE_VERSION:-${GLIBC_RELEASE_VER}}.tar.bz2" - fi - - if [[ -n ${CSTUBS_URI} ]] ; then - GLIBC_SRC_URI="${GLIBC_SRC_URI} ${CSTUBS_URI}" - fi - - if [[ -n ${FEDORA_URI} ]] ; then - GLIBC_SRC_URI="${GLIBC_SRC_URI} ${FEDORA_URI}" - fi - - echo "${GLIBC_SRC_URI}" -} - -SRC_URI=$(get_glibc_src_uri) -S=${WORKDIR}/${PN}-${GLIBC_RELEASE_VER} - -### EXPORTED FUNCTIONS ### -toolchain-glibc_src_unpack() { - # Check NPTL support _before_ we unpack things to save some time - want_nptl && check_nptl_support - - unpack ${PN}-${GLIBC_RELEASE_VER}.tar.bz2 - - cd "${S}" - unpack ${PN}-linuxthreads-${GLIBC_RELEASE_VER}.tar.bz2 - unpack ${PN}-libidn-${GLIBC_RELEASE_VER}.tar.bz2 - - [[ -n ${CSTUBS_TARBALL} ]] && unpack ${CSTUBS_TARBALL} - [[ -n ${FEDORA_TARBALL} ]] && unpack ${FEDORA_TARBALL} - - if [[ -n ${PATCH_VER} ]] ; then - cd "${WORKDIR}" - unpack ${PN}-${PATCH_GLIBC_VER:-${GLIBC_RELEASE_VER}}-patches-${PATCH_VER}.tar.bz2 - fi - - # XXX: We should do the branchupdate, before extracting the manpages and - # infopages else it does not help much (mtimes change if there is a change - # to them with branchupdate) - if [[ -n ${BRANCH_UPDATE} ]] ; then - cd "${WORKDIR}" - unpack ${PN}-${GLIBC_RELEASE_VER}-branch-update-${BRANCH_UPDATE}.patch.bz2 - - cd "${S}" - epatch "${WORKDIR}"/${PN}-${GLIBC_RELEASE_VER}-branch-update-${BRANCH_UPDATE}.patch - - # Snapshot date patch - einfo "Patching version to display snapshot date ..." - sed -i -e "s:\(#define RELEASE\).*:\1 \"${BRANCH_UPDATE}\":" version.h - fi - - if [[ ${GLIBC_MANPAGE_VERSION} != "none" ]] ; then - cd "${WORKDIR}" - unpack ${PN}-manpages-${GLIBC_MANPAGE_VERSION:-${GLIBC_RELEASE_VER}}.tar.bz2 - fi - - if [[ ${GLIBC_INFOPAGE_VERSION} != "none" ]] ; then - cd "${S}" - unpack ${PN}-infopages-${GLIBC_INFOPAGE_VERSION:-${GLIBC_RELEASE_VER}}.tar.bz2 - fi - - # XXX: do not package ssp up into tarballs, leave it in FILESDIR - cd "${S}" - cp "${FILESDIR}"/2.3.5/ssp.c sysdeps/unix/sysv/linux/ || die "could not find ssp.c" - rm -f "${WORKDIR}"/patches/2* - epatch "${FILESDIR}"/2.3.5/glibc-2.3.5-propolice-guard-functions.patch - epatch "${FILESDIR}"/2.3.5/glibc-2.3.5-frandom-detect.patch - - if [[ -n ${PATCH_VER} ]] ; then - cd "${S}" - EPATCH_MULTI_MSG="Applying Gentoo Glibc Patchset ${PATCH_GLIBC_VER:-${GLIBC_RELEASE_VER}}-${PATCH_VER} ..." \ - EPATCH_EXCLUDE=${GLIBC_PATCH_EXCLUDE} \ - EPATCH_SUFFIX="patch" \ - ARCH=$(tc-arch) \ - epatch "${WORKDIR}"/patches - fi -} - -toolchain-glibc_src_compile() { - # Set gconvdir to /usr/$(get_libdir)/gconv on archs with multiple ABIs - local MAKEFLAGS="" - has_multilib_profile && MAKEFLAGS="gconvdir=$(alt_usrlibdir)/gconv" - - echo - for v in ABI CBUILD CHOST CTARGET CBUILD_OPT CTARGET_OPT CC CFLAGS ; do - einfo " $(printf '%15s' ${v}:) ${!v}" - done - echo - - # -fomit-frame-pointer gets stripped in setup_flags, so we do this - # now to cache the value - want_omitfp - - if want_linuxthreads ; then - glibc_do_configure linuxthreads - einfo "Building GLIBC with linuxthreads..." - make PARALLELMFLAGS="${MAKEOPTS}" ${MAKEFLAGS} || die - fi - if want_nptl ; then - # ... and then do the optional nptl build - unset LD_ASSUME_KERNEL - glibc_do_configure nptl - einfo "Building GLIBC with NPTL..." - make PARALLELMFLAGS="${MAKEOPTS}" ${MAKEFLAGS} || die - fi -} - -toolchain-glibc_src_test() { - # This is wrong, but glibc's tests fail bad when screwing - # around with sandbox, so lets just punt it - unset LD_PRELOAD - - # do the linuxthreads build unless we're using nptlonly - if want_linuxthreads ; then - cd "${WORKDIR}"/build-${ABI}-${CTARGET}-linuxthreads - einfo "Checking GLIBC with linuxthreads..." - make check || die "linuxthreads glibc did not pass make check" - fi - if want_nptl ; then - cd "${WORKDIR}"/build-${ABI}-${CTARGET}-nptl - unset LD_ASSUME_KERNEL || : - einfo "Checking GLIBC with NPTL..." - make check || die "nptl glibc did not pass make check" - fi -} - -toolchain-glibc_pkg_preinst() { - # PPC64+others may want to eventually be added to this logic if they - # decide to be multilib compatible and FHS compliant. note that this - # chunk of FHS compliance only applies to 64bit archs where 32bit - # compatibility is a major concern (not IA64, for example). - - # amd64's 2005.0 is the first amd64 profile to not need this code. - # 2005.0 is setup properly, and this is executed as part of the - # 2004.3 -> 2005.0 upgrade script. - # 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 ]] && ! { want_nptl && want_linuxthreads; }; then - addwrite "${ROOT}"/$(alt_libdir)/ - ewarn "nptlonly or -nptl in USE, removing /${ROOT}$(alt_libdir)/tls..." - rm -r "${ROOT}"/$(alt_libdir)/tls || die - fi - - # Shouldnt need to keep this updated - [[ -e ${ROOT}/etc/locales.build ]] && rm -f "${D}"/etc/locales.build -} - -toolchain-glibc_src_install() { - setup_flags - - # Need to dodir first because it might not exist (bad amd64 profiles) - dodir $(alt_usrlibdir) - - # These should not be set, else the - # zoneinfo do not always get installed ... - unset LANGUAGE LANG LC_ALL - - if want_linuxthreads ; then - cd "${WORKDIR}"/build-${ABI}-${CTARGET}-linuxthreads - einfo "Installing GLIBC ${ABI} with linuxthreads ..." - make PARALLELMFLAGS="${MAKEOPTS} -j1" \ - install_root="${D}" \ - install || die - else # nptlonly - cd "${WORKDIR}"/build-${ABI}-${CTARGET}-nptl - einfo "Installing GLIBC ${ABI} with NPTL ..." - make PARALLELMFLAGS="${MAKEOPTS} -j1" \ - install_root="${D}" \ - install || die - fi - - if is_crosscompile ; then - # Glibc doesn't setup multilib crosscompiled dirs right, but it - # sets up native multilib dirs right, so just do this when we - # crosscompile. - if [[ $(get_libdir) != "lib" && -d ${D}$(alt_prefix)/lib ]] ; then - dodir $(alt_libdir) - mv "${D}"$(alt_prefix)/lib/* "${D}"$(alt_libdir) - fi - - # punt all the junk not needed by a cross-compiler - rm -rf "${D}"$(alt_prefix)/{bin,etc,$(get_libdir)/gconv,sbin,share} - fi - - if want_linuxthreads && want_nptl ; then - einfo "Installing NPTL to $(alt_libdir)/tls/..." - cd "${WORKDIR}"/build-${ABI}-${CTARGET}-nptl - mkdir -p "${D}"$(alt_libdir)/tls/ - - libcsofile=$(basename "${D}"$(alt_libdir)/libc-*.so) - cp -a libc.so "${D}"$(alt_libdir)/tls/${libcsofile} || die - dosym ${libcsofile} $(alt_libdir)/tls/$(ls libc.so.*) - - libmsofile=$(basename "${D}"$(alt_libdir)/libm-*.so) - pushd math > /dev/null - cp -a libm.so "${D}"$(alt_libdir)/tls/${libmsofile} || die - dosym ${libmsofile} $(alt_libdir)/tls/$(ls libm.so.*) - popd > /dev/null - - librtsofile=$(basename "${D}"$(alt_libdir)/librt-*.so) - pushd rt > /dev/null - cp -a librt.so "${D}"$(alt_libdir)/tls/${librtsofile} || die - dosym ${librtsofile} $(alt_libdir)/tls/$(ls librt.so.*) - popd > /dev/null - - libthreaddbsofile=$(basename "${D}"$(alt_libdir)/libthread_db-*.so) - pushd nptl_db > /dev/null - cp -a libthread_db.so "${D}"$(alt_libdir)/tls/${libthreaddbsofile} || die - dosym ${libthreaddbsofile} $(alt_libdir)/tls/$(ls libthread_db.so.*) - popd > /dev/null - - libpthreadsofile=libpthread-${GLIBC_RELEASE_VER}.so - cp -a nptl/libpthread.so "${D}"$(alt_libdir)/tls/${libpthreadsofile} || die - dosym ${libpthreadsofile} $(alt_libdir)/tls/libpthread.so.0 - - # and now for the static libs - mkdir -p "${D}"$(alt_usrlibdir)/nptl - cp -a libc.a nptl/libpthread.a nptl/libpthread_nonshared.a rt/librt.a \ - "${D}"$(alt_usrlibdir)/nptl - - # linker script crap - for lib in libc libpthread; do - sed -e "s:$(alt_libdir)/${lib}.so:$(alt_libdir)/tls/${lib}.so:g" \ - -e "s:$(alt_usrlibdir)/${lib}_nonshared.a:$(alt_usrlibdir)/nptl/${lib}_nonshared.a:g" \ - "${D}"$(alt_usrlibdir)/${lib}.so \ - > "${D}"$(alt_usrlibdir)/nptl/${lib}.so - - chmod 755 "${D}"$(alt_usrlibdir)/nptl/${lib}.so - done - - dosym ../librt.so $(alt_usrlibdir)/nptl/librt.so - - # last but not least... headers. - mkdir -p "${D}"/nptl "${D}"$(alt_headers)/nptl - make install_root="${D}"/nptl install-headers PARALLELMFLAGS="${MAKEOPTS} -j1" - pushd "${D}"/nptl/$(alt_headers) > /dev/null - for i in $(find . -type f) ; do - if ! [[ -f ${D}$(alt_headers)/$i ]] \ - || ! cmp -s $i ${D}$(alt_headers)/$i; then - mkdir -p ${D}$(alt_headers)/nptl/`dirname $i` - cp -a $i ${D}$(alt_headers)/nptl/$i - fi - done - popd > /dev/null - rm -rf ${D}/nptl - fi - - # now, strip everything but the thread libs #46186 - mkdir -p ${T}/thread-backup - mv -f ${D}$(alt_libdir)/lib{pthread,thread_db}* ${T}/thread-backup/ - if want_linuxthreads && want_nptl ; then - mkdir -p ${T}/thread-backup/tls - mv -f ${D}$(alt_libdir)/tls/lib{pthread,thread_db}* ${T}/thread-backup/tls - fi - env -uRESTRICT CHOST=${CTARGET} prepallstrip - cp -a -- ${T}/thread-backup/* ${D}$(alt_libdir)/ || die - - if use pic && [[ $(tc-arch) != "amd64" ]] ; then - find ${S}/${buildtarget}/ -name "soinit.os" -exec cp {} ${D}$(alt_libdir)/soinit.o \; - find ${S}/${buildtarget}/ -name "sofini.os" -exec cp {} ${D}$(alt_libdir)/sofini.o \; - find ${S}/${buildtarget}/ -name "*_pic.a" -exec cp {} ${D}$(alt_libdir) \; - find ${S}/${buildtarget}/ -name "*.map" -exec cp {} ${D}$(alt_libdir) \; - - for i in ${D}$(alt_libdir)/*.map; do - mv ${i} ${i%.map}_pic.map - done - fi - - # We'll take care of the cache ourselves - rm -f ${D}/etc/ld.so.cache - - # Some things want this, notably ash. - dosym libbsd-compat.a $(alt_usrlibdir)/libbsd.a - - # Handle includes for different ABIs - prep_ml_includes $(alt_headers) - - ################################################################# - # EVERYTHING AFTER THIS POINT IS FOR NATIVE GLIBC INSTALLS ONLY # - # Make sure we install the sys-include symlink so that when - # we build a 2nd stage cross-compiler, gcc finds the target - # system headers correctly. See gcc/doc/gccinstall.info - if is_crosscompile ; then - dosym include $(alt_prefix)/sys-include - dosym . $(alt_prefix)/usr - return 0 - fi - - # Everything past this point just needs to be done once... don't waste time building locale files twice... - is_final_abi || return 0 - - if want_linuxthreads ; then - MYMAINBUILDDIR=build-${ABI}-${CTARGET}-linuxthreads - else - MYMAINBUILDDIR=build-${ABI}-${CTARGET}-nptl - fi - cd "${WORKDIR}"/${MYMAINBUILDDIR} - if ! use build ; then - if ! has noinfo ${FEATURES} && [[ ${GLIBC_INFOPAGE_VERSION} != "none" ]] ; then - einfo "Installing info pages..." - - make PARALLELMFLAGS="${MAKEOPTS} -j1" \ - install_root=${D} \ - info -i - fi - - setup_locales - - if [[ ${GLIBC_MANPAGE_VERSION} != "none" ]] ; then - einfo "Installing man pages..." - - # Install linuxthreads man pages even if nptl is enabled - cd "${WORKDIR}"/man - doman *.3thr - fi - - # Install nscd config file - insinto /etc - doins ${FILESDIR}/nscd.conf - doins "${FILESDIR}"/nsswitch.conf - - doinitd "${FILESDIR}"/nscd - - cd ${S} - dodoc BUGS ChangeLog* CONFORMANCE FAQ INTERFACE NEWS NOTES PROJECTS README* - else - rm -rf ${D}/usr/share - for dir in $(get_all_libdirs); do - rm -rf ${D}/usr/${dir}/gconv &> /dev/null - done - - einfo "Installing Timezone data..." - make PARALLELMFLAGS="${MAKEOPTS} -j1" \ - install_root=${D} \ - timezone/install-others || die - fi - - # Is this next line actually needed or does the makefile get it right? - # It previously has 0755 perms which was killing things. - fperms 4711 $(alt_prefix)/lib/misc/glibc/pt_chown - - # Prevent overwriting of the /etc/localtime symlink. We'll handle the - # creation of the "factory" symlink in pkg_postinst(). - rm -f ${D}/etc/localtime - - insinto /etc - # This is our new config file for building locales - doins ${FILESDIR}/locales.build - # example host.conf with multicast dns disabled by default - doins ${FILESDIR}/2.3.4/host.conf - - # simple test to make sure our new glibc isnt completely broken. - # for now, skip the multilib scenario. also make sure we don't - # test with statically built binaries since they will fail. - [[ ${CBUILD} != ${CHOST} ]] && return 0 - [[ $(get_libdir) != "lib" ]] && return 0 - for x in date env ls true uname ; do - x=$(type -p ${x}) - [[ -z ${x} ]] && continue - striptest=$(file -L ${x} 2>/dev/null) - [[ -z ${striptest} ]] && continue - [[ ${striptest/statically linked} != "${striptest}" ]] && continue - "${D}"/$(get_libdir)/ld-*.so \ - --library-path "${D}"/$(get_libdir) \ - ${x} > /dev/null \ - || die "simple run test (${x}) failed" - done -} - -toolchain-glibc_pkg_postinst() { - # Mixing nptlonly and -nptlonly glibc can prove dangerous if libpthread - # isn't removed in unmerge which happens sometimes. See bug #87671 - if ! is_crosscompile && want_linuxthreads ; then - for libdir in $(get_all_libdirs) ; do - for f in ${ROOT}/${libdir}/libpthread-2.* ${ROOT}/${libdir}/libpthread-0.6* ; do - if [[ -f ${f} ]] ; then - rm -f ${f} - ldconfig - fi - done - done - fi - - # Correct me if I am wrong here, but my /etc/localtime is a file - # created by zic .... - # I am thinking that it should only be recreated if no /etc/localtime - # exists, or if it is an invalid symlink. - # - # For invalid symlink: - # -f && -e will fail - # -L will succeed - # - if [ ! -e "${ROOT}/etc/localtime" ] ; then - echo "Please remember to set your timezone using the zic command." - rm -f ${ROOT}/etc/localtime - ln -s ../usr/share/zoneinfo/Factory ${ROOT}/etc/localtime - fi - - if ! is_crosscompile && [ -x "${ROOT}/usr/sbin/iconvconfig" ] ; then - # Generate fastloading iconv module configuration file. - ${ROOT}/usr/sbin/iconvconfig --prefix=${ROOT} - fi - - if [ ! -e "${ROOT}/lib/ld.so.1" ] && use ppc64 && ! has_multilib_profile ; then - ## SHOULDN'T THIS BE lib64?? - ln -s ld64.so.1 ${ROOT}/lib/ld.so.1 - fi - - # Reload init ... - if ! is_crosscompile && [ "${ROOT}" = "/" ] ; then - /sbin/init U &> /dev/null - fi - - # warn the few multicast-dns-by-default users we've had about the change - # in behavior... - echo - einfo "Gentoo's glibc now disables multicast dns by default in our" - einfo "example host.conf. To re-enable this functionality, simply" - einfo "remove the line that disables it (mdns off)." - echo - - if want_nptl && want_linuxthreads ; then - einfo "The default behavior of glibc on your system is to use NPTL. If" - einfo "you want to use linuxthreads for a particular program, start it" - einfo "by executing 'LD_ASSUME_KERNEL=${LT_KERNEL_VERSION} []'" - echo - fi -} - -### SUPPORT FUNCTIONS ### -# We need to be able to set alternative headers for -# compiling for non-native platform -# Will also become useful for testing kernel-headers without screwing up -# the whole system. -# note: intentionally undocumented. -alt_headers() { - if [[ -z ${ALT_HEADERS} ]] ; then - if is_crosscompile ; then - ALT_HEADERS="/usr/${CTARGET}/include" - else - ALT_HEADERS="/usr/include" - fi - fi - echo "${ALT_HEADERS}" -} -alt_build_headers() { - if [[ -z ${ALT_BUILD_HEADERS} ]] ; then - ALT_BUILD_HEADERS=$(alt_headers) - tc-is-cross-compiler && ALT_BUILD_HEADERS=${ROOT}$(alt_headers) - fi - echo "${ALT_BUILD_HEADERS}" -} - -alt_prefix() { - if is_crosscompile ; then - echo /usr/${CTARGET} - else - echo /usr - fi -} - -alt_libdir() { - if is_crosscompile ; then - echo /usr/${CTARGET}/$(get_libdir) - else - echo /$(get_libdir) - fi -} - -alt_usrlibdir() { - if is_crosscompile ; then - echo /usr/${CTARGET}/$(get_libdir) - else - echo /usr/$(get_libdir) - fi -} - -setup_flags() { - # Over-zealous CFLAGS can often cause problems. What may work for one - # person may not work for another. To avoid a large influx of bugs - # relating to failed builds, we strip most CFLAGS out to ensure as few - # problems as possible. - strip-flags - strip-unsupported-flags - filter-flags -m32 -m64 -mabi=* - - has_multilib_profile && CTARGET_OPT=$(get_abi_CHOST) - - case $(tc-arch) in - amd64) - CFLAGS_x86="-m32" - ;; - ppc) - append-flags "-freorder-blocks" - ;; - sparc) - # Both sparc and sparc64 can use -fcall-used-g6. -g7 is bad, though. - filter-flags "-fcall-used-g7" - append-flags "-fcall-used-g6" - filter-flags "-mvis" - - if is_crosscompile || [[ ${PROFILE_ARCH} == "sparc64" ]] || { has_multilib_profile && ! tc-is-cross-compiler; } ; then - case ${ABI} in - sparc64) - if is-flag "-mcpu=ultrasparc3"; then - CTARGET_OPT="sparc64b-unknown-linux-gnu" - CFLAGS_sparc64="$(get_abi_CFLAGS) -Wa,-xarch=v9b" - else - CTARGET_OPT="sparc64-unknown-linux-gnu" - CFLAGS_sparc64="$(get_abi_CFLAGS) -Wa,-xarch=v9a" - fi - - filter-flags -Wa,-xarch -Wa,-A - ;; - *) - if is-flag "-mcpu=ultrasparc3"; then - CTARGET_OPT="sparcv9b-unknown-linux-gnu" - else - CTARGET_OPT="sparcv9-unknown-linux-gnu" - fi - ;; - esac - else - if is-flag "-mcpu=ultrasparc3"; then - CTARGET_OPT="sparcv9b-unknown-linux-gnu" - elif { is_crosscompile && want_nptl; } || is-flag "-mcpu=ultrasparc2" || is-flag "-mcpu=ultrasparc"; then - CTARGET_OPT="sparcv9-unknown-linux-gnu" - fi - fi - ;; - esac - - if [[ -n ${CTARGET_OPT} && ${CBUILD} == ${CHOST} ]] && ! is_crosscompile; then - CBUILD_OPT=${CTARGET_OPT} - fi - - if [ "`gcc-major-version`" -ge "3" -a "`gcc-minor-version`" -ge "4" ] ; then - # broken in 3.4.x - replace-flags -march=pentium-m -mtune=pentium3 - fi - - if $(tc-getCC ${CTARGET}) -v 2>&1 | grep -q 'gcc version 3.[0123]'; then - append-flags -finline-limit=2000 - fi - - # We don't want these flags for glibc - filter-ldflags -pie - - # Lock glibc at -O2 -- linuxthreads needs it and we want to be - # conservative here - append-flags -O2 -} - -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 -} - -check_nptl_support() { - local min_kernel_version="$(KV_to_int "${NPTL_KERNEL_VERSION}")" - - echo - - einfon "Checking gcc for __thread support ... " - if want__thread ; then - echo "yes" - else - echo "no" - echo - eerror "Could not find a gcc that supports the __thread directive!" - eerror "please update to gcc-3.2.2-r1 or later, and try again." - die "No __thread support in gcc!" - fi - - # Building fails on an non-supporting kernel - einfon "Checking kernel version (>=${NPTL_KERNEL_VERSION}) ... " - if [ "`get_KV`" -lt "${min_kernel_version}" ] ; then - echo "no" - echo - eerror "You need a kernel of at least version ${NPTL_KERNEL_VERSION}" - eerror "for NPTL support!" - die "Kernel version too low!" - else - echo "yes" - fi - - # Building fails with too low linux-headers - einfon "Checking linux-headers version (>=${NPTL_KERNEL_VERSION}) ... " - if ! check_kheader_version "${min_kernel_version}"; then - echo "no" - echo - eerror "You need linux-headers of at least version ${NPTL_KERNEL_VERSION}" - eerror "for NPTL support!" - die "linux-headers version too low!" - else - echo "yes" - fi - - echo -} - -want_nptl() { - want_tls || return 1 - use nptl || return 1 - - # Archs that can use NPTL - case $(tc-arch) in - alpha|amd64|ia64|ppc|ppc64|s390|x86) - return 0; - ;; - sparc) - # >= v9 is needed for nptl. - [[ "${PROFILE_ARCH}" == "sparc" ]] && return 1 - return 0; - ;; - esac - - return 1 -} - -want_linuxthreads() { - ! use nptlonly && return 0 - want_nptl || return 0 - return 1 -} - -want_tls() { - # Archs that can use TLS (Thread Local Storage) - case $(tc-arch) in - alpha|amd64|ia64|ppc|ppc64|s390) - return 0; - ;; - sparc) - # 2.3.6 should have tls support on sparc64 - # when using newer binutils - case ${CTARGET/-*} in - sparc64*) return 1 ;; - *) return 0 ;; - esac - ;; - x86) - case ${CTARGET/-*} in - i486|i586|i686) return 0 ;; - esac - ;; - esac - - return 1 -} - -want__thread() { - want_tls || return 1 - - # For some reason --with-tls --with__thread is causing segfaults on sparc32. - [[ ${PROFILE_ARCH} == "sparc" ]] && return 1 - - [[ -n ${WANT__THREAD} ]] && return ${WANT__THREAD} - - $(tc-getCC ${CTARGET}) -c ${FILESDIR}/test-__thread.c -o ${T}/test2.o &> /dev/null - WANT__THREAD=$? - - return ${WANT__THREAD} -} - -# Under what conditions should we optimize glibc with --enable-omitfp. -# We strip -fomit-frame-pointer from CFLAGS and let the build system decide -# where it's safe to use -want_omitfp() { - [[ -n ${WANT_OMITFP} ]] && return ${WANT_OMITFP} - - WANT_OMITFP=1 - if is-flag -fomit-frame-pointer && ! use debug; then - case $(tc-arch) in - x86) - case ${CTARGET/-*} in - i386|i486|i586) WANT_OMITFP=1 ;; - *) WANT_OMITFP=0 ;; - esac - ;; - *) - WANT_OMITFP=0 - ;; - esac - fi - - return ${WANT_OMITFP} -} - -install_locales() { - unset LANGUAGE LANG LC_ALL - cd "${WORKDIR}"/${MYMAINBUILDDIR} || die "${WORKDIR}/${MYMAINBUILDDIR}" - make PARALLELMFLAGS="${MAKEOPTS} -j1" \ - install_root=${D} localedata/install-locales || die -} - -setup_locales() { - if use !userlocales ; then - einfo "userlocales not enabled, installing -ALL- locales..." - install_locales || die - elif [ -e /etc/locales.build ] ; then - einfo "Installing locales in /etc/locales.build..." - echo 'SUPPORTED-LOCALES=\' > SUPPORTED.locales - cat /etc/locales.build | grep -v -e ^$ -e ^\# | sed 's/$/\ \\/g' \ - >> SUPPORTED.locales - cat SUPPORTED.locales > ${S}/localedata/SUPPORTED || die - install_locales || die - elif [ -e ${FILESDIR}/locales.build ] ; then - einfo "Installing locales in ${FILESDIR}/locales.build..." - echo 'SUPPORTED-LOCALES=\' > SUPPORTED.locales - cat ${FILESDIR}/locales.build | grep -v -e ^$ -e ^\# | sed 's/$/\ \\/g' \ - >> SUPPORTED.locales - cat SUPPORTED.locales > ${S}/localedata/SUPPORTED || die - install_locales || die - else - einfo "Installing -ALL- locales..." - install_locales || die - fi -} - -glibc_do_configure() { - local myconf - - setup_flags - - # These should not be set, else the - # zoneinfo do not always get installed ... - unset LANGUAGE LANG LC_ALL - # silly users - unset LD_RUN_PATH - - # set addons - pushd ${S} > /dev/null - ADDONS=$(echo */configure | sed -e 's!/configure!!g;s!\(linuxthreads\|nptl\|rtkaio\|glibc-compat\)\( \|$\)!!g;s! \+$!!;s! !,!g;s!^!,!;/^,\*$/d') - popd > /dev/null - - use nls || myconf="${myconf} --disable-nls" - use erandom || myconf="${myconf} --disable-dev-erandom" - - want_omitfp && myconf="${myconf} --enable-omitfp" - - if [ "$1" == "linuxthreads" ] ; then - if want_tls && [[ ${CTARGET} != i[45]86-* ]] ; then - myconf="${myconf} --with-tls" - - if want__thread ; then - myconf="${myconf} --with-__thread" - else - myconf="${myconf} --without-__thread" - fi - else - myconf="${myconf} --without-tls --without-__thread" - fi - - myconf="${myconf} --enable-add-ons=linuxthreads${ADDONS}" - myconf="${myconf} --enable-kernel=${LT_KERNEL_VERSION}" - elif [ "$1" == "nptl" ] ; then - myconf="${myconf} --with-tls --with-__thread" - myconf="${myconf} --enable-add-ons=nptl${ADDONS}" - myconf="${myconf} --enable-kernel=${NPTL_KERNEL_VERSION}" - else - die "invalid pthread option" - fi - - if ! use build && use selinux; then - myconf="${myconf} --with-selinux" - else - myconf="${myconf} --without-selinux" - fi - - # Pick out the correct location for build headers - myconf="${myconf} - --without-cvs - --enable-bind-now - --build=${CBUILD_OPT:-${CBUILD}} - --host=${CTARGET_OPT:-${CTARGET}} - --disable-profile - --without-gd - --with-headers=$(alt_build_headers) - --prefix=$(alt_prefix) - --mandir=$(alt_prefix)/share/man - --infodir=$(alt_prefix)/share/info - --libexecdir=$(alt_prefix)/lib/misc/glibc - ${EXTRA_ECONF}" - - export CC="$(tc-getCC ${CTARGET})" - - GBUILDDIR=${WORKDIR}/build-${ABI}-${CTARGET}-$1 - mkdir -p ${GBUILDDIR} - cd ${GBUILDDIR} - einfo "Configuring GLIBC for $1 with: ${myconf// /\n\t\t}" - ${S}/configure ${myconf} || die "failed to configure glibc" -} - -fix_lib64_symlinks() { - # the original Gentoo/AMD64 devs decided that since 64bit is the native - # bitdepth for AMD64, lib should be used for 64bit libraries. however, - # this ignores the FHS and breaks multilib horribly... especially - # since it wont even work without a lib64 symlink anyways. *rolls eyes* - # see bug 59710 for more information. - # Travis Tilley (08 Aug 2004) - if [ -L ${ROOT}/lib64 ] ; then - ewarn "removing /lib64 symlink and moving lib to lib64..." - ewarn "dont hit ctrl-c until this is done" - addwrite ${ROOT}/ - rm ${ROOT}/lib64 - # now that lib64 is gone, nothing will run without calling ld.so - # directly. luckily the window of brokenness is almost non-existant - use amd64 && /lib/ld-linux-x86-64.so.2 /bin/mv ${ROOT}/lib ${ROOT}/lib64 - use ppc64 && /lib/ld64.so.1 /bin/mv ${ROOT}/lib ${ROOT}/lib64 - # all better :) - ldconfig - ln -s lib64 ${ROOT}/lib - einfo "done! :-)" - einfo "fixed broken lib64/lib symlink in ${ROOT}" - fi - if [ -L ${ROOT}/usr/lib64 ] ; then - addwrite ${ROOT}/usr - rm ${ROOT}/usr/lib64 - mv ${ROOT}/usr/lib ${ROOT}/usr/lib64 - ln -s lib64 ${ROOT}/usr/lib - einfo "fixed broken lib64/lib symlink in ${ROOT}/usr" - fi - if [ -L ${ROOT}/usr/X11R6/lib64 ] ; then - addwrite ${ROOT}/usr/X11R6 - rm ${ROOT}/usr/X11R6/lib64 - mv ${ROOT}/usr/X11R6/lib ${ROOT}/usr/X11R6/lib64 - ln -s lib64 ${ROOT}/usr/X11R6/lib - einfo "fixed broken lib64/lib symlink in ${ROOT}/usr/X11R6" - fi -} - -use_multilib() { - case ${CTARGET} in - sparc64*|mips64*|amd64|ppc64) - is_crosscompile || has_multilib_profile || use multilib ;; - *) false ;; - esac -} - -# Setup toolchain variables that would be defined in the profiles for these archs. -crosscompile_setup() { - if is_crosscompile || tc-is-cross-compiler; then - # CFLAGS are used by ${CTARGET}-gcc - local VAR="CFLAGS_"${CTARGET//-/_} - CFLAGS=${!VAR-"-O2"} - - case ${CTARGET} in - x86_64*) - export CFLAGS_x86=${CFLAGS_x86--m32} - export CHOST_x86=${CTARGET/x86_64/i686} - export CDEFINE_x86="__i386__" - export LIBDIR_x86="lib" - - export CFLAGS_amd64=${CFLAGS_amd64--m64} - export CHOST_amd64=${CTARGET} - export CDEFINE_amd64="__x86_64__" - export LIBDIR_amd64="lib64" - - export MULTILIB_ABIS="amd64" - export DEFAULT_ABI="amd64" - ;; - mips64*) - export CFLAGS_o32=${CFLAGS_o32--mabi=32} - export CHOST_o32=${CTARGET/mips64/mips} - export CDEFINE_o32="_ABIO32" - export LIBDIR_o32="lib" - - export CFLAGS_n32=${CFLAGS_n32--mabi=n32} - export CHOST_n32=${CTARGET} - export CDEFINE_n32="_ABIN32" - export LIBDIR_n32="lib32" - - export CFLAGS_n64=${CFLAGS_n64--mabi=64} - export CHOST_n64=${CTARGET} - export CDEFINE_n64="_ABI64" - export LIBDIR_n64="lib64" - - export MULTILIB_ABIS="n64 n32" - export DEFAULT_ABI="n32" - ;; - powerpc64*) - export CFLAGS_ppc=${CFLAGS_ppc--m32} - export CHOST_ppc=${CTARGET/powerpc64/powerpc} - export CDEFINE_ppc="!__powerpc64__" - export LIBDIR_ppc="lib" - - export CFLAGS_ppc64=${CFLAGS_ppc64--m64} - export CHOST_ppc64=${CTARGET} - export CDEFINE_ppc64="__powerpc64__" - export LIBDIR_ppc64="lib64" - - export MULTILIB_ABIS="ppc64" - export DEFAULT_ABI="ppc64" - ;; - sparc64*) - export CFLAGS_sparc32=${CFLAGS_sparc--m32} - export CHOST_sparc32=${CTARGET/sparc64/sparc} - export CDEFINE_sparc32="!__arch64__" - export LIBDIR_sparc32="lib" - - export CFLAGS_sparc64=${CFLAGS_sparc64--m64} - export CHOST_sparc64=${CTARGET} - export CDEFINE_sparc64="__arch64__" - export LIBDIR_sparc64="lib64" - - export MULTILIB_ABIS="sparc64" - export DEFAULT_ABI="sparc64" - ;; - *) - export MULTILIB_ABIS="default" - export DEFAULT_ABI="default" - esac - - ABI=${DEFAULT_ABI} - fi -} - -### /ECLASS PUNTAGE ### - -if is_crosscompile ; then - SLOT="${CTARGET}-2.2" -else - SLOT="2.2" -fi - -# we'll handle stripping ourself #46186 -RESTRICT="nostrip multilib-pkg-force" - -# We need new cleanup attribute support from gcc for NPTL among things ... -# We also need linux26-headers if using NPTL. Including kernel headers is -# incredibly unreliable, and this new linux-headers release from plasmaroo -# should work with userspace apps, at least on amd64 and ppc64. -# -# The gcc-config dep is for the cross-compile multilib stuff -DEPEND=">=sys-devel/gcc-3.2.3-r1 - nptl? ( >=sys-devel/gcc-3.3.1-r1 >=sys-kernel/linux-headers-${NPTL_KERNEL_VERSION} ) - >=sys-devel/binutils-2.14.90.0.6-r1 - || ( app-admin/eselect-compiler >=sys-devel/gcc-config-1.3.9 ) - virtual/os-headers - nls? ( sys-devel/gettext ) - selinux? ( !build? ( sys-libs/libselinux ) )" -RDEPEND="nls? ( sys-devel/gettext ) - selinux? ( !build? ( sys-libs/libselinux ) )" - -if [[ ${CATEGORY/cross-} != ${CATEGORY} ]] ; then - DEPEND="${DEPEND} ${CATEGORY}/gcc" - - if [[ ${CATEGORY} == *-linux* ]] ; then - if [[ ${CATEGORY/mips} != ${CATEGORY} ]] ; then - DEPEND="${DEPEND} >=${CATEGORY}/mips-headers-2.6.10" - else - DEPEND="${DEPEND} ${CATEGORY}/linux-headers" - fi - fi -fi - -pkg_setup() { - if use nptlonly && ! use nptl ; then - eerror "If you want nptlonly, add nptl to your USE too ;p" - die "nptlonly without nptl" - fi - - - # give some sort of warning about the nptl logic changes... - if want_nptl && want_linuxthreads ; then - - if use ppc ; then - eerror "glibc doesn't currently work with nptl and linuxthreads" - eerror "please select either nptlonly or -nptl" - die "nptlonly not set on ppc" - fi - ewarn "Warning! Gentoo's GLIBC with NPTL enabled now behaves like the" - ewarn "glibc from almost every other distribution out there. This means" - ewarn "that glibc is compiled -twice-, once with linuxthreads and once" - ewarn "with nptl. The NPTL version is installed to lib/tls and is still" - ewarn "used by default. If you do not need nor want the linuxthreads" - ewarn "fallback, you can disable this behavior by adding nptlonly to" - ewarn "USE to save yourself some compile time." - - ebeep - epause 5 - fi -} - -src_unpack() { - crosscompile_setup - export ABI="${DEFAULT_ABI}" - - case $(tc-arch) in - hppa) - GLIBC_PATCH_EXCLUDE="${GLIBC_PATCH_EXCLUDE} 2000-all-2.3.2-propolice-guard-functions-v3.patch" - use hardened || GLIBC_PATCH_EXCLUDE="${GLIBC_PATCH_EXCLUDE} 6490_hppa_hardened-disable__init_arrays.patch" - ;; - mips) - GLIBC_PATCH_EXCLUDE="${GLIBC_PATCH_EXCLUDE} 3000-all-2.3.4-dl_execstack-PaX-support.patch" - use_multilib && GLIBC_PATCH_EXCLUDE="${GLIBC_PATCH_EXCLUDE} 6680_mips_nolib3264.patch" - ;; - esac - - GLIBC_PATCH_EXCLUDE="${GLIBC_PATCH_EXCLUDE} 5020_all_nomalloccheck.patch" - - toolchain-glibc_src_unpack - - case $(tc-arch) in - alpha) - # Is this still needed? - rm -f sysdeps/alpha/alphaev6/memcpy.S - ;; - amd64) - if ! has_multilib_profile && ! is_crosscompile; then - # CONF_LIBDIR support - epatch ${FILESDIR}/2.3.4/glibc-gentoo-libdir.patch - sed -i -e "s:@GENTOO_LIBDIR@:$(get_libdir):g" ${S}/sysdeps/unix/sysv/linux/configure - fi - ;; - ppc64) - # setup lib -- seems like a good place to set this up - has_multilib_profile || get_libdir_override lib64 - ;; - esac - - # disable binutils -as-needed - sed -e 's/^have-as-needed.*/have-as-needed = no/' -i ${S}/config.make.in - - # Glibc is stupid sometimes, and doesn't realize that with a - # static C-Only gcc, -lgcc_eh doesn't exist. - # http://sources.redhat.com/ml/libc-alpha/2003-09/msg00100.html - # http://sourceware.org/ml/libc-alpha/2005-02/msg00042.html - echo 'int main(){}' > ${T}/gcc_eh_test.c - if ! $(tc-getCC ${CTARGET}) ${T}/gcc_eh_test.c -lgcc_eh 2>/dev/null ; then - sed -i -e 's:-lgcc_eh::' Makeconfig || die "sed gcc_eh" - fi - - # Some configure checks fail on the first emerge through because they - # try to link. This doesn't work well if we don't have a libc yet. - # http://sourceware.org/ml/libc-alpha/2005-02/msg00042.html - if is_crosscompile && use build; then - rm ${S}/sysdeps/sparc/sparc64/elf/configure{,.in} - rm ${S}/nptl/sysdeps/pthread/configure{,.in} - fi - - find . -type f -size 0 -o -name "*.orig" -exec rm -f {} \; - find . -name configure -exec touch {} \; - - # Fix permissions on some of the scripts - chmod u+x ${S}/scripts/*.sh -} - -src_compile() { - crosscompile_setup - - if [[ -z ${OABI} ]] && has_multilib_profile ; then - # MULTILIB-CLEANUP: Fix this when FEATURES=multilib-pkg is in portage - local MLTEST=$(type dyn_unpack) - if [[ ${MLTEST/set_abi} == "${MLTEST}" ]] ; then - OABI=${ABI} - einfo "Building multilib glibc for ABIs: $(get_install_abis)" - for ABI in $(get_install_abis) ; do - export ABI=${ABI} - src_compile - done - ABI=${OABI} - unset OABI - return 0 - fi - unset MLTEST - fi - - ABI=${ABI:-default} - toolchain-glibc_src_compile -} - -src_test() { - crosscompile_setup - - if [[ -z ${OABI} ]] && has_multilib_profile ; then - # MULTILIB-CLEANUP: Fix this when FEATURES=multilib-pkg is in portage - local MLTEST=$(type dyn_unpack) - if [[ ${MLTEST/set_abi} == "${MLTEST}" ]] ; then - OABI=${ABI} - einfo "Testing multilib glibc for ABIs: $(get_install_abis)" - for ABI in $(get_install_abis) ; do - export ABI - einfo " Testing ${ABI} glibc" - src_test - done - ABI=${OABI} - unset OABI - return 0 - fi - unset MLTEST - fi - - ABI=${ABI:-default} - toolchain-glibc_src_test -} - -src_install() { - crosscompile_setup - - if [[ -z ${OABI} ]] && has_multilib_profile ; then - # MULTILIB-CLEANUP: Fix this when FEATURES=multilib-pkg is in portage - local MLTEST=$(type dyn_unpack) - if [[ ${MLTEST/set_abi} == "${MLTEST}" ]] ; then - OABI=${ABI} - einfo "Installing multilib glibc for ABIs: $(get_install_abis)" - for ABI in $(get_install_abis) ; do - export ABI - src_install - done - ABI=${OABI} - unset OABI - return 0 - fi - unset MLTEST - fi - - ABI=${ABI:-default} - - # Handle stupid lib32 BS - unset OLD_LIBDIR - if ! is_crosscompile ; then - if [[ $(tc-arch) == "amd64" && ${ABI} == "x86" && $(get_libdir) != "lib" ]] ; then - OLD_LIBDIR=$(get_libdir) - LIBDIR_x86="lib" - fi - - if [[ $(tc-arch) == "ppc64" && ${ABI} == "ppc" && $(get_libdir) != "lib" ]] ; then - OLD_LIBDIR=$(get_libdir) - LIBDIR_ppc="lib" - fi - fi - - toolchain-glibc_src_install - - # Handle stupid lib32 BS on amd64 and ppc64 - if [[ -n ${OLD_LIBDIR} ]] ; then - cd "${S}" - [[ $(tc-arch) == "amd64" ]] && LIBDIR_x86=${OLD_LIBDIR} - [[ $(tc-arch) == "ppc64" ]] && LIBDIR_ppc=${OLD_LIBDIR} - unset OLD_LIBDIR - - mv "${D}"/lib "${D}"/$(get_libdir) - mv "${D}"/usr/lib "${D}"/usr/$(get_libdir) - dodir /lib - dodir /usr/lib - mv "${D}"/usr/$(get_libdir)/locale "${D}"/usr/lib - [[ $(tc-arch) == "amd64" ]] && dosym ../$(get_libdir)/ld-linux.so.2 /lib/ld-linux.so.2 - [[ $(tc-arch) == "ppc64" ]] && dosym ../$(get_libdir)/ld.so.1 /lib/ld.so.1 - - for f in "${D}"/usr/$(get_libdir)/*.so; do - local basef=$(basename "${f}") - if [[ -L ${f} ]] ; then - local target=$(readlink "${f}") - target=${target/\/lib\//\/$(get_libdir)\/} - rm "${f}" - dosym "${target}" /usr/$(get_libdir)/"${basef}" - fi - done - - dosed "s:/lib/:/$(get_libdir)/:g" /usr/$(get_libdir)/lib{c,pthread}.so - - if want_nptl && want_linuxthreads ; then - dosed "s:/lib/:/$(get_libdir)/:g" /usr/$(get_libdir)/nptl/lib{c,pthread}.so - fi - fi -} - -pkg_preinst() { - toolchain-glibc_pkg_preinst -} - -pkg_postinst() { - toolchain-glibc_pkg_postinst -} diff --git a/sys-libs/glibc/glibc-2.3.6-r1.ebuild b/sys-libs/glibc/glibc-2.3.6-r1.ebuild deleted file mode 100644 index ba7c36977aab..000000000000 --- a/sys-libs/glibc/glibc-2.3.6-r1.ebuild +++ /dev/null @@ -1,1360 +0,0 @@ -# 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.3.6-r1.ebuild,v 1.23 2006/05/30 19:45:22 eradicator Exp $ - -# Here's how the cross-compile logic breaks down ... -# CTARGET - machine that will target the binaries -# CHOST - machine that will host the binaries -# CBUILD - machine that will build the binaries -# If CTARGET != CHOST, it means you want a libc for cross-compiling. -# If CHOST != CBUILD, it means you want to cross-compile the libc. -# CBUILD = CHOST = CTARGET - native build/install -# CBUILD != (CHOST = CTARGET) - cross-compile a native build -# (CBUILD = CHOST) != CTARGET - libc for cross-compiler -# CBUILD != CHOST != CTARGET - cross-compile a libc for a cross-compiler -# For install paths: -# CHOST = CTARGET - install into / -# CHOST != CTARGET - install into /usr/CTARGET/ - -#KEYWORDS="~amd64 ~arm -hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" -KEYWORDS="-* ~mips ~ppc" - -BRANCH_UPDATE="" - -# From linuxthreads/man -GLIBC_MANPAGE_VERSION="2.3.6-1" - -# From manual -GLIBC_INFOPAGE_VERSION="2.3.6" - -# Gentoo patchset -PATCH_VER="1.3" - -# C Stubbs addon (contained in fedora, so ignoring) -#CSTUBS_VER="2.1.2" -#CSTUBS_TARBALL="c_stubs-${CSTUBS_VER}.tar.bz2" -#CSTUBS_URI="mirror://gentoo/${CSTUBS_TARBALL}" - -# Fedora addons (from RHEL's glibc-2.3.4-2.src.rpm) -FEDORA_VER="20041219T2331" -FEDORA_TARBALL="glibc-fedora-${FEDORA_VER}.tar.bz2" -FEDORA_URI="mirror://gentoo/${FEDORA_TARBALL}" - -GENTOO_TOOLCHAIN_BASE_URI="mirror://gentoo" -GENTOO_TOOLCHAIN_DEV_URI="http://dev.gentoo.org/~azarah/glibc" - -### PUNT OUT TO ECLASS?? ### -inherit eutils versionator libtool toolchain-funcs flag-o-matic gnuconfig multilib - -DESCRIPTION="GNU libc6 (also called glibc2) C library" -HOMEPAGE="http://www.gnu.org/software/libc/libc.html" -LICENSE="LGPL-2" - -IUSE="nls pic build nptl nptlonly erandom hardened userlocales multilib selinux glibc-compat20 glibc-omitfp linuxthreads-tls profile" - -export CBUILD=${CBUILD:-${CHOST}} -export CTARGET=${CTARGET:-${CHOST}} -if [[ ${CTARGET} == ${CHOST} ]] ; then - if [[ ${CATEGORY/cross-} != ${CATEGORY} ]] ; then - export CTARGET=${CATEGORY/cross-} - fi -fi -if [[ ${CTARGET} == ${CHOST} ]] ; then - PROVIDE="virtual/libc" -fi - -is_crosscompile() { - [[ ${CHOST} != ${CTARGET} ]] -} -just_headers() { - is_crosscompile && has _E_CROSS_HEADERS_ONLY ${USE} -} - -GLIBC_RELEASE_VER=$(get_version_component_range 1-3) - -# Don't set this to :-, - allows BRANCH_UPDATE="" -BRANCH_UPDATE=${BRANCH_UPDATE-$(get_version_component_range 4)} - -# (Recent snapshots fails with 2.6.5 and earlier with NPTL) -NPTL_KERNEL_VERSION=${NPTL_KERNEL_VERSION:-"2.6.6"} -LT_KERNEL_VERSION=${LT_KERNEL_VERSION:-"2.4.1"} - -### SRC_URI ### - -# This function handles the basics of setting the SRC_URI for a glibc ebuild. -# To use, set SRC_URI with: -# -# SRC_URI="$(get_glibc_src_uri)" -# -# Other than the variables normally set by portage, this function's behavior -# can be altered by setting the following: -# -# GENTOO_TOOLCHAIN_BASE_URI -# This sets the base URI for all gentoo-specific patch files. Note -# that this variable is only important for a brief period of time, -# before your source files get picked up by mirrors. However, it is -# still highly suggested that you keep files in this location -# available. -# -# BRANCH_UPDATE -# If set, this variable signals that we should be using the main -# release tarball (determined by ebuild version) and applying a -# CVS branch update patch against it. The location of this branch -# update patch is assumed to be in ${GENTOO_TOOLCHAIN_BASE_URI}. -# Just like with SNAPSHOT, this variable is ignored if the ebuild -# has a _pre suffix. -# -# PATCH_VER -# PATCH_GLIBC_VER -# This should be set to the version of the gentoo patch tarball. -# The resulting filename of this tarball will be: -# glibc-${PATCH_GLIBC_VER:-${GLIBC_RELEASE_VER}}-patches-${PATCH_VER}.tar.bz2 -# -# GLIBC_MANPAGE_VERSION -# GLIBC_INFOPAGE_VERSION -# The version of glibc for which we will download pages. This will -# default to ${GLIBC_RELEASE_VER}, but we may not want to pre-generate man pages -# for prerelease test ebuilds for example. This allows you to -# continue using pre-generated manpages from the last stable release. -# If set to "none", this will prevent the downloading of manpages, -# which is useful for individual library targets. -# -get_glibc_src_uri() { - GENTOO_TOOLCHAIN_BASE_URI=${GENTOO_TOOLCHAIN_BASE_URI:-"mirror://gentoo"} - -# GLIBC_SRC_URI="http://ftp.gnu.org/gnu/glibc/glibc-${GLIBC_RELEASE_VER}.tar.bz2 -# http://ftp.gnu.org/gnu/glibc/glibc-linuxthreads-${GLIBC_RELEASE_VER}.tar.bz2 -# http://ftp.gnu.org/gnu/glibc/glibc-libidn-${GLIBC_RELEASE_VER}.tar.bz2 - GLIBC_SRC_URI="mirror://gnu/glibc/glibc-${GLIBC_RELEASE_VER}.tar.bz2 - mirror://gnu/glibc/glibc-linuxthreads-${GLIBC_RELEASE_VER}.tar.bz2 - mirror://gnu/glibc/glibc-libidn-${GLIBC_RELEASE_VER}.tar.bz2" - - if [[ -n ${BRANCH_UPDATE} ]] ; then - GLIBC_SRC_URI="${GLIBC_SRC_URI} - ${GENTOO_TOOLCHAIN_BASE_URI}/glibc-${GLIBC_RELEASE_VER}-branch-update-${BRANCH_UPDATE}.patch.bz2" - [[ -n ${GENTOO_TOOLCHAIN_DEV_URI} ]] && - GLIBC_SRC_URI="${GLIBC_SRC_URI} - ${GENTOO_TOOLCHAIN_DEV_URI}/glibc-${GLIBC_RELEASE_VER}-branch-update-${BRANCH_UPDATE}.patch.bz2" - fi - - if [[ -n ${PATCH_VER} ]] ; then - GLIBC_SRC_URI="${GLIBC_SRC_URI} - ${GENTOO_TOOLCHAIN_BASE_URI}/glibc-${PATCH_GLIBC_VER:-${GLIBC_RELEASE_VER}}-patches-${PATCH_VER}.tar.bz2" - [[ -n ${GENTOO_TOOLCHAIN_DEV_URI} ]] && - GLIBC_SRC_URI="${GLIBC_SRC_URI} - ${GENTOO_TOOLCHAIN_DEV_URI}/glibc-${PATCH_GLIBC_VER:-${GLIBC_RELEASE_VER}}-patches-${PATCH_VER}.tar.bz2" - fi - - if [[ ${GLIBC_MANPAGE_VERSION} != "none" ]] ; then - GLIBC_SRC_URI="${GLIBC_SRC_URI} - ${GENTOO_TOOLCHAIN_BASE_URI}/glibc-manpages-${GLIBC_MANPAGE_VERSION:-${GLIBC_RELEASE_VER}}.tar.bz2" - [[ -n ${GENTOO_TOOLCHAIN_DEV_URI} ]] && - GLIBC_SRC_URI="${GLIBC_SRC_URI} - ${GENTOO_TOOLCHAIN_DEV_URI}/glibc-manpages-${GLIBC_MANPAGE_VERSION:-${GLIBC_RELEASE_VER}}.tar.bz2" - fi - - if [[ ${GLIBC_INFOPAGE_VERSION} != "none" ]] ; then - GLIBC_SRC_URI="${GLIBC_SRC_URI} - ${GENTOO_TOOLCHAIN_BASE_URI}/glibc-infopages-${GLIBC_INFOPAGE_VERSION:-${GLIBC_RELEASE_VER}}.tar.bz2" - [[ -n ${GENTOO_TOOLCHAIN_DEV_URI} ]] && - GLIBC_SRC_URI="${GLIBC_SRC_URI} - ${GENTOO_TOOLCHAIN_DEV_URI}/glibc-infopages-${GLIBC_INFOPAGE_VERSION:-${GLIBC_RELEASE_VER}}.tar.bz2" - fi - - if [[ -n ${CSTUBS_URI} ]] ; then - GLIBC_SRC_URI="${GLIBC_SRC_URI} ${CSTUBS_URI}" - fi - - if [[ -n ${FEDORA_URI} ]] ; then - GLIBC_SRC_URI="${GLIBC_SRC_URI} ${FEDORA_URI}" - fi - - echo "${GLIBC_SRC_URI}" -} - -SRC_URI=$(get_glibc_src_uri) -S=${WORKDIR}/glibc-${GLIBC_RELEASE_VER} - -### EXPORTED FUNCTIONS ### -toolchain-glibc_src_unpack() { - # Check NPTL support _before_ we unpack things to save some time - want_nptl && check_nptl_support - - unpack glibc-${GLIBC_RELEASE_VER}.tar.bz2 - - cd "${S}" - unpack glibc-linuxthreads-${GLIBC_RELEASE_VER}.tar.bz2 - unpack glibc-libidn-${GLIBC_RELEASE_VER}.tar.bz2 - - [[ -n ${CSTUBS_TARBALL} ]] && unpack ${CSTUBS_TARBALL} - [[ -n ${FEDORA_TARBALL} ]] && unpack ${FEDORA_TARBALL} - - if [[ -n ${PATCH_VER} ]] ; then - cd "${WORKDIR}" - unpack glibc-${PATCH_GLIBC_VER:-${GLIBC_RELEASE_VER}}-patches-${PATCH_VER}.tar.bz2 - fi - - # XXX: We should do the branchupdate, before extracting the manpages and - # infopages else it does not help much (mtimes change if there is a change - # to them with branchupdate) - if [[ -n ${BRANCH_UPDATE} ]] ; then - cd "${S}" - epatch "${DISTDIR}"/glibc-${GLIBC_RELEASE_VER}-branch-update-${BRANCH_UPDATE}.patch.bz2 - - # Snapshot date patch - einfo "Patching version to display snapshot date ..." - sed -i -e "s:\(#define RELEASE\).*:\1 \"${BRANCH_UPDATE}\":" version.h - fi - - if [[ ${GLIBC_MANPAGE_VERSION} != "none" ]] ; then - cd "${WORKDIR}" - unpack glibc-manpages-${GLIBC_MANPAGE_VERSION:-${GLIBC_RELEASE_VER}}.tar.bz2 - fi - - if [[ ${GLIBC_INFOPAGE_VERSION} != "none" ]] ; then - cd "${S}" - unpack glibc-infopages-${GLIBC_INFOPAGE_VERSION:-${GLIBC_RELEASE_VER}}.tar.bz2 - fi - - if [[ -n ${PATCH_VER} ]] ; then - cd "${S}" - EPATCH_MULTI_MSG="Applying Gentoo Glibc Patchset ${PATCH_GLIBC_VER:-${GLIBC_RELEASE_VER}}-${PATCH_VER} ..." \ - EPATCH_EXCLUDE=${GLIBC_PATCH_EXCLUDE} \ - EPATCH_SUFFIX="patch" \ - ARCH=$(tc-arch) \ - epatch "${WORKDIR}"/patches - fi -} - -toolchain-glibc_src_compile() { - # Set gconvdir to /usr/$(get_libdir)/gconv on archs with multiple ABIs - local MAKEFLAGS="" - has_multilib_profile && MAKEFLAGS="gconvdir=$(alt_usrlibdir)/gconv" - - echo - for v in ABI CBUILD CHOST CTARGET CBUILD_OPT CTARGET_OPT CC CFLAGS ; do - einfo " $(printf '%15s' ${v}:) ${!v}" - done - echo - - if want_linuxthreads ; then - glibc_do_configure linuxthreads - einfo "Building GLIBC with linuxthreads..." - make PARALLELMFLAGS="${MAKEOPTS}" ${MAKEFLAGS} || die "make for ${ABI} failed" - fi - if want_nptl ; then - # ... and then do the optional nptl build - unset LD_ASSUME_KERNEL - glibc_do_configure nptl - einfo "Building GLIBC with NPTL..." - make PARALLELMFLAGS="${MAKEOPTS}" ${MAKEFLAGS} || die "make for ${ABI} failed" - fi -} - -toolchain-glibc_headers_compile() { - GBUILDDIR=${WORKDIR}/build-${ABI}-${CTARGET}-headers - mkdir -p "${GBUILDDIR}" - cd "${GBUILDDIR}" - - # Pick out the correct location for build headers - local myconf="--disable-sanity-checks --enable-hacker-mode" - myconf="${myconf} - --enable-add-ons=linuxthreads - --without-cvs - --enable-bind-now - --build=${CBUILD_OPT:-${CBUILD}} - --host=${CTARGET_OPT:-${CTARGET}} - --with-headers=$(alt_build_headers) - --prefix=$(alt_prefix) - --mandir=$(alt_prefix)/share/man - --infodir=$(alt_prefix)/share/info - --libexecdir=$(alt_prefix)/lib/misc/glibc - ${EXTRA_ECONF}" - - einfo "Configuring GLIBC headers with: ${myconf// /\n\t\t}" - CC=gcc \ - CFLAGS="-O1 -pipe" \ - ${S}/configure ${myconf} || die "failed to configure glibc" -} - -toolchain-glibc_src_test() { - # This is wrong, but glibc's tests fail bad when screwing - # around with sandbox, so lets just punt it - unset LD_PRELOAD - - # do the linuxthreads build unless we're using nptlonly - if want_linuxthreads ; then - cd "${WORKDIR}"/build-${ABI}-${CTARGET}-linuxthreads - einfo "Checking GLIBC with linuxthreads..." - make check || die "linuxthreads glibc did not pass make check" - fi - if want_nptl ; then - cd "${WORKDIR}"/build-${ABI}-${CTARGET}-nptl - unset LD_ASSUME_KERNEL || : - einfo "Checking GLIBC with NPTL..." - make check || die "nptl glibc did not pass make check" - fi -} - -toolchain-glibc_pkg_preinst() { - # PPC64+others may want to eventually be added to this logic if they - # decide to be multilib compatible and FHS compliant. note that this - # chunk of FHS compliance only applies to 64bit archs where 32bit - # compatibility is a major concern (not IA64, for example). - - # amd64's 2005.0 is the first amd64 profile to not need this code. - # 2005.0 is setup properly, and this is executed as part of the - # 2004.3 -> 2005.0 upgrade script. - # 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 ]] && ! { want_nptl && want_linuxthreads; }; then - addwrite "${ROOT}"/$(alt_libdir)/ - ewarn "nptlonly or -nptl in USE, removing /${ROOT}$(alt_libdir)/tls..." - rm -r "${ROOT}"/$(alt_libdir)/tls || die - fi - - # Shouldnt need to keep this updated - [[ -e ${ROOT}/etc/locales.build ]] && rm -f "${D}"/etc/locales.build -} - -toolchain-glibc_src_install() { - # Need to dodir first because it might not exist (bad amd64 profiles) - dodir $(alt_usrlibdir) - - # These should not be set, else the - # zoneinfo do not always get installed ... - unset LANGUAGE LANG LC_ALL - - if want_linuxthreads ; then - cd "${WORKDIR}"/build-${ABI}-${CTARGET}-linuxthreads - einfo "Installing GLIBC ${ABI} with linuxthreads ..." - make PARALLELMFLAGS="${MAKEOPTS} -j1" \ - install_root="${D}" \ - install || die - else # nptlonly - cd "${WORKDIR}"/build-${ABI}-${CTARGET}-nptl - einfo "Installing GLIBC ${ABI} with NPTL ..." - make PARALLELMFLAGS="${MAKEOPTS} -j1" \ - install_root="${D}" \ - install || die - fi - - if is_crosscompile ; then - # punt all the junk not needed by a cross-compiler - rm -rf "${D}"$(alt_prefix)/{bin,etc,$(get_libdir)/{gconv,misc},sbin,share} - else - # zoneinfo stuff is now provided by the timezone-data package - rm -rf "${D}"/usr/share/zoneinfo - rm -f "${D}"/usr/bin/tzselect - rm -f "${D}"/usr/sbin/{zic,zdump} - fi - - if want_linuxthreads && want_nptl ; then - einfo "Installing NPTL to $(alt_libdir)/tls/..." - cd "${WORKDIR}"/build-${ABI}-${CTARGET}-nptl - mkdir -p "${D}"$(alt_libdir)/tls/ - - libcsofile=$(basename "${D}"$(alt_libdir)/libc-*.so) - cp -a libc.so "${D}"$(alt_libdir)/tls/${libcsofile} || die - dosym ${libcsofile} $(alt_libdir)/tls/$(ls libc.so.*) - - libmsofile=$(basename "${D}"$(alt_libdir)/libm-*.so) - pushd math > /dev/null - cp -a libm.so "${D}"$(alt_libdir)/tls/${libmsofile} || die - dosym ${libmsofile} $(alt_libdir)/tls/$(ls libm.so.*) - popd > /dev/null - - librtsofile=$(basename "${D}"$(alt_libdir)/librt-*.so) - pushd rt > /dev/null - cp -a librt.so "${D}"$(alt_libdir)/tls/${librtsofile} || die - dosym ${librtsofile} $(alt_libdir)/tls/$(ls librt.so.*) - popd > /dev/null - - libthreaddbsofile=$(basename "${D}"$(alt_libdir)/libthread_db-*.so) - pushd nptl_db > /dev/null - cp -a libthread_db.so "${D}"$(alt_libdir)/tls/${libthreaddbsofile} || die - dosym ${libthreaddbsofile} $(alt_libdir)/tls/$(ls libthread_db.so.*) - popd > /dev/null - - libpthreadsofile=libpthread-${GLIBC_RELEASE_VER}.so - cp -a nptl/libpthread.so "${D}"$(alt_libdir)/tls/${libpthreadsofile} || die - dosym ${libpthreadsofile} $(alt_libdir)/tls/libpthread.so.0 - - # and now for the static libs - mkdir -p "${D}"$(alt_usrlibdir)/nptl - cp -a libc.a nptl/libpthread.a nptl/libpthread_nonshared.a rt/librt.a \ - "${D}"$(alt_usrlibdir)/nptl - - # linker script crap - for lib in libc libpthread; do - sed -e "s:$(alt_libdir)/${lib}.so:$(alt_libdir)/tls/${lib}.so:g" \ - -e "s:$(alt_usrlibdir)/${lib}_nonshared.a:$(alt_usrlibdir)/nptl/${lib}_nonshared.a:g" \ - "${D}"$(alt_usrlibdir)/${lib}.so \ - > "${D}"$(alt_usrlibdir)/nptl/${lib}.so - - chmod 755 "${D}"$(alt_usrlibdir)/nptl/${lib}.so - done - - dosym ../librt.so $(alt_usrlibdir)/nptl/librt.so - - # last but not least... headers. - mkdir -p "${D}"/nptl "${D}"$(alt_headers)/nptl - make install_root="${D}"/nptl install-headers PARALLELMFLAGS="${MAKEOPTS} -j1" - pushd "${D}"/nptl/$(alt_headers) > /dev/null - for i in $(find . -type f) ; do - if ! [[ -f ${D}$(alt_headers)/$i ]] \ - || ! cmp -s $i ${D}$(alt_headers)/$i; then - mkdir -p ${D}$(alt_headers)/nptl/`dirname $i` - cp -a $i ${D}$(alt_headers)/nptl/$i - fi - done - popd > /dev/null - rm -rf ${D}/nptl - fi - - if use pic && [[ $(tc-arch) != "amd64" ]] ; then - find ${S}/${buildtarget}/ -name "soinit.os" -exec cp {} ${D}$(alt_libdir)/soinit.o \; - find ${S}/${buildtarget}/ -name "sofini.os" -exec cp {} ${D}$(alt_libdir)/sofini.o \; - find ${S}/${buildtarget}/ -name "*_pic.a" -exec cp {} ${D}$(alt_libdir) \; - find ${S}/${buildtarget}/ -name "*.map" -exec cp {} ${D}$(alt_libdir) \; - - for i in ${D}$(alt_libdir)/*.map; do - mv ${i} ${i%.map}_pic.map - done - fi - - # We'll take care of the cache ourselves - rm -f ${D}/etc/ld.so.cache - - # Some things want this, notably ash. - dosym libbsd-compat.a $(alt_usrlibdir)/libbsd.a - - # Handle includes for different ABIs - prep_ml_includes $(alt_headers) - - ################################################################# - # EVERYTHING AFTER THIS POINT IS FOR NATIVE GLIBC INSTALLS ONLY # - # Make sure we install the sys-include symlink so that when - # we build a 2nd stage cross-compiler, gcc finds the target - # system headers correctly. See gcc/doc/gccinstall.info - if is_crosscompile ; then - dosym include $(alt_prefix)/sys-include - dosym . $(alt_prefix)/usr - return 0 - fi - - # Everything past this point just needs to be done once... don't waste time building locale files twice... - is_final_abi || return 0 - - if want_linuxthreads ; then - MYMAINBUILDDIR=build-${ABI}-${CTARGET}-linuxthreads - else - MYMAINBUILDDIR=build-${ABI}-${CTARGET}-nptl - fi - cd "${WORKDIR}"/${MYMAINBUILDDIR} - if ! use build ; then - if ! has noinfo ${FEATURES} && [[ ${GLIBC_INFOPAGE_VERSION} != "none" ]] ; then - einfo "Installing info pages..." - - make PARALLELMFLAGS="${MAKEOPTS} -j1" \ - install_root=${D} \ - info -i - fi - - setup_locales - - if [[ ${GLIBC_MANPAGE_VERSION} != "none" ]] ; then - einfo "Installing man pages..." - - # Install linuxthreads man pages even if nptl is enabled - cd "${WORKDIR}"/man - doman *.3thr - fi - - # Install nscd config file - insinto /etc - doins ${FILESDIR}/nscd.conf - doins "${FILESDIR}"/nsswitch.conf - - doinitd "${FILESDIR}"/nscd - - cd ${S} - dodoc BUGS ChangeLog* CONFORMANCE FAQ INTERFACE NEWS NOTES PROJECTS README* - else - rm -rf ${D}/usr/share - for dir in $(get_all_libdirs); do - rm -rf ${D}/usr/${dir}/gconv &> /dev/null - done - fi - - # Is this next line actually needed or does the makefile get it right? - # It previously has 0755 perms which was killing things. - fperms 4711 $(alt_prefix)/lib/misc/glibc/pt_chown - - # Prevent overwriting of the /etc/localtime symlink. We'll handle the - # creation of the "factory" symlink in pkg_postinst(). - rm -f ${D}/etc/localtime - - insinto /etc - # This is our new config file for building locales - doins ${FILESDIR}/locales.build - # example host.conf with multicast dns disabled by default - doins ${FILESDIR}/2.3.4/host.conf - - # simple test to make sure our new glibc isnt completely broken. - # for now, skip the multilib scenario. also make sure we don't - # test with statically built binaries since they will fail. - [[ ${CBUILD} != ${CHOST} ]] && return 0 - [[ $(get_libdir) != "lib" ]] && return 0 - for x in date env ls true uname ; do - x=$(type -p ${x}) - [[ -z ${x} ]] && continue - striptest=$(file -L ${x} 2>/dev/null) - [[ -z ${striptest} ]] && continue - [[ ${striptest/statically linked} != "${striptest}" ]] && continue - "${D}"/$(get_libdir)/ld-*.so \ - --library-path "${D}"/$(get_libdir) \ - ${x} > /dev/null \ - || die "simple run test (${x}) failed" - done -} - -toolchain-glibc_headers_install() { - GBUILDDIR=${WORKDIR}/build-${ABI}-${CTARGET}-headers - cd "${GBUILDDIR}" - make install_root="${D}" install-headers || die "install-headers failed" - # Copy over headers that are not part of install-headers ... these - # are pretty much taken verbatim from crosstool, see it for more details - insinto $(alt_headers)/bits - doins misc/syscall-list.h bits/stdio_lim.h || die "doins include bits" - insinto $(alt_headers)/gnu - doins "${S}"/include/gnu/stubs.h || die "doins include gnu" - # Make sure we install the sys-include symlink so that when - # we build a 2nd stage cross-compiler, gcc finds the target - # system headers correctly. See gcc/doc/gccinstall.info - dosym include $(alt_prefix)/sys-include - dosym . $(alt_prefix)/usr -} - -toolchain-glibc_pkg_postinst() { - # Mixing nptlonly and -nptlonly glibc can prove dangerous if libpthread - # isn't removed in unmerge which happens sometimes. See bug #87671 - if ! is_crosscompile && want_linuxthreads ; then - for libdir in $(get_all_libdirs) ; do - for f in ${ROOT}/${libdir}/libpthread-2.* ${ROOT}/${libdir}/libpthread-0.6* ; do - if [[ -f ${f} ]] ; then - rm -f ${f} - ldconfig - fi - done - done - fi - - if ! is_crosscompile && [ -x "${ROOT}/usr/sbin/iconvconfig" ] ; then - # Generate fastloading iconv module configuration file. - ${ROOT}/usr/sbin/iconvconfig --prefix=${ROOT} - fi - - if [ ! -e "${ROOT}/lib/ld.so.1" ] && use ppc64 && ! has_multilib_profile ; then - ## SHOULDN'T THIS BE lib64?? - ln -s ld64.so.1 ${ROOT}/lib/ld.so.1 - fi - - # Reload init ... - if ! is_crosscompile && [ "${ROOT}" = "/" ] ; then - /sbin/init U &> /dev/null - fi - - # warn the few multicast-dns-by-default users we've had about the change - # in behavior... - echo - einfo "Gentoo's glibc now disables multicast dns by default in our" - einfo "example host.conf. To re-enable this functionality, simply" - einfo "remove the line that disables it (mdns off)." - echo - - if want_nptl && want_linuxthreads ; then - einfo "The default behavior of glibc on your system is to use NPTL. If" - einfo "you want to use linuxthreads for a particular program, start it" - einfo "by executing 'LD_ASSUME_KERNEL=${LT_KERNEL_VERSION} []'" - echo - fi -} - -### SUPPORT FUNCTIONS ### -# We need to be able to set alternative headers for -# compiling for non-native platform -# Will also become useful for testing kernel-headers without screwing up -# the whole system. -# note: intentionally undocumented. -alt_headers() { - if [[ -z ${ALT_HEADERS} ]] ; then - if is_crosscompile ; then - ALT_HEADERS="/usr/${CTARGET}/include" - else - ALT_HEADERS="/usr/include" - fi - fi - echo "${ALT_HEADERS}" -} -alt_build_headers() { - if [[ -z ${ALT_BUILD_HEADERS} ]] ; then - ALT_BUILD_HEADERS=$(alt_headers) - tc-is-cross-compiler && ALT_BUILD_HEADERS=${ROOT}$(alt_headers) - fi - echo "${ALT_BUILD_HEADERS}" -} - -alt_prefix() { - if is_crosscompile ; then - echo /usr/${CTARGET} - else - echo /usr - fi -} - -alt_libdir() { - if is_crosscompile ; then - echo /usr/${CTARGET}/$(get_libdir) - else - echo /$(get_libdir) - fi -} - -alt_usrlibdir() { - if is_crosscompile ; then - echo /usr/${CTARGET}/$(get_libdir) - else - echo /usr/$(get_libdir) - fi -} - -setup_flags() { - # Make sure host make.conf doesn't pollute us - if is_crosscompile || tc-is-cross-compiler ; then - CHOST=${CTARGET} strip-unsupported-flags - fi - - # Store our CFLAGS because it's changed depending on which CTARGET - # we are building when pulling glibc on a multilib profile - CFLAGS_BASE=${CFLAGS_BASE-${CFLAGS}} - CFLAGS=${CFLAGS_BASE} - ASFLAGS_BASE=${ASFLAGS_BASE-${ASFLAGS}} - ASFLAGS=${ASFLAGS_BASE} - - # Over-zealous CFLAGS can often cause problems. What may work for one - # person may not work for another. To avoid a large influx of bugs - # relating to failed builds, we strip most CFLAGS out to ensure as few - # problems as possible. - strip-flags - strip-unsupported-flags - filter-flags -m32 -m64 -mabi=* - - unset CBUILD_OPT CTARGET_OPT - if has_multilib_profile ; then - CTARGET_OPT=$(get_abi_CTARGET) - [[ -z ${CTARGET_OPT} ]] && CTARGET_OPT=$(get_abi_CHOST) - fi - - case $(tc-arch) in - amd64) - # Punt this when amd64's 2004.3 is removed - CFLAGS_x86="-m32" - ;; - ppc) - append-flags "-freorder-blocks" - ;; - sparc) - # Both sparc and sparc64 can use -fcall-used-g6. -g7 is bad, though. - filter-flags "-fcall-used-g7" - append-flags "-fcall-used-g6" - filter-flags "-mvis" - - if is_crosscompile || [[ ${PROFILE_ARCH} == "sparc64" ]] || { has_multilib_profile && ! tc-is-cross-compiler; } ; then - case ${ABI} in - sparc64) - filter-flags -Wa,-xarch -Wa,-A - - if is-flag "-mcpu=ultrasparc3"; then - CTARGET_OPT="sparc64b-unknown-linux-gnu" - append-flags "-Wa,-xarch=v9b" - export ASFLAGS="${ASFLAGS} -Wa,-xarch=v9b" - else - CTARGET_OPT="sparc64-unknown-linux-gnu" - append-flags "-Wa,-xarch=v9a" - export ASFLAGS="${ASFLAGS} -Wa,-xarch=v9a" - fi - ;; - *) - if is-flag "-mcpu=ultrasparc3"; then - CTARGET_OPT="sparcv9b-unknown-linux-gnu" - else - CTARGET_OPT="sparcv9-unknown-linux-gnu" - fi - ;; - esac - else - if is-flag "-mcpu=ultrasparc3"; then - CTARGET_OPT="sparcv9b-unknown-linux-gnu" - elif { is_crosscompile && want_nptl; } || is-flag "-mcpu=ultrasparc2" || is-flag "-mcpu=ultrasparc"; then - CTARGET_OPT="sparcv9-unknown-linux-gnu" - fi - fi - ;; - esac - - if [[ -n ${CTARGET_OPT} && ${CBUILD} == ${CHOST} ]] && ! is_crosscompile; then - CBUILD_OPT=${CTARGET_OPT} - fi - - if $(tc-getCC ${CTARGET}) -v 2>&1 | grep -q 'gcc version 3.[0123]'; then - append-flags -finline-limit=2000 - fi - - # We don't want these flags for glibc - filter-ldflags -pie - - # Lock glibc at -O2 -- linuxthreads needs it and we want to be - # conservative here - filter-flags -O? - append-flags -O2 -} - -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 -} - -check_nptl_support() { - local min_kernel_version="$(KV_to_int "${NPTL_KERNEL_VERSION}")" - - echo - - einfon "Checking gcc for __thread support ... " - if want__thread ; then - echo "yes" - else - echo "no" - echo - eerror "Could not find a gcc that supports the __thread directive!" - eerror "please update to gcc-3.2.2-r1 or later, and try again." - die "No __thread support in gcc!" - fi - - # Building fails on an non-supporting kernel - einfon "Checking kernel version (>=${NPTL_KERNEL_VERSION}) ... " - if [ "`get_KV`" -lt "${min_kernel_version}" ] ; then - echo "no" - echo - eerror "You need a kernel of at least version ${NPTL_KERNEL_VERSION}" - eerror "for NPTL support!" - die "Kernel version too low!" - else - echo "yes" - fi - - # Building fails with too low linux-headers - einfon "Checking linux-headers version (>=${NPTL_KERNEL_VERSION}) ... " - if ! check_kheader_version "${min_kernel_version}"; then - echo "no" - echo - eerror "You need linux-headers of at least version ${NPTL_KERNEL_VERSION}" - eerror "for NPTL support!" - die "linux-headers version too low!" - else - echo "yes" - fi - - echo -} - -want_nptl() { - want_tls || return 1 - use nptl || return 1 - - # Archs that can use NPTL - case $(tc-arch) in - alpha|amd64|ia64|mips|ppc|ppc64|s390|sh|x86) - return 0; - ;; - sparc) - # >= v9 is needed for nptl. - [[ "${PROFILE_ARCH}" == "sparc" ]] && return 1 - return 0; - ;; - esac - - return 1 -} - -want_linuxthreads() { - ! use nptlonly && return 0 - want_nptl || return 0 - return 1 -} - -want_tls() { - # Archs that can use TLS (Thread Local Storage) - case $(tc-arch) in - alpha|amd64|ia64|mips|ppc|ppc64|s390|sh) - return 0; - ;; - sparc) - # 2.3.6 should have tls support on sparc64 - # when using newer binutils - case ${CTARGET/-*} in - sparc64*) return 1 ;; - *) return 0 ;; - esac - ;; - x86) - # requires i486 or better #106556 - [[ ${CTARGET} == i[4567]86* ]] && return 0 - ;; - esac - - return 1 -} - -want__thread() { - want_tls || return 1 - - # For some reason --with-tls --with__thread is causing segfaults on sparc32. - [[ ${PROFILE_ARCH} == "sparc" ]] && return 1 - - [[ -n ${WANT__THREAD} ]] && return ${WANT__THREAD} - - $(tc-getCC ${CTARGET}) -c ${FILESDIR}/test-__thread.c -o ${T}/test2.o &> /dev/null - WANT__THREAD=$? - - return ${WANT__THREAD} -} - -install_locales() { - unset LANGUAGE LANG LC_ALL - cd "${WORKDIR}"/${MYMAINBUILDDIR} || die "${WORKDIR}/${MYMAINBUILDDIR}" - make PARALLELMFLAGS="${MAKEOPTS} -j1" \ - install_root=${D} localedata/install-locales || die -} - -setup_locales() { - if use !userlocales ; then - einfo "userlocales not enabled, installing -ALL- locales..." - install_locales || die - elif [ -e /etc/locales.build ] ; then - einfo "Installing locales in /etc/locales.build..." - echo 'SUPPORTED-LOCALES=\' > SUPPORTED.locales - cat /etc/locales.build | grep -v -e ^$ -e ^\# | sed 's/$/\ \\/g' \ - >> SUPPORTED.locales - cat SUPPORTED.locales > ${S}/localedata/SUPPORTED || die - install_locales || die - elif [ -e ${FILESDIR}/locales.build ] ; then - einfo "Installing locales in ${FILESDIR}/locales.build..." - echo 'SUPPORTED-LOCALES=\' > SUPPORTED.locales - cat ${FILESDIR}/locales.build | grep -v -e ^$ -e ^\# | sed 's/$/\ \\/g' \ - >> SUPPORTED.locales - cat SUPPORTED.locales > ${S}/localedata/SUPPORTED || die - install_locales || die - else - einfo "Installing -ALL- locales..." - install_locales || die - fi -} - -glibc_do_configure() { - local myconf - - # set addons - pushd ${S} > /dev/null - ADDONS=$(echo */configure | sed -e 's!/configure!!g;s!\(linuxthreads\|nptl\|rtkaio\|glibc-compat\)\( \|$\)!!g;s! \+$!!;s! !,!g;s!^!,!;/^,\*$/d') - use glibc-compat20 && [[ -d glibc-compat ]] && ADDONS="${ADDONS},glibc-compat" - popd > /dev/null - - use nls || myconf="${myconf} --disable-nls" - use erandom || myconf="${myconf} --disable-dev-erandom" - - use glibc-omitfp && myconf="${myconf} --enable-omitfp" - - [[ ${CTARGET} == *-softfloat-* ]] && myconf="${myconf} --without-fp" - - if [ "$1" == "linuxthreads" ] ; then - if want_tls && [[ ${CTARGET} != i[45]86-* ]] ; then - myconf="${myconf} --with-tls" - - if want__thread && use linuxthreads-tls ; then - myconf="${myconf} --with-__thread" - else - myconf="${myconf} --without-__thread" - fi - else - myconf="${myconf} --without-tls --without-__thread" - fi - - myconf="${myconf} --enable-add-ons=linuxthreads${ADDONS}" - myconf="${myconf} --enable-kernel=${LT_KERNEL_VERSION}" - elif [ "$1" == "nptl" ] ; then - myconf="${myconf} --with-tls --with-__thread" - myconf="${myconf} --enable-add-ons=nptl${ADDONS}" - myconf="${myconf} --enable-kernel=${NPTL_KERNEL_VERSION}" - else - die "invalid pthread option" - fi - - # Since SELinux support is only required for nscd, only enable it if: - # 1. USE selinux - # 2. ! USE build - # 3. only for the primary ABI on multilib systems - if use selinux && ! use build; then - if use multilib || has_multilib_profile; then - if is_final_abi; then - myconf="${myconf} --with-selinux" - else - myconf="${myconf} --without-selinux" - fi - else - myconf="${myconf} --with-selinux" - fi - else - myconf="${myconf} --without-selinux" - fi - - # Pick out the correct location for build headers - myconf="${myconf} - --without-cvs - --enable-bind-now - --build=${CBUILD_OPT:-${CBUILD}} - --host=${CTARGET_OPT:-${CTARGET}} - $(use_enable profile) - --without-gd - --with-headers=$(alt_build_headers) - --prefix=$(alt_prefix) - --mandir=$(alt_prefix)/share/man - --infodir=$(alt_prefix)/share/info - --libexecdir=$(alt_prefix)/lib/misc/glibc - ${EXTRA_ECONF}" - - has_version app-admin/eselect-compiler || export CC="$(tc-getCC ${CTARGET})" - - GBUILDDIR=${WORKDIR}/build-${ABI}-${CTARGET}-$1 - mkdir -p ${GBUILDDIR} - cd ${GBUILDDIR} - einfo "Configuring GLIBC for $1 with: ${myconf// /\n\t\t}" - ${S}/configure ${myconf} || die "failed to configure glibc" -} - -fix_lib64_symlinks() { - # the original Gentoo/AMD64 devs decided that since 64bit is the native - # bitdepth for AMD64, lib should be used for 64bit libraries. however, - # this ignores the FHS and breaks multilib horribly... especially - # since it wont even work without a lib64 symlink anyways. *rolls eyes* - # see bug 59710 for more information. - # Travis Tilley (08 Aug 2004) - if [ -L ${ROOT}/lib64 ] ; then - ewarn "removing /lib64 symlink and moving lib to lib64..." - ewarn "dont hit ctrl-c until this is done" - addwrite ${ROOT}/ - rm ${ROOT}/lib64 - # now that lib64 is gone, nothing will run without calling ld.so - # directly. luckily the window of brokenness is almost non-existant - use amd64 && /lib/ld-linux-x86-64.so.2 /bin/mv ${ROOT}/lib ${ROOT}/lib64 - use ppc64 && /lib/ld64.so.1 /bin/mv ${ROOT}/lib ${ROOT}/lib64 - # all better :) - ldconfig - ln -s lib64 ${ROOT}/lib - einfo "done! :-)" - einfo "fixed broken lib64/lib symlink in ${ROOT}" - fi - if [ -L ${ROOT}/usr/lib64 ] ; then - addwrite ${ROOT}/usr - rm ${ROOT}/usr/lib64 - mv ${ROOT}/usr/lib ${ROOT}/usr/lib64 - ln -s lib64 ${ROOT}/usr/lib - einfo "fixed broken lib64/lib symlink in ${ROOT}/usr" - fi - if [ -L ${ROOT}/usr/X11R6/lib64 ] ; then - addwrite ${ROOT}/usr/X11R6 - rm ${ROOT}/usr/X11R6/lib64 - mv ${ROOT}/usr/X11R6/lib ${ROOT}/usr/X11R6/lib64 - ln -s lib64 ${ROOT}/usr/X11R6/lib - einfo "fixed broken lib64/lib symlink in ${ROOT}/usr/X11R6" - fi -} - -use_multilib() { - case ${CTARGET} in - sparc64*|mips64*|x86_64*|powerpc64*|s390x*) - has_multilib_profile || use multilib ;; - *) false ;; - esac -} - -# Setup toolchain variables that would be defined in the profiles for these archs. -setup_env() { - # These should not be set, else the zoneinfo do not always get installed ... - unset LANGUAGE LANG LC_ALL - # silly users - unset LD_RUN_PATH - - if is_crosscompile || tc-is-cross-compiler ; then - multilib_env ${CTARGET} - if ! use multilib ; then - MULTILIB_ABIS=${DEFAULT_ABI} - else - MULTILIB_ABIS=${MULTILIB_ABIS:-${DEFAULT_ABI}} - fi - - # If the user has CFLAGS_ in their make.conf, use that, - # and fall back on CFLAGS. - local VAR=CFLAGS_${CTARGET//[-.]/_} - CFLAGS=${!VAR-${CFLAGS}} - fi - - setup_flags - - export ABI=${ABI:-${DEFAULT_ABI:-default}} - - if is_crosscompile || tc-is-cross-compiler ; then - local VAR=CFLAGS_${ABI} - # We need to export CFLAGS with abi information in them because - # glibc's configure script checks CFLAGS for some targets (like mips) - export CFLAGS="${!VAR} ${CFLAGS}" - fi -} - -### /ECLASS PUNTAGE ### - -if is_crosscompile ; then - SLOT="${CTARGET}-2.2" -else - SLOT="2.2" -fi - -# we'll handle stripping ourself #46186 -RESTRICT="nostrip multilib-pkg-force" - -# We need a new-enough binutils for as-needed -DEPEND=">=sys-devel/gcc-3.4 - nptl? ( >=sys-kernel/linux-headers-${NPTL_KERNEL_VERSION} ) - >=sys-devel/binutils-2.15.94 - || ( app-admin/eselect-compiler >=sys-devel/gcc-config-1.3.12 ) - virtual/os-headers - nls? ( sys-devel/gettext ) - selinux? ( !build? ( sys-libs/libselinux ) )" -RDEPEND="nls? ( sys-devel/gettext ) - selinux? ( !build? ( sys-libs/libselinux ) )" - -if [[ ${CATEGORY/cross-} != ${CATEGORY} ]] ; then - DEPEND="${DEPEND} ${CATEGORY}/gcc" - - if [[ ${CATEGORY} == *-linux* ]] ; then - if [[ ${CATEGORY} == cross-mips* ]] ; then - DEPEND="${DEPEND} >=${CATEGORY}/mips-headers-2.6.10" - else - DEPEND="${DEPEND} ${CATEGORY}/linux-headers" - fi - fi -else - DEPEND="${DEPEND} sys-libs/timezone-data" - RDEPEND="${RDEPEND} sys-libs/timezone-data" -fi - -pkg_setup() { - if has_version '>=sys-libs/glibc-2.3.5.20050201' && \ - has_version ' ${T}/gcc_eh_test.c - if ! $(tc-getCC ${CTARGET}) ${T}/gcc_eh_test.c -lgcc_eh 2>/dev/null ; then - sed -i -e 's:-lgcc_eh::' Makeconfig || die "sed gcc_eh" - fi - - # Some configure checks fail on the first emerge through because they - # try to link. This doesn't work well if we don't have a libc yet. - # http://sourceware.org/ml/libc-alpha/2005-02/msg00042.html - if is_crosscompile && use build; then - rm ${S}/sysdeps/sparc/sparc64/elf/configure{,.in} - rm ${S}/nptl/sysdeps/pthread/configure{,.in} - fi - - cd "${WORKDIR}" - find . -type f '(' -size 0 -o -name "*.orig" ')' -exec rm -f {} \; - find . -name configure -exec touch {} \; - - # Fix permissions on some of the scripts - chmod u+x "${S}"/scripts/*.sh -} - -src_compile() { - setup_env - - if [[ -z ${OABI} ]] ; then - local abilist="" - if has_multilib_profile ; then - abilist=$(get_install_abis) - einfo "Building multilib glibc for ABIs: ${abilist}" - elif is_crosscompile || tc-is-cross-compiler ; then - abilist=${DEFAULT_ABI} - fi - if [[ -n ${abilist} ]] ; then - OABI=${ABI} - for ABI in ${abilist} ; do - export ABI - src_compile - done - ABI=${OABI} - unset OABI - return 0 - fi - fi - - if just_headers ; then - toolchain-glibc_headers_compile - else - toolchain-glibc_src_compile - fi -} - -src_test() { - setup_env - - if [[ -z ${OABI} ]] && has_multilib_profile ; then - OABI=${ABI} - einfo "Testing multilib glibc for ABIs: $(get_install_abis)" - for ABI in $(get_install_abis) ; do - export ABI - einfo " Testing ${ABI} glibc" - src_test - done - ABI=${OABI} - unset OABI - return 0 - fi - - toolchain-glibc_src_test -} - -src_strip() { - # Now, strip everything but the thread libs #46186, as well as the dynamic - # linker, else we cannot set breakpoints in shared libraries due to bugs in - # gdb. Also want to grab stuff in tls subdir. whee. -#when new portage supports this ... -# env \ -# -uRESTRICT \ -# CHOST=${CTARGET} \ -# STRIP_MASK="/*/{,tls/}{ld-,lib{pthread,thread_db}}*" \ -# prepallstrip - pushd "${D}" > /dev/null - - if ! is_crosscompile ; then - mkdir -p "${T}"/strip-backup - for x in $(find "${D}" -maxdepth 3 \ - '(' -name 'ld-*' -o -name 'libpthread*' -o -name 'libthread_db*' ')' \ - -a '(' '!' -name '*.a' ')' -type f -printf '%P ') - do - mkdir -p "${T}/strip-backup/${x%/*}" - cp -a -- "${D}/${x}" "${T}/strip-backup/${x}" || die "backing up ${x}" - done - fi - env -uRESTRICT CHOST=${CTARGET} prepallstrip - if ! is_crosscompile ; then - cp -a -- "${T}"/strip-backup/* "${D}"/ || die "restoring non-stripped libs" - fi - - popd > /dev/null -} - -src_install() { - setup_env - - if [[ -z ${OABI} ]] ; then - local abilist="" - if has_multilib_profile ; then - abilist=$(get_install_abis) - einfo "Installing multilib glibc for ABIs: ${abilist}" - elif is_crosscompile || tc-is-cross-compiler ; then - abilist=${DEFAULT_ABI} - fi - if [[ -n ${abilist} ]] ; then - OABI=${ABI} - for ABI in ${abilist} ; do - export ABI - src_install - done - ABI=${OABI} - unset OABI - src_strip - return 0 - fi - fi - - # Handle stupid lib32 BS - unset OLD_LIBDIR - if ! is_crosscompile ; then - if [[ $(tc-arch) == "amd64" && ${ABI} == "x86" && $(get_libdir) != "lib" ]] ; then - OLD_LIBDIR=$(get_libdir) - LIBDIR_x86="lib" - fi - - if [[ $(tc-arch) == "ppc64" && ${ABI} == "ppc" && $(get_libdir) != "lib" ]] ; then - OLD_LIBDIR=$(get_libdir) - LIBDIR_ppc="lib" - fi - fi - - if just_headers ; then - toolchain-glibc_headers_install - else - toolchain-glibc_src_install - fi - [[ -z ${OABI} ]] && src_strip - - # Handle stupid lib32 BS on amd64 and ppc64 - if [[ -n ${OLD_LIBDIR} ]] ; then - cd "${S}" - [[ $(tc-arch) == "amd64" ]] && LIBDIR_x86=${OLD_LIBDIR} - [[ $(tc-arch) == "ppc64" ]] && LIBDIR_ppc=${OLD_LIBDIR} - unset OLD_LIBDIR - - mv "${D}"/lib "${D}"/$(get_libdir) - mv "${D}"/usr/lib "${D}"/usr/$(get_libdir) - dodir /lib - dodir /usr/lib - mv "${D}"/usr/$(get_libdir)/locale "${D}"/usr/lib - [[ $(tc-arch) == "amd64" ]] && dosym ../$(get_libdir)/ld-linux.so.2 /lib/ld-linux.so.2 - [[ $(tc-arch) == "ppc64" ]] && dosym ../$(get_libdir)/ld.so.1 /lib/ld.so.1 - - for f in "${D}"/usr/$(get_libdir)/*.so; do - local basef=$(basename "${f}") - if [[ -L ${f} ]] ; then - local target=$(readlink "${f}") - target=${target/\/lib\//\/$(get_libdir)\/} - rm "${f}" - dosym "${target}" /usr/$(get_libdir)/"${basef}" - fi - done - - dosed "s:/lib/:/$(get_libdir)/:g" /usr/$(get_libdir)/lib{c,pthread}.so - - if want_nptl && want_linuxthreads ; then - dosed "s:/lib/:/$(get_libdir)/:g" /usr/$(get_libdir)/nptl/lib{c,pthread}.so - fi - fi -} - -pkg_preinst() { - toolchain-glibc_pkg_preinst -} - -pkg_postinst() { - toolchain-glibc_pkg_postinst -} diff --git a/sys-libs/glibc/glibc-2.3.6-r2.ebuild b/sys-libs/glibc/glibc-2.3.6-r2.ebuild deleted file mode 100644 index 4802900b9bcc..000000000000 --- a/sys-libs/glibc/glibc-2.3.6-r2.ebuild +++ /dev/null @@ -1,1368 +0,0 @@ -# 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.3.6-r2.ebuild,v 1.20 2006/05/30 19:45:22 eradicator Exp $ - -# TODO: -# - fix warning from glibc build system: -# /var/tmp/portage/glibc-2.3.6-r2/work/build-x86-x86_64-pc-linux-gnu-nptl/elf/ldconfig: Can't open configuration file /etc/ld.so.conf: No such file or directory -# - fix warning from ebuild (amd64 multilib): -# mv: cannot stat `/var/tmp/portage/glibc-2.3.6-r2/image//usr/lib32/locale': No such file or directory -# - glibc installs a bunch of lib64 stuff into /usr/lib: -# qlist glibc | grep ^/usr/lib/ | grep -v /debug/ - -# Here's how the cross-compile logic breaks down ... -# CTARGET - machine that will target the binaries -# CHOST - machine that will host the binaries -# CBUILD - machine that will build the binaries -# If CTARGET != CHOST, it means you want a libc for cross-compiling. -# If CHOST != CBUILD, it means you want to cross-compile the libc. -# CBUILD = CHOST = CTARGET - native build/install -# CBUILD != (CHOST = CTARGET) - cross-compile a native build -# (CBUILD = CHOST) != CTARGET - libc for cross-compiler -# CBUILD != CHOST != CTARGET - cross-compile a libc for a cross-compiler -# For install paths: -# CHOST = CTARGET - install into / -# CHOST != CTARGET - install into /usr/CTARGET/ - -#KEYWORDS="~amd64 ~arm -hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" -KEYWORDS="-* ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~s390 ~x86" - -BRANCH_UPDATE="" - -# From linuxthreads/man -GLIBC_MANPAGE_VERSION="2.3.6-1" - -# From manual -GLIBC_INFOPAGE_VERSION="2.3.6" - -# Gentoo patchset -PATCH_VER="1.4" - -# C Stubbs addon (contained in fedora, so ignoring) -#CSTUBS_VER="2.1.2" -#CSTUBS_TARBALL="c_stubs-${CSTUBS_VER}.tar.bz2" -#CSTUBS_URI="mirror://gentoo/${CSTUBS_TARBALL}" - -# Fedora addons (from RHEL's glibc-2.3.4-2.src.rpm) -FEDORA_VER="20041219T2331" -FEDORA_TARBALL="glibc-fedora-${FEDORA_VER}.tar.bz2" -FEDORA_URI="mirror://gentoo/${FEDORA_TARBALL}" - -GENTOO_TOOLCHAIN_BASE_URI="mirror://gentoo" -GENTOO_TOOLCHAIN_DEV_URI="http://dev.gentoo.org/~azarah/glibc" - -### PUNT OUT TO ECLASS?? ### -inherit eutils versionator libtool toolchain-funcs flag-o-matic gnuconfig multilib - -DESCRIPTION="GNU libc6 (also called glibc2) C library" -HOMEPAGE="http://www.gnu.org/software/libc/libc.html" -LICENSE="LGPL-2" - -IUSE="nls pic build nptl nptlonly erandom hardened userlocales multilib selinux glibc-compat20 glibc-omitfp linuxthreads-tls profile" - -export CBUILD=${CBUILD:-${CHOST}} -export CTARGET=${CTARGET:-${CHOST}} -if [[ ${CTARGET} == ${CHOST} ]] ; then - if [[ ${CATEGORY/cross-} != ${CATEGORY} ]] ; then - export CTARGET=${CATEGORY/cross-} - fi -fi -if [[ ${CTARGET} == ${CHOST} ]] ; then - PROVIDE="virtual/libc" -fi - -is_crosscompile() { - [[ ${CHOST} != ${CTARGET} ]] -} -just_headers() { - is_crosscompile && has _E_CROSS_HEADERS_ONLY ${USE} -} - -GLIBC_RELEASE_VER=$(get_version_component_range 1-3) - -# Don't set this to :-, - allows BRANCH_UPDATE="" -BRANCH_UPDATE=${BRANCH_UPDATE-$(get_version_component_range 4)} - -# (Recent snapshots fails with 2.6.5 and earlier with NPTL) -NPTL_KERNEL_VERSION=${NPTL_KERNEL_VERSION:-"2.6.6"} -LT_KERNEL_VERSION=${LT_KERNEL_VERSION:-"2.4.1"} - -### SRC_URI ### - -# This function handles the basics of setting the SRC_URI for a glibc ebuild. -# To use, set SRC_URI with: -# -# SRC_URI="$(get_glibc_src_uri)" -# -# Other than the variables normally set by portage, this function's behavior -# can be altered by setting the following: -# -# GENTOO_TOOLCHAIN_BASE_URI -# This sets the base URI for all gentoo-specific patch files. Note -# that this variable is only important for a brief period of time, -# before your source files get picked up by mirrors. However, it is -# still highly suggested that you keep files in this location -# available. -# -# BRANCH_UPDATE -# If set, this variable signals that we should be using the main -# release tarball (determined by ebuild version) and applying a -# CVS branch update patch against it. The location of this branch -# update patch is assumed to be in ${GENTOO_TOOLCHAIN_BASE_URI}. -# Just like with SNAPSHOT, this variable is ignored if the ebuild -# has a _pre suffix. -# -# PATCH_VER -# PATCH_GLIBC_VER -# This should be set to the version of the gentoo patch tarball. -# The resulting filename of this tarball will be: -# glibc-${PATCH_GLIBC_VER:-${GLIBC_RELEASE_VER}}-patches-${PATCH_VER}.tar.bz2 -# -# GLIBC_MANPAGE_VERSION -# GLIBC_INFOPAGE_VERSION -# The version of glibc for which we will download pages. This will -# default to ${GLIBC_RELEASE_VER}, but we may not want to pre-generate man pages -# for prerelease test ebuilds for example. This allows you to -# continue using pre-generated manpages from the last stable release. -# If set to "none", this will prevent the downloading of manpages, -# which is useful for individual library targets. -# -get_glibc_src_uri() { - GENTOO_TOOLCHAIN_BASE_URI=${GENTOO_TOOLCHAIN_BASE_URI:-"mirror://gentoo"} - -# GLIBC_SRC_URI="http://ftp.gnu.org/gnu/glibc/glibc-${GLIBC_RELEASE_VER}.tar.bz2 -# http://ftp.gnu.org/gnu/glibc/glibc-linuxthreads-${GLIBC_RELEASE_VER}.tar.bz2 -# http://ftp.gnu.org/gnu/glibc/glibc-libidn-${GLIBC_RELEASE_VER}.tar.bz2 - GLIBC_SRC_URI="mirror://gnu/glibc/glibc-${GLIBC_RELEASE_VER}.tar.bz2 - mirror://gnu/glibc/glibc-linuxthreads-${GLIBC_RELEASE_VER}.tar.bz2 - mirror://gnu/glibc/glibc-libidn-${GLIBC_RELEASE_VER}.tar.bz2" - - if [[ -n ${BRANCH_UPDATE} ]] ; then - GLIBC_SRC_URI="${GLIBC_SRC_URI} - ${GENTOO_TOOLCHAIN_BASE_URI}/glibc-${GLIBC_RELEASE_VER}-branch-update-${BRANCH_UPDATE}.patch.bz2" - [[ -n ${GENTOO_TOOLCHAIN_DEV_URI} ]] && - GLIBC_SRC_URI="${GLIBC_SRC_URI} - ${GENTOO_TOOLCHAIN_DEV_URI}/glibc-${GLIBC_RELEASE_VER}-branch-update-${BRANCH_UPDATE}.patch.bz2" - fi - - if [[ -n ${PATCH_VER} ]] ; then - GLIBC_SRC_URI="${GLIBC_SRC_URI} - ${GENTOO_TOOLCHAIN_BASE_URI}/glibc-${PATCH_GLIBC_VER:-${GLIBC_RELEASE_VER}}-patches-${PATCH_VER}.tar.bz2" - [[ -n ${GENTOO_TOOLCHAIN_DEV_URI} ]] && - GLIBC_SRC_URI="${GLIBC_SRC_URI} - ${GENTOO_TOOLCHAIN_DEV_URI}/glibc-${PATCH_GLIBC_VER:-${GLIBC_RELEASE_VER}}-patches-${PATCH_VER}.tar.bz2" - fi - - if [[ ${GLIBC_MANPAGE_VERSION} != "none" ]] ; then - GLIBC_SRC_URI="${GLIBC_SRC_URI} - ${GENTOO_TOOLCHAIN_BASE_URI}/glibc-manpages-${GLIBC_MANPAGE_VERSION:-${GLIBC_RELEASE_VER}}.tar.bz2" - [[ -n ${GENTOO_TOOLCHAIN_DEV_URI} ]] && - GLIBC_SRC_URI="${GLIBC_SRC_URI} - ${GENTOO_TOOLCHAIN_DEV_URI}/glibc-manpages-${GLIBC_MANPAGE_VERSION:-${GLIBC_RELEASE_VER}}.tar.bz2" - fi - - if [[ ${GLIBC_INFOPAGE_VERSION} != "none" ]] ; then - GLIBC_SRC_URI="${GLIBC_SRC_URI} - ${GENTOO_TOOLCHAIN_BASE_URI}/glibc-infopages-${GLIBC_INFOPAGE_VERSION:-${GLIBC_RELEASE_VER}}.tar.bz2" - [[ -n ${GENTOO_TOOLCHAIN_DEV_URI} ]] && - GLIBC_SRC_URI="${GLIBC_SRC_URI} - ${GENTOO_TOOLCHAIN_DEV_URI}/glibc-infopages-${GLIBC_INFOPAGE_VERSION:-${GLIBC_RELEASE_VER}}.tar.bz2" - fi - - if [[ -n ${CSTUBS_URI} ]] ; then - GLIBC_SRC_URI="${GLIBC_SRC_URI} ${CSTUBS_URI}" - fi - - if [[ -n ${FEDORA_URI} ]] ; then - GLIBC_SRC_URI="${GLIBC_SRC_URI} ${FEDORA_URI}" - fi - - echo "${GLIBC_SRC_URI}" -} - -SRC_URI=$(get_glibc_src_uri) -S=${WORKDIR}/glibc-${GLIBC_RELEASE_VER} - -### EXPORTED FUNCTIONS ### -toolchain-glibc_src_unpack() { - # Check NPTL support _before_ we unpack things to save some time - want_nptl && check_nptl_support - - unpack glibc-${GLIBC_RELEASE_VER}.tar.bz2 - - cd "${S}" - unpack glibc-linuxthreads-${GLIBC_RELEASE_VER}.tar.bz2 - unpack glibc-libidn-${GLIBC_RELEASE_VER}.tar.bz2 - - [[ -n ${CSTUBS_TARBALL} ]] && unpack ${CSTUBS_TARBALL} - [[ -n ${FEDORA_TARBALL} ]] && unpack ${FEDORA_TARBALL} - - if [[ -n ${PATCH_VER} ]] ; then - cd "${WORKDIR}" - unpack glibc-${PATCH_GLIBC_VER:-${GLIBC_RELEASE_VER}}-patches-${PATCH_VER}.tar.bz2 - fi - - # XXX: We should do the branchupdate, before extracting the manpages and - # infopages else it does not help much (mtimes change if there is a change - # to them with branchupdate) - if [[ -n ${BRANCH_UPDATE} ]] ; then - cd "${S}" - epatch "${DISTDIR}"/glibc-${GLIBC_RELEASE_VER}-branch-update-${BRANCH_UPDATE}.patch.bz2 - - # Snapshot date patch - einfo "Patching version to display snapshot date ..." - sed -i -e "s:\(#define RELEASE\).*:\1 \"${BRANCH_UPDATE}\":" version.h - fi - - if [[ ${GLIBC_MANPAGE_VERSION} != "none" ]] ; then - cd "${WORKDIR}" - unpack glibc-manpages-${GLIBC_MANPAGE_VERSION:-${GLIBC_RELEASE_VER}}.tar.bz2 - fi - - if [[ ${GLIBC_INFOPAGE_VERSION} != "none" ]] ; then - cd "${S}" - unpack glibc-infopages-${GLIBC_INFOPAGE_VERSION:-${GLIBC_RELEASE_VER}}.tar.bz2 - fi - - if [[ -n ${PATCH_VER} ]] ; then - cd "${S}" - EPATCH_MULTI_MSG="Applying Gentoo Glibc Patchset ${PATCH_GLIBC_VER:-${GLIBC_RELEASE_VER}}-${PATCH_VER} ..." \ - EPATCH_EXCLUDE=${GLIBC_PATCH_EXCLUDE} \ - EPATCH_SUFFIX="patch" \ - ARCH=$(tc-arch) \ - epatch "${WORKDIR}"/patches - fi -} - -toolchain-glibc_src_compile() { - # Set gconvdir to /usr/$(get_libdir)/gconv on archs with multiple ABIs - local MAKEFLAGS="" - has_multilib_profile && MAKEFLAGS="gconvdir=$(alt_usrlibdir)/gconv" - - echo - for v in ABI CBUILD CHOST CTARGET CBUILD_OPT CTARGET_OPT CC CFLAGS ; do - einfo " $(printf '%15s' ${v}:) ${!v}" - done - echo - - if want_linuxthreads ; then - glibc_do_configure linuxthreads - einfo "Building GLIBC with linuxthreads..." - make PARALLELMFLAGS="${MAKEOPTS}" ${MAKEFLAGS} || die "make for ${ABI} failed" - fi - if want_nptl ; then - # ... and then do the optional nptl build - unset LD_ASSUME_KERNEL - glibc_do_configure nptl - einfo "Building GLIBC with NPTL..." - make PARALLELMFLAGS="${MAKEOPTS}" ${MAKEFLAGS} || die "make for ${ABI} failed" - fi -} - -toolchain-glibc_headers_compile() { - GBUILDDIR=${WORKDIR}/build-${ABI}-${CTARGET}-headers - mkdir -p "${GBUILDDIR}" - cd "${GBUILDDIR}" - - # Pick out the correct location for build headers - local myconf="--disable-sanity-checks --enable-hacker-mode" - myconf="${myconf} - --enable-add-ons=linuxthreads - --without-cvs - --enable-bind-now - --build=${CBUILD_OPT:-${CBUILD}} - --host=${CTARGET_OPT:-${CTARGET}} - --with-headers=$(alt_build_headers) - --prefix=$(alt_prefix) - --mandir=$(alt_prefix)/share/man - --infodir=$(alt_prefix)/share/info - --libexecdir=$(alt_prefix)/lib/misc/glibc - ${EXTRA_ECONF}" - - einfo "Configuring GLIBC headers with: ${myconf// /\n\t\t}" - CC=gcc \ - CFLAGS="-O1 -pipe" \ - ${S}/configure ${myconf} || die "failed to configure glibc" -} - -toolchain-glibc_src_test() { - # This is wrong, but glibc's tests fail bad when screwing - # around with sandbox, so lets just punt it - unset LD_PRELOAD - - # do the linuxthreads build unless we're using nptlonly - if want_linuxthreads ; then - cd "${WORKDIR}"/build-${ABI}-${CTARGET}-linuxthreads - einfo "Checking GLIBC with linuxthreads..." - make check || die "linuxthreads glibc did not pass make check" - fi - if want_nptl ; then - cd "${WORKDIR}"/build-${ABI}-${CTARGET}-nptl - unset LD_ASSUME_KERNEL || : - einfo "Checking GLIBC with NPTL..." - make check || die "nptl glibc did not pass make check" - fi -} - -toolchain-glibc_pkg_preinst() { - # PPC64+others may want to eventually be added to this logic if they - # decide to be multilib compatible and FHS compliant. note that this - # chunk of FHS compliance only applies to 64bit archs where 32bit - # compatibility is a major concern (not IA64, for example). - - # amd64's 2005.0 is the first amd64 profile to not need this code. - # 2005.0 is setup properly, and this is executed as part of the - # 2004.3 -> 2005.0 upgrade script. - # 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 ]] && ! { want_nptl && want_linuxthreads; }; then - addwrite "${ROOT}"/$(alt_libdir)/ - ewarn "nptlonly or -nptl in USE, removing /${ROOT}$(alt_libdir)/tls..." - rm -r "${ROOT}"/$(alt_libdir)/tls || die - fi - - # Shouldnt need to keep this updated - [[ -e ${ROOT}/etc/locales.build ]] && rm -f "${D}"/etc/locales.build -} - -toolchain-glibc_src_install() { - # Need to dodir first because it might not exist (bad amd64 profiles) - dodir $(alt_usrlibdir) - - # These should not be set, else the - # zoneinfo do not always get installed ... - unset LANGUAGE LANG LC_ALL - - if want_linuxthreads ; then - cd "${WORKDIR}"/build-${ABI}-${CTARGET}-linuxthreads - einfo "Installing GLIBC ${ABI} with linuxthreads ..." - make PARALLELMFLAGS="${MAKEOPTS} -j1" \ - install_root="${D}" \ - install || die - else # nptlonly - cd "${WORKDIR}"/build-${ABI}-${CTARGET}-nptl - einfo "Installing GLIBC ${ABI} with NPTL ..." - make PARALLELMFLAGS="${MAKEOPTS} -j1" \ - install_root="${D}" \ - install || die - fi - - if is_crosscompile ; then - # punt all the junk not needed by a cross-compiler - rm -rf "${D}"$(alt_prefix)/{bin,etc,$(get_libdir)/{gconv,misc},sbin,share} - else - # zoneinfo stuff is now provided by the timezone-data package - rm -rf "${D}"/usr/share/zoneinfo - rm -f "${D}"/usr/bin/tzselect - rm -f "${D}"/usr/sbin/{zic,zdump} - fi - - if want_linuxthreads && want_nptl ; then - einfo "Installing NPTL to $(alt_libdir)/tls/..." - cd "${WORKDIR}"/build-${ABI}-${CTARGET}-nptl - mkdir -p "${D}"$(alt_libdir)/tls/ - - libcsofile=$(basename "${D}"$(alt_libdir)/libc-*.so) - cp -a libc.so "${D}"$(alt_libdir)/tls/${libcsofile} || die - dosym ${libcsofile} $(alt_libdir)/tls/$(ls libc.so.*) - - libmsofile=$(basename "${D}"$(alt_libdir)/libm-*.so) - pushd math > /dev/null - cp -a libm.so "${D}"$(alt_libdir)/tls/${libmsofile} || die - dosym ${libmsofile} $(alt_libdir)/tls/$(ls libm.so.*) - popd > /dev/null - - librtsofile=$(basename "${D}"$(alt_libdir)/librt-*.so) - pushd rt > /dev/null - cp -a librt.so "${D}"$(alt_libdir)/tls/${librtsofile} || die - dosym ${librtsofile} $(alt_libdir)/tls/$(ls librt.so.*) - popd > /dev/null - - libthreaddbsofile=$(basename "${D}"$(alt_libdir)/libthread_db-*.so) - pushd nptl_db > /dev/null - cp -a libthread_db.so "${D}"$(alt_libdir)/tls/${libthreaddbsofile} || die - dosym ${libthreaddbsofile} $(alt_libdir)/tls/$(ls libthread_db.so.*) - popd > /dev/null - - libpthreadsofile=libpthread-${GLIBC_RELEASE_VER}.so - cp -a nptl/libpthread.so "${D}"$(alt_libdir)/tls/${libpthreadsofile} || die - dosym ${libpthreadsofile} $(alt_libdir)/tls/libpthread.so.0 - - # and now for the static libs - mkdir -p "${D}"$(alt_usrlibdir)/nptl - cp -a libc.a nptl/libpthread.a nptl/libpthread_nonshared.a rt/librt.a \ - "${D}"$(alt_usrlibdir)/nptl - - # linker script crap - for lib in libc libpthread; do - sed -e "s:$(alt_libdir)/${lib}.so:$(alt_libdir)/tls/${lib}.so:g" \ - -e "s:$(alt_usrlibdir)/${lib}_nonshared.a:$(alt_usrlibdir)/nptl/${lib}_nonshared.a:g" \ - "${D}"$(alt_usrlibdir)/${lib}.so \ - > "${D}"$(alt_usrlibdir)/nptl/${lib}.so - - chmod 755 "${D}"$(alt_usrlibdir)/nptl/${lib}.so - done - - dosym ../librt.so $(alt_usrlibdir)/nptl/librt.so - - # last but not least... headers. - mkdir -p "${D}"/nptl "${D}"$(alt_headers)/nptl - make install_root="${D}"/nptl install-headers PARALLELMFLAGS="${MAKEOPTS} -j1" - pushd "${D}"/nptl/$(alt_headers) > /dev/null - for i in $(find . -type f) ; do - if ! [[ -f ${D}$(alt_headers)/$i ]] \ - || ! cmp -s $i ${D}$(alt_headers)/$i; then - mkdir -p ${D}$(alt_headers)/nptl/`dirname $i` - cp -a $i ${D}$(alt_headers)/nptl/$i - fi - done - popd > /dev/null - rm -rf ${D}/nptl - fi - - if use pic && [[ $(tc-arch) != "amd64" ]] ; then - find ${S}/${buildtarget}/ -name "soinit.os" -exec cp {} ${D}$(alt_libdir)/soinit.o \; - find ${S}/${buildtarget}/ -name "sofini.os" -exec cp {} ${D}$(alt_libdir)/sofini.o \; - find ${S}/${buildtarget}/ -name "*_pic.a" -exec cp {} ${D}$(alt_libdir) \; - find ${S}/${buildtarget}/ -name "*.map" -exec cp {} ${D}$(alt_libdir) \; - - for i in ${D}$(alt_libdir)/*.map; do - mv ${i} ${i%.map}_pic.map - done - fi - - # We'll take care of the cache ourselves - rm -f ${D}/etc/ld.so.cache - - # Some things want this, notably ash. - dosym libbsd-compat.a $(alt_usrlibdir)/libbsd.a - - # Handle includes for different ABIs - prep_ml_includes $(alt_headers) - - ################################################################# - # EVERYTHING AFTER THIS POINT IS FOR NATIVE GLIBC INSTALLS ONLY # - # Make sure we install the sys-include symlink so that when - # we build a 2nd stage cross-compiler, gcc finds the target - # system headers correctly. See gcc/doc/gccinstall.info - if is_crosscompile ; then - dosym include $(alt_prefix)/sys-include - dosym . $(alt_prefix)/usr - return 0 - fi - - # Everything past this point just needs to be done once... don't waste time building locale files twice... - is_final_abi || return 0 - - if want_linuxthreads ; then - MYMAINBUILDDIR=build-${ABI}-${CTARGET}-linuxthreads - else - MYMAINBUILDDIR=build-${ABI}-${CTARGET}-nptl - fi - cd "${WORKDIR}"/${MYMAINBUILDDIR} - if ! use build ; then - if ! has noinfo ${FEATURES} && [[ ${GLIBC_INFOPAGE_VERSION} != "none" ]] ; then - einfo "Installing info pages..." - - make PARALLELMFLAGS="${MAKEOPTS} -j1" \ - install_root=${D} \ - info -i - fi - - setup_locales - - if [[ ${GLIBC_MANPAGE_VERSION} != "none" ]] ; then - einfo "Installing man pages..." - - # Install linuxthreads man pages even if nptl is enabled - cd "${WORKDIR}"/man - doman *.3thr - fi - - # Install nscd config file - insinto /etc - doins ${FILESDIR}/nscd.conf - doins "${FILESDIR}"/nsswitch.conf - - doinitd "${FILESDIR}"/nscd - - cd ${S} - dodoc BUGS ChangeLog* CONFORMANCE FAQ INTERFACE NEWS NOTES PROJECTS README* - else - rm -rf ${D}/usr/share - for dir in $(get_all_libdirs); do - rm -rf ${D}/usr/${dir}/gconv &> /dev/null - done - fi - - # Is this next line actually needed or does the makefile get it right? - # It previously has 0755 perms which was killing things. - fperms 4711 $(alt_prefix)/lib/misc/glibc/pt_chown - - # Prevent overwriting of the /etc/localtime symlink. We'll handle the - # creation of the "factory" symlink in pkg_postinst(). - rm -f ${D}/etc/localtime - - insinto /etc - # This is our new config file for building locales - doins ${FILESDIR}/locales.build - # example host.conf with multicast dns disabled by default - doins ${FILESDIR}/2.3.4/host.conf - - # simple test to make sure our new glibc isnt completely broken. - # for now, skip the multilib scenario. also make sure we don't - # test with statically built binaries since they will fail. - [[ ${CBUILD} != ${CHOST} ]] && return 0 - [[ $(get_libdir) != "lib" ]] && return 0 - for x in date env ls true uname ; do - x=$(type -p ${x}) - [[ -z ${x} ]] && continue - striptest=$(file -L ${x} 2>/dev/null) - [[ -z ${striptest} ]] && continue - [[ ${striptest/statically linked} != "${striptest}" ]] && continue - "${D}"/$(get_libdir)/ld-*.so \ - --library-path "${D}"/$(get_libdir) \ - ${x} > /dev/null \ - || die "simple run test (${x}) failed" - done -} - -toolchain-glibc_headers_install() { - GBUILDDIR=${WORKDIR}/build-${ABI}-${CTARGET}-headers - cd "${GBUILDDIR}" - make install_root="${D}" install-headers || die "install-headers failed" - # Copy over headers that are not part of install-headers ... these - # are pretty much taken verbatim from crosstool, see it for more details - insinto $(alt_headers)/bits - doins misc/syscall-list.h bits/stdio_lim.h || die "doins include bits" - insinto $(alt_headers)/gnu - doins "${S}"/include/gnu/stubs.h || die "doins include gnu" - # Make sure we install the sys-include symlink so that when - # we build a 2nd stage cross-compiler, gcc finds the target - # system headers correctly. See gcc/doc/gccinstall.info - dosym include $(alt_prefix)/sys-include - dosym . $(alt_prefix)/usr -} - -toolchain-glibc_pkg_postinst() { - # Mixing nptlonly and -nptlonly glibc can prove dangerous if libpthread - # isn't removed in unmerge which happens sometimes. See bug #87671 - if ! is_crosscompile && want_linuxthreads ; then - for libdir in $(get_all_libdirs) ; do - for f in ${ROOT}/${libdir}/libpthread-2.* ${ROOT}/${libdir}/libpthread-0.6* ; do - if [[ -f ${f} ]] ; then - rm -f ${f} - ldconfig - fi - done - done - fi - - if ! is_crosscompile && [ -x "${ROOT}/usr/sbin/iconvconfig" ] ; then - # Generate fastloading iconv module configuration file. - ${ROOT}/usr/sbin/iconvconfig --prefix=${ROOT} - fi - - if [ ! -e "${ROOT}/lib/ld.so.1" ] && use ppc64 && ! has_multilib_profile ; then - ## SHOULDN'T THIS BE lib64?? - ln -s ld64.so.1 ${ROOT}/lib/ld.so.1 - fi - - # Reload init ... - if ! is_crosscompile && [ "${ROOT}" = "/" ] ; then - /sbin/init U &> /dev/null - fi - - # warn the few multicast-dns-by-default users we've had about the change - # in behavior... - echo - einfo "Gentoo's glibc now disables multicast dns by default in our" - einfo "example host.conf. To re-enable this functionality, simply" - einfo "remove the line that disables it (mdns off)." - echo - - if want_nptl && want_linuxthreads ; then - einfo "The default behavior of glibc on your system is to use NPTL. If" - einfo "you want to use linuxthreads for a particular program, start it" - einfo "by executing 'LD_ASSUME_KERNEL=${LT_KERNEL_VERSION} []'" - echo - fi -} - -### SUPPORT FUNCTIONS ### -# We need to be able to set alternative headers for -# compiling for non-native platform -# Will also become useful for testing kernel-headers without screwing up -# the whole system. -# note: intentionally undocumented. -alt_headers() { - if [[ -z ${ALT_HEADERS} ]] ; then - if is_crosscompile ; then - ALT_HEADERS="/usr/${CTARGET}/include" - else - ALT_HEADERS="/usr/include" - fi - fi - echo "${ALT_HEADERS}" -} -alt_build_headers() { - if [[ -z ${ALT_BUILD_HEADERS} ]] ; then - ALT_BUILD_HEADERS=$(alt_headers) - tc-is-cross-compiler && ALT_BUILD_HEADERS=${ROOT}$(alt_headers) - fi - echo "${ALT_BUILD_HEADERS}" -} - -alt_prefix() { - if is_crosscompile ; then - echo /usr/${CTARGET} - else - echo /usr - fi -} - -alt_libdir() { - if is_crosscompile ; then - echo /usr/${CTARGET}/$(get_libdir) - else - echo /$(get_libdir) - fi -} - -alt_usrlibdir() { - if is_crosscompile ; then - echo /usr/${CTARGET}/$(get_libdir) - else - echo /usr/$(get_libdir) - fi -} - -setup_flags() { - # Make sure host make.conf doesn't pollute us - if is_crosscompile || tc-is-cross-compiler ; then - CHOST=${CTARGET} strip-unsupported-flags - fi - - # Store our CFLAGS because it's changed depending on which CTARGET - # we are building when pulling glibc on a multilib profile - CFLAGS_BASE=${CFLAGS_BASE-${CFLAGS}} - CFLAGS=${CFLAGS_BASE} - ASFLAGS_BASE=${ASFLAGS_BASE-${ASFLAGS}} - ASFLAGS=${ASFLAGS_BASE} - - # Over-zealous CFLAGS can often cause problems. What may work for one - # person may not work for another. To avoid a large influx of bugs - # relating to failed builds, we strip most CFLAGS out to ensure as few - # problems as possible. - strip-flags - strip-unsupported-flags - filter-flags -m32 -m64 -mabi=* - - unset CBUILD_OPT CTARGET_OPT - if has_multilib_profile ; then - CTARGET_OPT=$(get_abi_CTARGET) - [[ -z ${CTARGET_OPT} ]] && CTARGET_OPT=$(get_abi_CHOST) - fi - - case $(tc-arch) in - amd64) - # Punt this when amd64's 2004.3 is removed - CFLAGS_x86="-m32" - ;; - ppc) - append-flags "-freorder-blocks" - ;; - sparc) - # Both sparc and sparc64 can use -fcall-used-g6. -g7 is bad, though. - filter-flags "-fcall-used-g7" - append-flags "-fcall-used-g6" - filter-flags "-mvis" - - if is_crosscompile || [[ ${PROFILE_ARCH} == "sparc64" ]] || { has_multilib_profile && ! tc-is-cross-compiler; } ; then - case ${ABI} in - sparc64) - filter-flags -Wa,-xarch -Wa,-A - - if is-flag "-mcpu=ultrasparc3"; then - CTARGET_OPT="sparc64b-unknown-linux-gnu" - append-flags "-Wa,-xarch=v9b" - export ASFLAGS="${ASFLAGS} -Wa,-xarch=v9b" - else - CTARGET_OPT="sparc64-unknown-linux-gnu" - append-flags "-Wa,-xarch=v9a" - export ASFLAGS="${ASFLAGS} -Wa,-xarch=v9a" - fi - ;; - *) - if is-flag "-mcpu=ultrasparc3"; then - CTARGET_OPT="sparcv9b-unknown-linux-gnu" - else - CTARGET_OPT="sparcv9-unknown-linux-gnu" - fi - ;; - esac - else - if is-flag "-mcpu=ultrasparc3"; then - CTARGET_OPT="sparcv9b-unknown-linux-gnu" - elif { is_crosscompile && want_nptl; } || is-flag "-mcpu=ultrasparc2" || is-flag "-mcpu=ultrasparc"; then - CTARGET_OPT="sparcv9-unknown-linux-gnu" - fi - fi - ;; - esac - - if [[ -n ${CTARGET_OPT} && ${CBUILD} == ${CHOST} ]] && ! is_crosscompile; then - CBUILD_OPT=${CTARGET_OPT} - fi - - if $(tc-getCC ${CTARGET}) -v 2>&1 | grep -q 'gcc version 3.[0123]'; then - append-flags -finline-limit=2000 - fi - - # We don't want these flags for glibc - filter-ldflags -pie - - # Lock glibc at -O2 -- linuxthreads needs it and we want to be - # conservative here - filter-flags -O? - append-flags -O2 -} - -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 -} - -check_nptl_support() { - local min_kernel_version="$(KV_to_int "${NPTL_KERNEL_VERSION}")" - - echo - - einfon "Checking gcc for __thread support ... " - if want__thread ; then - echo "yes" - else - echo "no" - echo - eerror "Could not find a gcc that supports the __thread directive!" - eerror "please update to gcc-3.2.2-r1 or later, and try again." - die "No __thread support in gcc!" - fi - - # Building fails on an non-supporting kernel - einfon "Checking kernel version (>=${NPTL_KERNEL_VERSION}) ... " - if [ "`get_KV`" -lt "${min_kernel_version}" ] ; then - echo "no" - echo - eerror "You need a kernel of at least version ${NPTL_KERNEL_VERSION}" - eerror "for NPTL support!" - die "Kernel version too low!" - else - echo "yes" - fi - - # Building fails with too low linux-headers - einfon "Checking linux-headers version (>=${NPTL_KERNEL_VERSION}) ... " - if ! check_kheader_version "${min_kernel_version}"; then - echo "no" - echo - eerror "You need linux-headers of at least version ${NPTL_KERNEL_VERSION}" - eerror "for NPTL support!" - die "linux-headers version too low!" - else - echo "yes" - fi - - echo -} - -want_nptl() { - want_tls || return 1 - use nptl || return 1 - - # Archs that can use NPTL - case $(tc-arch) in - alpha|amd64|ia64|mips|ppc|ppc64|s390|sh|x86) - return 0; - ;; - sparc) - # >= v9 is needed for nptl. - [[ "${PROFILE_ARCH}" == "sparc" ]] && return 1 - return 0; - ;; - esac - - return 1 -} - -want_linuxthreads() { - ! use nptlonly && return 0 - want_nptl || return 0 - return 1 -} - -want_tls() { - # Archs that can use TLS (Thread Local Storage) - case $(tc-arch) in - alpha|amd64|ia64|mips|ppc|ppc64|s390|sh) - return 0; - ;; - sparc) - # 2.3.6 should have tls support on sparc64 - # when using newer binutils - case ${CTARGET/-*} in - sparc64*) return 1 ;; - *) return 0 ;; - esac - ;; - x86) - # requires i486 or better #106556 - [[ ${CTARGET} == i[4567]86* ]] && return 0 - ;; - esac - - return 1 -} - -want__thread() { - want_tls || return 1 - - # For some reason --with-tls --with__thread is causing segfaults on sparc32. - [[ ${PROFILE_ARCH} == "sparc" ]] && return 1 - - [[ -n ${WANT__THREAD} ]] && return ${WANT__THREAD} - - $(tc-getCC ${CTARGET}) -c ${FILESDIR}/test-__thread.c -o ${T}/test2.o &> /dev/null - WANT__THREAD=$? - - return ${WANT__THREAD} -} - -install_locales() { - unset LANGUAGE LANG LC_ALL - cd "${WORKDIR}"/${MYMAINBUILDDIR} || die "${WORKDIR}/${MYMAINBUILDDIR}" - make PARALLELMFLAGS="${MAKEOPTS} -j1" \ - install_root=${D} localedata/install-locales || die -} - -setup_locales() { - if use !userlocales ; then - einfo "userlocales not enabled, installing -ALL- locales..." - install_locales || die - elif [ -e /etc/locales.build ] ; then - einfo "Installing locales in /etc/locales.build..." - echo 'SUPPORTED-LOCALES=\' > SUPPORTED.locales - cat /etc/locales.build | grep -v -e ^$ -e ^\# | sed 's/$/\ \\/g' \ - >> SUPPORTED.locales - cat SUPPORTED.locales > ${S}/localedata/SUPPORTED || die - install_locales || die - elif [ -e ${FILESDIR}/locales.build ] ; then - einfo "Installing locales in ${FILESDIR}/locales.build..." - echo 'SUPPORTED-LOCALES=\' > SUPPORTED.locales - cat ${FILESDIR}/locales.build | grep -v -e ^$ -e ^\# | sed 's/$/\ \\/g' \ - >> SUPPORTED.locales - cat SUPPORTED.locales > ${S}/localedata/SUPPORTED || die - install_locales || die - else - einfo "Installing -ALL- locales..." - install_locales || die - fi -} - -glibc_do_configure() { - local myconf - - # set addons - pushd ${S} > /dev/null - ADDONS=$(echo */configure | sed -e 's!/configure!!g;s!\(linuxthreads\|nptl\|rtkaio\|glibc-compat\)\( \|$\)!!g;s! \+$!!;s! !,!g;s!^!,!;/^,\*$/d') - use glibc-compat20 && [[ -d glibc-compat ]] && ADDONS="${ADDONS},glibc-compat" - popd > /dev/null - - use nls || myconf="${myconf} --disable-nls" - use erandom || myconf="${myconf} --disable-dev-erandom" - - use glibc-omitfp && myconf="${myconf} --enable-omitfp" - - [[ ${CTARGET} == *-softfloat-* ]] && myconf="${myconf} --without-fp" - - if [ "$1" == "linuxthreads" ] ; then - if want_tls && [[ ${CTARGET} != i[45]86-* ]] ; then - myconf="${myconf} --with-tls" - - if want__thread && use linuxthreads-tls ; then - myconf="${myconf} --with-__thread" - else - myconf="${myconf} --without-__thread" - fi - else - myconf="${myconf} --without-tls --without-__thread" - fi - - myconf="${myconf} --enable-add-ons=linuxthreads${ADDONS}" - myconf="${myconf} --enable-kernel=${LT_KERNEL_VERSION}" - elif [ "$1" == "nptl" ] ; then - myconf="${myconf} --with-tls --with-__thread" - myconf="${myconf} --enable-add-ons=nptl${ADDONS}" - myconf="${myconf} --enable-kernel=${NPTL_KERNEL_VERSION}" - else - die "invalid pthread option" - fi - - # Since SELinux support is only required for nscd, only enable it if: - # 1. USE selinux - # 2. ! USE build - # 3. only for the primary ABI on multilib systems - if use selinux && ! use build; then - if use multilib || has_multilib_profile; then - if is_final_abi; then - myconf="${myconf} --with-selinux" - else - myconf="${myconf} --without-selinux" - fi - else - myconf="${myconf} --with-selinux" - fi - else - myconf="${myconf} --without-selinux" - fi - - # Pick out the correct location for build headers - myconf="${myconf} - --without-cvs - --enable-bind-now - --build=${CBUILD_OPT:-${CBUILD}} - --host=${CTARGET_OPT:-${CTARGET}} - $(use_enable profile) - --without-gd - --with-headers=$(alt_build_headers) - --prefix=$(alt_prefix) - --mandir=$(alt_prefix)/share/man - --infodir=$(alt_prefix)/share/info - --libexecdir=$(alt_prefix)/lib/misc/glibc - ${EXTRA_ECONF}" - - has_version app-admin/eselect-compiler || export CC="$(tc-getCC ${CTARGET})" - - GBUILDDIR=${WORKDIR}/build-${ABI}-${CTARGET}-$1 - mkdir -p ${GBUILDDIR} - cd ${GBUILDDIR} - einfo "Configuring GLIBC for $1 with: ${myconf// /\n\t\t}" - ${S}/configure ${myconf} || die "failed to configure glibc" -} - -fix_lib64_symlinks() { - # the original Gentoo/AMD64 devs decided that since 64bit is the native - # bitdepth for AMD64, lib should be used for 64bit libraries. however, - # this ignores the FHS and breaks multilib horribly... especially - # since it wont even work without a lib64 symlink anyways. *rolls eyes* - # see bug 59710 for more information. - # Travis Tilley (08 Aug 2004) - if [ -L ${ROOT}/lib64 ] ; then - ewarn "removing /lib64 symlink and moving lib to lib64..." - ewarn "dont hit ctrl-c until this is done" - addwrite ${ROOT}/ - rm ${ROOT}/lib64 - # now that lib64 is gone, nothing will run without calling ld.so - # directly. luckily the window of brokenness is almost non-existant - use amd64 && /lib/ld-linux-x86-64.so.2 /bin/mv ${ROOT}/lib ${ROOT}/lib64 - use ppc64 && /lib/ld64.so.1 /bin/mv ${ROOT}/lib ${ROOT}/lib64 - # all better :) - ldconfig - ln -s lib64 ${ROOT}/lib - einfo "done! :-)" - einfo "fixed broken lib64/lib symlink in ${ROOT}" - fi - if [ -L ${ROOT}/usr/lib64 ] ; then - addwrite ${ROOT}/usr - rm ${ROOT}/usr/lib64 - mv ${ROOT}/usr/lib ${ROOT}/usr/lib64 - ln -s lib64 ${ROOT}/usr/lib - einfo "fixed broken lib64/lib symlink in ${ROOT}/usr" - fi - if [ -L ${ROOT}/usr/X11R6/lib64 ] ; then - addwrite ${ROOT}/usr/X11R6 - rm ${ROOT}/usr/X11R6/lib64 - mv ${ROOT}/usr/X11R6/lib ${ROOT}/usr/X11R6/lib64 - ln -s lib64 ${ROOT}/usr/X11R6/lib - einfo "fixed broken lib64/lib symlink in ${ROOT}/usr/X11R6" - fi -} - -use_multilib() { - case ${CTARGET} in - sparc64*|mips64*|x86_64*|powerpc64*|s390x*) - has_multilib_profile || use multilib ;; - *) false ;; - esac -} - -# Setup toolchain variables that would be defined in the profiles for these archs. -setup_env() { - # These should not be set, else the zoneinfo do not always get installed ... - unset LANGUAGE LANG LC_ALL - # silly users - unset LD_RUN_PATH - - if is_crosscompile || tc-is-cross-compiler ; then - multilib_env ${CTARGET} - if ! use multilib ; then - MULTILIB_ABIS=${DEFAULT_ABI} - else - MULTILIB_ABIS=${MULTILIB_ABIS:-${DEFAULT_ABI}} - fi - - # If the user has CFLAGS_ in their make.conf, use that, - # and fall back on CFLAGS. - local VAR=CFLAGS_${CTARGET//[-.]/_} - CFLAGS=${!VAR-${CFLAGS}} - fi - - setup_flags - - export ABI=${ABI:-${DEFAULT_ABI:-default}} - - if is_crosscompile || tc-is-cross-compiler ; then - local VAR=CFLAGS_${ABI} - # We need to export CFLAGS with abi information in them because - # glibc's configure script checks CFLAGS for some targets (like mips) - export CFLAGS="${!VAR} ${CFLAGS}" - fi -} - -### /ECLASS PUNTAGE ### - -if is_crosscompile ; then - SLOT="${CTARGET}-2.2" -else - SLOT="2.2" -fi - -# we'll handle stripping ourself #46186 -RESTRICT="nostrip multilib-pkg-force" - -# We need a new-enough binutils for as-needed -DEPEND=">=sys-devel/gcc-3.4 - nptl? ( >=sys-kernel/linux-headers-${NPTL_KERNEL_VERSION} ) - >=sys-devel/binutils-2.15.94 - || ( app-admin/eselect-compiler >=sys-devel/gcc-config-1.3.12 ) - virtual/os-headers - nls? ( sys-devel/gettext ) - selinux? ( !build? ( sys-libs/libselinux ) )" -RDEPEND="nls? ( sys-devel/gettext ) - selinux? ( !build? ( sys-libs/libselinux ) )" - -if [[ ${CATEGORY/cross-} != ${CATEGORY} ]] ; then - DEPEND="${DEPEND} ${CATEGORY}/gcc" - - if [[ ${CATEGORY} == *-linux* ]] ; then - if [[ ${CATEGORY} == cross-mips* ]] ; then - DEPEND="${DEPEND} >=${CATEGORY}/mips-headers-2.6.10" - else - DEPEND="${DEPEND} ${CATEGORY}/linux-headers" - fi - fi -else - DEPEND="${DEPEND} sys-libs/timezone-data" - RDEPEND="${RDEPEND} sys-libs/timezone-data" -fi - -pkg_setup() { - if has_version '>=sys-libs/glibc-2.3.5.20050201' && \ - has_version ' ${T}/gcc_eh_test.c - if ! $(tc-getCC ${CTARGET}) ${T}/gcc_eh_test.c -lgcc_eh 2>/dev/null ; then - sed -i -e 's:-lgcc_eh::' Makeconfig || die "sed gcc_eh" - fi - - # Some configure checks fail on the first emerge through because they - # try to link. This doesn't work well if we don't have a libc yet. - # http://sourceware.org/ml/libc-alpha/2005-02/msg00042.html - if is_crosscompile && use build; then - rm ${S}/sysdeps/sparc/sparc64/elf/configure{,.in} - rm ${S}/nptl/sysdeps/pthread/configure{,.in} - fi - - cd "${WORKDIR}" - find . -type f '(' -size 0 -o -name "*.orig" ')' -exec rm -f {} \; - find . -name configure -exec touch {} \; - - # Fix permissions on some of the scripts - chmod u+x "${S}"/scripts/*.sh -} - -src_compile() { - setup_env - - if [[ -z ${OABI} ]] ; then - local abilist="" - if has_multilib_profile ; then - abilist=$(get_install_abis) - einfo "Building multilib glibc for ABIs: ${abilist}" - elif is_crosscompile || tc-is-cross-compiler ; then - abilist=${DEFAULT_ABI} - fi - if [[ -n ${abilist} ]] ; then - OABI=${ABI} - for ABI in ${abilist} ; do - export ABI - src_compile - done - ABI=${OABI} - unset OABI - return 0 - fi - fi - - if just_headers ; then - toolchain-glibc_headers_compile - else - toolchain-glibc_src_compile - fi -} - -src_test() { - setup_env - - if [[ -z ${OABI} ]] && has_multilib_profile ; then - OABI=${ABI} - einfo "Testing multilib glibc for ABIs: $(get_install_abis)" - for ABI in $(get_install_abis) ; do - export ABI - einfo " Testing ${ABI} glibc" - src_test - done - ABI=${OABI} - unset OABI - return 0 - fi - - toolchain-glibc_src_test -} - -src_strip() { - # Now, strip everything but the thread libs #46186, as well as the dynamic - # linker, else we cannot set breakpoints in shared libraries due to bugs in - # gdb. Also want to grab stuff in tls subdir. whee. -#when new portage supports this ... -# env \ -# -uRESTRICT \ -# CHOST=${CTARGET} \ -# STRIP_MASK="/*/{,tls/}{ld-,lib{pthread,thread_db}}*" \ -# prepallstrip - pushd "${D}" > /dev/null - - if ! is_crosscompile ; then - mkdir -p "${T}"/strip-backup - for x in $(find "${D}" -maxdepth 3 \ - '(' -name 'ld-*' -o -name 'libpthread*' -o -name 'libthread_db*' ')' \ - -a '(' '!' -name '*.a' ')' -type f -printf '%P ') - do - mkdir -p "${T}/strip-backup/${x%/*}" - cp -a -- "${D}/${x}" "${T}/strip-backup/${x}" || die "backing up ${x}" - done - fi - env -uRESTRICT CHOST=${CTARGET} prepallstrip - if ! is_crosscompile ; then - cp -a -- "${T}"/strip-backup/* "${D}"/ || die "restoring non-stripped libs" - fi - - popd > /dev/null -} - -src_install() { - setup_env - - if [[ -z ${OABI} ]] ; then - local abilist="" - if has_multilib_profile ; then - abilist=$(get_install_abis) - einfo "Installing multilib glibc for ABIs: ${abilist}" - elif is_crosscompile || tc-is-cross-compiler ; then - abilist=${DEFAULT_ABI} - fi - if [[ -n ${abilist} ]] ; then - OABI=${ABI} - for ABI in ${abilist} ; do - export ABI - src_install - done - ABI=${OABI} - unset OABI - src_strip - return 0 - fi - fi - - # Handle stupid lib32 BS - unset OLD_LIBDIR - if ! is_crosscompile ; then - if [[ $(tc-arch) == "amd64" && ${ABI} == "x86" && $(get_libdir) != "lib" ]] ; then - OLD_LIBDIR=$(get_libdir) - LIBDIR_x86="lib" - fi - - if [[ $(tc-arch) == "ppc64" && ${ABI} == "ppc" && $(get_libdir) != "lib" ]] ; then - OLD_LIBDIR=$(get_libdir) - LIBDIR_ppc="lib" - fi - fi - - if just_headers ; then - toolchain-glibc_headers_install - else - toolchain-glibc_src_install - fi - [[ -z ${OABI} ]] && src_strip - - # Handle stupid lib32 BS on amd64 and ppc64 - if [[ -n ${OLD_LIBDIR} ]] ; then - cd "${S}" - [[ $(tc-arch) == "amd64" ]] && LIBDIR_x86=${OLD_LIBDIR} - [[ $(tc-arch) == "ppc64" ]] && LIBDIR_ppc=${OLD_LIBDIR} - unset OLD_LIBDIR - - mv "${D}"/lib "${D}"/$(get_libdir) - mv "${D}"/usr/lib "${D}"/usr/$(get_libdir) - dodir /lib - dodir /usr/lib - mv "${D}"/usr/$(get_libdir)/locale "${D}"/usr/lib - [[ $(tc-arch) == "amd64" ]] && dosym ../$(get_libdir)/ld-linux.so.2 /lib/ld-linux.so.2 - [[ $(tc-arch) == "ppc64" ]] && dosym ../$(get_libdir)/ld.so.1 /lib/ld.so.1 - - for f in "${D}"/usr/$(get_libdir)/*.so; do - local basef=$(basename "${f}") - if [[ -L ${f} ]] ; then - local target=$(readlink "${f}") - target=${target/\/lib\//\/$(get_libdir)\/} - rm "${f}" - dosym "${target}" /usr/$(get_libdir)/"${basef}" - fi - done - - dosed "s:/lib/:/$(get_libdir)/:g" /usr/$(get_libdir)/lib{c,pthread}.so - - if want_nptl && want_linuxthreads ; then - dosed "s:/lib/:/$(get_libdir)/:g" /usr/$(get_libdir)/nptl/lib{c,pthread}.so - fi - fi - - # PPC NPTL fix - if [[ $(tc-arch) == "ppc" ]] && use nptl && ! use nptlonly ; then - cp ${WORKDIR}/build-default-${CTARGET}-nptl/elf/ld.so ${D}/lib/ld-${PV}.so - fi -} - -pkg_preinst() { - toolchain-glibc_pkg_preinst -} - -pkg_postinst() { - toolchain-glibc_pkg_postinst -} diff --git a/sys-libs/glibc/glibc-2.3.6.ebuild b/sys-libs/glibc/glibc-2.3.6.ebuild deleted file mode 100644 index 25c5ed81f2da..000000000000 --- a/sys-libs/glibc/glibc-2.3.6.ebuild +++ /dev/null @@ -1,1312 +0,0 @@ -# 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.3.6.ebuild,v 1.22 2006/05/30 19:45:22 eradicator Exp $ - -# Here's how the cross-compile logic breaks down ... -# CTARGET - machine that will target the binaries -# CHOST - machine that will host the binaries -# CBUILD - machine that will build the binaries -# If CTARGET != CHOST, it means you want a libc for cross-compiling. -# If CHOST != CBUILD, it means you want to cross-compile the libc. -# CBUILD = CHOST = CTARGET - native build/install -# CBUILD != (CHOST = CTARGET) - cross-compile a native build -# (CBUILD = CHOST) != CTARGET - libc for cross-compiler -# CBUILD != CHOST != CTARGET - cross-compile a libc for a cross-compiler -# For install paths: -# CHOST = CTARGET - install into / -# CHOST != CTARGET - install into /usr/CTARGET/ - -KEYWORDS="-*" - -BRANCH_UPDATE="" - -# From linuxthreads/man -GLIBC_MANPAGE_VERSION="2.3.6-1" - -# From manual -GLIBC_INFOPAGE_VERSION="2.3.6" - -# Gentoo patchset -PATCH_VER="1.1" - -# C Stubbs addon (contained in fedora, so ignoring) -#CSTUBS_VER="2.1.2" -#CSTUBS_TARBALL="c_stubs-${CSTUBS_VER}.tar.bz2" -#CSTUBS_URI="mirror://gentoo/${CSTUBS_TARBALL}" - -# Fedora addons (from RHEL's glibc-2.3.4-2.src.rpm) -FEDORA_VER="20041219T2331" -FEDORA_TARBALL="glibc-fedora-${FEDORA_VER}.tar.bz2" -FEDORA_URI="mirror://gentoo/${FEDORA_TARBALL}" - -GENTOO_TOOLCHAIN_BASE_URI="mirror://gentoo" -GENTOO_TOOLCHAIN_DEV_URI="http://dev.gentoo.org/~azarah/glibc" - -### PUNT OUT TO ECLASS?? ### -inherit eutils versionator libtool toolchain-funcs flag-o-matic gnuconfig multilib - -DESCRIPTION="GNU libc6 (also called glibc2) C library" -HOMEPAGE="http://www.gnu.org/software/libc/libc.html" -LICENSE="LGPL-2" - -IUSE="nls pic build nptl nptlonly erandom hardened userlocales multilib selinux glibc-compat20 glibc-omitfp linuxthreads-tls profile" - -export CBUILD=${CBUILD:-${CHOST}} -export CTARGET=${CTARGET:-${CHOST}} -if [[ ${CTARGET} == ${CHOST} ]] ; then - if [[ ${CATEGORY/cross-} != ${CATEGORY} ]] ; then - export CTARGET=${CATEGORY/cross-} - fi -fi -if [[ ${CTARGET} == ${CHOST} ]] ; then - PROVIDE="virtual/libc" -fi - -is_crosscompile() { - [[ ${CHOST} != ${CTARGET} ]] -} - -GLIBC_RELEASE_VER=$(get_version_component_range 1-3) - -# Don't set this to :-, - allows BRANCH_UPDATE="" -BRANCH_UPDATE=${BRANCH_UPDATE-$(get_version_component_range 4)} - -# (Recent snapshots fails with 2.6.5 and earlier with NPTL) -NPTL_KERNEL_VERSION=${NPTL_KERNEL_VERSION:-"2.6.6"} -LT_KERNEL_VERSION=${LT_KERNEL_VERSION:-"2.4.1"} - -### SRC_URI ### - -# This function handles the basics of setting the SRC_URI for a glibc ebuild. -# To use, set SRC_URI with: -# -# SRC_URI="$(get_glibc_src_uri)" -# -# Other than the variables normally set by portage, this function's behavior -# can be altered by setting the following: -# -# GENTOO_TOOLCHAIN_BASE_URI -# This sets the base URI for all gentoo-specific patch files. Note -# that this variable is only important for a brief period of time, -# before your source files get picked up by mirrors. However, it is -# still highly suggested that you keep files in this location -# available. -# -# BRANCH_UPDATE -# If set, this variable signals that we should be using the main -# release tarball (determined by ebuild version) and applying a -# CVS branch update patch against it. The location of this branch -# update patch is assumed to be in ${GENTOO_TOOLCHAIN_BASE_URI}. -# Just like with SNAPSHOT, this variable is ignored if the ebuild -# has a _pre suffix. -# -# PATCH_VER -# PATCH_GLIBC_VER -# This should be set to the version of the gentoo patch tarball. -# The resulting filename of this tarball will be: -# glibc-${PATCH_GLIBC_VER:-${GLIBC_RELEASE_VER}}-patches-${PATCH_VER}.tar.bz2 -# -# GLIBC_MANPAGE_VERSION -# GLIBC_INFOPAGE_VERSION -# The version of glibc for which we will download pages. This will -# default to ${GLIBC_RELEASE_VER}, but we may not want to pre-generate man pages -# for prerelease test ebuilds for example. This allows you to -# continue using pre-generated manpages from the last stable release. -# If set to "none", this will prevent the downloading of manpages, -# which is useful for individual library targets. -# -get_glibc_src_uri() { - GENTOO_TOOLCHAIN_BASE_URI=${GENTOO_TOOLCHAIN_BASE_URI:-"mirror://gentoo"} - -# GLIBC_SRC_URI="http://ftp.gnu.org/gnu/glibc/glibc-${GLIBC_RELEASE_VER}.tar.bz2 -# http://ftp.gnu.org/gnu/glibc/glibc-linuxthreads-${GLIBC_RELEASE_VER}.tar.bz2 -# http://ftp.gnu.org/gnu/glibc/glibc-libidn-${GLIBC_RELEASE_VER}.tar.bz2 - GLIBC_SRC_URI="mirror://gnu/glibc/glibc-${GLIBC_RELEASE_VER}.tar.bz2 - mirror://gnu/glibc/glibc-linuxthreads-${GLIBC_RELEASE_VER}.tar.bz2 - mirror://gnu/glibc/glibc-libidn-${GLIBC_RELEASE_VER}.tar.bz2" - - if [[ -n ${BRANCH_UPDATE} ]] ; then - GLIBC_SRC_URI="${GLIBC_SRC_URI} - ${GENTOO_TOOLCHAIN_BASE_URI}/glibc-${GLIBC_RELEASE_VER}-branch-update-${BRANCH_UPDATE}.patch.bz2" - [[ -n ${GENTOO_TOOLCHAIN_DEV_URI} ]] && - GLIBC_SRC_URI="${GLIBC_SRC_URI} - ${GENTOO_TOOLCHAIN_DEV_URI}/glibc-${GLIBC_RELEASE_VER}-branch-update-${BRANCH_UPDATE}.patch.bz2" - fi - - if [[ -n ${PATCH_VER} ]] ; then - GLIBC_SRC_URI="${GLIBC_SRC_URI} - ${GENTOO_TOOLCHAIN_BASE_URI}/glibc-${PATCH_GLIBC_VER:-${GLIBC_RELEASE_VER}}-patches-${PATCH_VER}.tar.bz2" - [[ -n ${GENTOO_TOOLCHAIN_DEV_URI} ]] && - GLIBC_SRC_URI="${GLIBC_SRC_URI} - ${GENTOO_TOOLCHAIN_DEV_URI}/glibc-${PATCH_GLIBC_VER:-${GLIBC_RELEASE_VER}}-patches-${PATCH_VER}.tar.bz2" - fi - - if [[ ${GLIBC_MANPAGE_VERSION} != "none" ]] ; then - GLIBC_SRC_URI="${GLIBC_SRC_URI} - ${GENTOO_TOOLCHAIN_BASE_URI}/glibc-manpages-${GLIBC_MANPAGE_VERSION:-${GLIBC_RELEASE_VER}}.tar.bz2" - [[ -n ${GENTOO_TOOLCHAIN_DEV_URI} ]] && - GLIBC_SRC_URI="${GLIBC_SRC_URI} - ${GENTOO_TOOLCHAIN_DEV_URI}/glibc-manpages-${GLIBC_MANPAGE_VERSION:-${GLIBC_RELEASE_VER}}.tar.bz2" - fi - - if [[ ${GLIBC_INFOPAGE_VERSION} != "none" ]] ; then - GLIBC_SRC_URI="${GLIBC_SRC_URI} - ${GENTOO_TOOLCHAIN_BASE_URI}/glibc-infopages-${GLIBC_INFOPAGE_VERSION:-${GLIBC_RELEASE_VER}}.tar.bz2" - [[ -n ${GENTOO_TOOLCHAIN_DEV_URI} ]] && - GLIBC_SRC_URI="${GLIBC_SRC_URI} - ${GENTOO_TOOLCHAIN_DEV_URI}/glibc-infopages-${GLIBC_INFOPAGE_VERSION:-${GLIBC_RELEASE_VER}}.tar.bz2" - fi - - if [[ -n ${CSTUBS_URI} ]] ; then - GLIBC_SRC_URI="${GLIBC_SRC_URI} ${CSTUBS_URI}" - fi - - if [[ -n ${FEDORA_URI} ]] ; then - GLIBC_SRC_URI="${GLIBC_SRC_URI} ${FEDORA_URI}" - fi - - echo "${GLIBC_SRC_URI}" -} - -SRC_URI=$(get_glibc_src_uri) -S=${WORKDIR}/glibc-${GLIBC_RELEASE_VER} - -### EXPORTED FUNCTIONS ### -toolchain-glibc_src_unpack() { - # Check NPTL support _before_ we unpack things to save some time - want_nptl && check_nptl_support - - unpack glibc-${GLIBC_RELEASE_VER}.tar.bz2 - - cd "${S}" - unpack glibc-linuxthreads-${GLIBC_RELEASE_VER}.tar.bz2 - unpack glibc-libidn-${GLIBC_RELEASE_VER}.tar.bz2 - - [[ -n ${CSTUBS_TARBALL} ]] && unpack ${CSTUBS_TARBALL} - [[ -n ${FEDORA_TARBALL} ]] && unpack ${FEDORA_TARBALL} - - if [[ -n ${PATCH_VER} ]] ; then - cd "${WORKDIR}" - unpack glibc-${PATCH_GLIBC_VER:-${GLIBC_RELEASE_VER}}-patches-${PATCH_VER}.tar.bz2 - fi - - # XXX: We should do the branchupdate, before extracting the manpages and - # infopages else it does not help much (mtimes change if there is a change - # to them with branchupdate) - if [[ -n ${BRANCH_UPDATE} ]] ; then - cd "${S}" - epatch "${DISTDIR}"/glibc-${GLIBC_RELEASE_VER}-branch-update-${BRANCH_UPDATE}.patch.bz2 - - # Snapshot date patch - einfo "Patching version to display snapshot date ..." - sed -i -e "s:\(#define RELEASE\).*:\1 \"${BRANCH_UPDATE}\":" version.h - fi - - if [[ ${GLIBC_MANPAGE_VERSION} != "none" ]] ; then - cd "${WORKDIR}" - unpack glibc-manpages-${GLIBC_MANPAGE_VERSION:-${GLIBC_RELEASE_VER}}.tar.bz2 - fi - - if [[ ${GLIBC_INFOPAGE_VERSION} != "none" ]] ; then - cd "${S}" - unpack glibc-infopages-${GLIBC_INFOPAGE_VERSION:-${GLIBC_RELEASE_VER}}.tar.bz2 - fi - - if [[ -n ${PATCH_VER} ]] ; then - cd "${S}" - EPATCH_MULTI_MSG="Applying Gentoo Glibc Patchset ${PATCH_GLIBC_VER:-${GLIBC_RELEASE_VER}}-${PATCH_VER} ..." \ - EPATCH_EXCLUDE=${GLIBC_PATCH_EXCLUDE} \ - EPATCH_SUFFIX="patch" \ - ARCH=$(tc-arch) \ - epatch "${WORKDIR}"/patches - fi -} - -toolchain-glibc_src_compile() { - # Set gconvdir to /usr/$(get_libdir)/gconv on archs with multiple ABIs - local MAKEFLAGS="" - has_multilib_profile && MAKEFLAGS="gconvdir=$(alt_usrlibdir)/gconv" - - echo - for v in ABI CBUILD CHOST CTARGET CBUILD_OPT CTARGET_OPT CC CFLAGS ; do - einfo " $(printf '%15s' ${v}:) ${!v}" - done - echo - - if want_linuxthreads ; then - glibc_do_configure linuxthreads - einfo "Building GLIBC with linuxthreads..." - make PARALLELMFLAGS="${MAKEOPTS}" ${MAKEFLAGS} || die "make for ${ABI} failed" - fi - if want_nptl ; then - # ... and then do the optional nptl build - unset LD_ASSUME_KERNEL - glibc_do_configure nptl - einfo "Building GLIBC with NPTL..." - make PARALLELMFLAGS="${MAKEOPTS}" ${MAKEFLAGS} || die "make for ${ABI} failed" - fi -} - -toolchain-glibc_src_test() { - # This is wrong, but glibc's tests fail bad when screwing - # around with sandbox, so lets just punt it - unset LD_PRELOAD - - # do the linuxthreads build unless we're using nptlonly - if want_linuxthreads ; then - cd "${WORKDIR}"/build-${ABI}-${CTARGET}-linuxthreads - einfo "Checking GLIBC with linuxthreads..." - make check || die "linuxthreads glibc did not pass make check" - fi - if want_nptl ; then - cd "${WORKDIR}"/build-${ABI}-${CTARGET}-nptl - unset LD_ASSUME_KERNEL || : - einfo "Checking GLIBC with NPTL..." - make check || die "nptl glibc did not pass make check" - fi -} - -toolchain-glibc_pkg_preinst() { - # PPC64+others may want to eventually be added to this logic if they - # decide to be multilib compatible and FHS compliant. note that this - # chunk of FHS compliance only applies to 64bit archs where 32bit - # compatibility is a major concern (not IA64, for example). - - # amd64's 2005.0 is the first amd64 profile to not need this code. - # 2005.0 is setup properly, and this is executed as part of the - # 2004.3 -> 2005.0 upgrade script. - # 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 ]] && ! { want_nptl && want_linuxthreads; }; then - addwrite "${ROOT}"/$(alt_libdir)/ - ewarn "nptlonly or -nptl in USE, removing /${ROOT}$(alt_libdir)/tls..." - rm -r "${ROOT}"/$(alt_libdir)/tls || die - fi - - # Shouldnt need to keep this updated - [[ -e ${ROOT}/etc/locales.build ]] && rm -f "${D}"/etc/locales.build -} - -toolchain-glibc_src_install() { - # Need to dodir first because it might not exist (bad amd64 profiles) - dodir $(alt_usrlibdir) - - # These should not be set, else the - # zoneinfo do not always get installed ... - unset LANGUAGE LANG LC_ALL - - if want_linuxthreads ; then - cd "${WORKDIR}"/build-${ABI}-${CTARGET}-linuxthreads - einfo "Installing GLIBC ${ABI} with linuxthreads ..." - make PARALLELMFLAGS="${MAKEOPTS} -j1" \ - install_root="${D}" \ - install || die - else # nptlonly - cd "${WORKDIR}"/build-${ABI}-${CTARGET}-nptl - einfo "Installing GLIBC ${ABI} with NPTL ..." - make PARALLELMFLAGS="${MAKEOPTS} -j1" \ - install_root="${D}" \ - install || die - fi - - if is_crosscompile ; then - # punt all the junk not needed by a cross-compiler - rm -rf "${D}"$(alt_prefix)/{bin,etc,$(get_libdir)/{gconv,misc},sbin,share} - else - # zoneinfo stuff is now provided by the timezone-data package - rm -rf "${D}"/usr/share/zoneinfo - rm -f "${D}"/usr/bin/tzselect - rm -f "${D}"/usr/sbin/{zic,zdump} - fi - - if want_linuxthreads && want_nptl ; then - einfo "Installing NPTL to $(alt_libdir)/tls/..." - cd "${WORKDIR}"/build-${ABI}-${CTARGET}-nptl - mkdir -p "${D}"$(alt_libdir)/tls/ - - libcsofile=$(basename "${D}"$(alt_libdir)/libc-*.so) - cp -a libc.so "${D}"$(alt_libdir)/tls/${libcsofile} || die - dosym ${libcsofile} $(alt_libdir)/tls/$(ls libc.so.*) - - libmsofile=$(basename "${D}"$(alt_libdir)/libm-*.so) - pushd math > /dev/null - cp -a libm.so "${D}"$(alt_libdir)/tls/${libmsofile} || die - dosym ${libmsofile} $(alt_libdir)/tls/$(ls libm.so.*) - popd > /dev/null - - librtsofile=$(basename "${D}"$(alt_libdir)/librt-*.so) - pushd rt > /dev/null - cp -a librt.so "${D}"$(alt_libdir)/tls/${librtsofile} || die - dosym ${librtsofile} $(alt_libdir)/tls/$(ls librt.so.*) - popd > /dev/null - - libthreaddbsofile=$(basename "${D}"$(alt_libdir)/libthread_db-*.so) - pushd nptl_db > /dev/null - cp -a libthread_db.so "${D}"$(alt_libdir)/tls/${libthreaddbsofile} || die - dosym ${libthreaddbsofile} $(alt_libdir)/tls/$(ls libthread_db.so.*) - popd > /dev/null - - libpthreadsofile=libpthread-${GLIBC_RELEASE_VER}.so - cp -a nptl/libpthread.so "${D}"$(alt_libdir)/tls/${libpthreadsofile} || die - dosym ${libpthreadsofile} $(alt_libdir)/tls/libpthread.so.0 - - # and now for the static libs - mkdir -p "${D}"$(alt_usrlibdir)/nptl - cp -a libc.a nptl/libpthread.a nptl/libpthread_nonshared.a rt/librt.a \ - "${D}"$(alt_usrlibdir)/nptl - - # linker script crap - for lib in libc libpthread; do - sed -e "s:$(alt_libdir)/${lib}.so:$(alt_libdir)/tls/${lib}.so:g" \ - -e "s:$(alt_usrlibdir)/${lib}_nonshared.a:$(alt_usrlibdir)/nptl/${lib}_nonshared.a:g" \ - "${D}"$(alt_usrlibdir)/${lib}.so \ - > "${D}"$(alt_usrlibdir)/nptl/${lib}.so - - chmod 755 "${D}"$(alt_usrlibdir)/nptl/${lib}.so - done - - dosym ../librt.so $(alt_usrlibdir)/nptl/librt.so - - # last but not least... headers. - mkdir -p "${D}"/nptl "${D}"$(alt_headers)/nptl - make install_root="${D}"/nptl install-headers PARALLELMFLAGS="${MAKEOPTS} -j1" - pushd "${D}"/nptl/$(alt_headers) > /dev/null - for i in $(find . -type f) ; do - if ! [[ -f ${D}$(alt_headers)/$i ]] \ - || ! cmp -s $i ${D}$(alt_headers)/$i; then - mkdir -p ${D}$(alt_headers)/nptl/`dirname $i` - cp -a $i ${D}$(alt_headers)/nptl/$i - fi - done - popd > /dev/null - rm -rf ${D}/nptl - fi - - if use pic && [[ $(tc-arch) != "amd64" ]] ; then - find ${S}/${buildtarget}/ -name "soinit.os" -exec cp {} ${D}$(alt_libdir)/soinit.o \; - find ${S}/${buildtarget}/ -name "sofini.os" -exec cp {} ${D}$(alt_libdir)/sofini.o \; - find ${S}/${buildtarget}/ -name "*_pic.a" -exec cp {} ${D}$(alt_libdir) \; - find ${S}/${buildtarget}/ -name "*.map" -exec cp {} ${D}$(alt_libdir) \; - - for i in ${D}$(alt_libdir)/*.map; do - mv ${i} ${i%.map}_pic.map - done - fi - - # We'll take care of the cache ourselves - rm -f ${D}/etc/ld.so.cache - - # Some things want this, notably ash. - dosym libbsd-compat.a $(alt_usrlibdir)/libbsd.a - - # Handle includes for different ABIs - prep_ml_includes $(alt_headers) - - ################################################################# - # EVERYTHING AFTER THIS POINT IS FOR NATIVE GLIBC INSTALLS ONLY # - # Make sure we install the sys-include symlink so that when - # we build a 2nd stage cross-compiler, gcc finds the target - # system headers correctly. See gcc/doc/gccinstall.info - if is_crosscompile ; then - dosym include $(alt_prefix)/sys-include - dosym . $(alt_prefix)/usr - return 0 - fi - - # Everything past this point just needs to be done once... don't waste time building locale files twice... - is_final_abi || return 0 - - if want_linuxthreads ; then - MYMAINBUILDDIR=build-${ABI}-${CTARGET}-linuxthreads - else - MYMAINBUILDDIR=build-${ABI}-${CTARGET}-nptl - fi - cd "${WORKDIR}"/${MYMAINBUILDDIR} - if ! use build ; then - if ! has noinfo ${FEATURES} && [[ ${GLIBC_INFOPAGE_VERSION} != "none" ]] ; then - einfo "Installing info pages..." - - make PARALLELMFLAGS="${MAKEOPTS} -j1" \ - install_root=${D} \ - info -i - fi - - setup_locales - - if [[ ${GLIBC_MANPAGE_VERSION} != "none" ]] ; then - einfo "Installing man pages..." - - # Install linuxthreads man pages even if nptl is enabled - cd "${WORKDIR}"/man - doman *.3thr - fi - - # Install nscd config file - insinto /etc - doins ${FILESDIR}/nscd.conf - doins "${FILESDIR}"/nsswitch.conf - - doinitd "${FILESDIR}"/nscd - - cd ${S} - dodoc BUGS ChangeLog* CONFORMANCE FAQ INTERFACE NEWS NOTES PROJECTS README* - else - rm -rf ${D}/usr/share - for dir in $(get_all_libdirs); do - rm -rf ${D}/usr/${dir}/gconv &> /dev/null - done - - einfo "Installing Timezone data..." - make PARALLELMFLAGS="${MAKEOPTS} -j1" \ - install_root=${D} \ - timezone/install-others || die - fi - - # Is this next line actually needed or does the makefile get it right? - # It previously has 0755 perms which was killing things. - fperms 4711 $(alt_prefix)/lib/misc/glibc/pt_chown - - # Prevent overwriting of the /etc/localtime symlink. We'll handle the - # creation of the "factory" symlink in pkg_postinst(). - rm -f ${D}/etc/localtime - - insinto /etc - # This is our new config file for building locales - doins ${FILESDIR}/locales.build - # example host.conf with multicast dns disabled by default - doins ${FILESDIR}/2.3.4/host.conf - - # simple test to make sure our new glibc isnt completely broken. - # for now, skip the multilib scenario. also make sure we don't - # test with statically built binaries since they will fail. - [[ ${CBUILD} != ${CHOST} ]] && return 0 - [[ $(get_libdir) != "lib" ]] && return 0 - for x in date env ls true uname ; do - x=$(type -p ${x}) - [[ -z ${x} ]] && continue - striptest=$(file -L ${x} 2>/dev/null) - [[ -z ${striptest} ]] && continue - [[ ${striptest/statically linked} != "${striptest}" ]] && continue - "${D}"/$(get_libdir)/ld-*.so \ - --library-path "${D}"/$(get_libdir) \ - ${x} > /dev/null \ - || die "simple run test (${x}) failed" - done -} - -toolchain-glibc_pkg_postinst() { - # Mixing nptlonly and -nptlonly glibc can prove dangerous if libpthread - # isn't removed in unmerge which happens sometimes. See bug #87671 - if ! is_crosscompile && want_linuxthreads ; then - for libdir in $(get_all_libdirs) ; do - for f in ${ROOT}/${libdir}/libpthread-2.* ${ROOT}/${libdir}/libpthread-0.6* ; do - if [[ -f ${f} ]] ; then - rm -f ${f} - ldconfig - fi - done - done - fi - - if ! is_crosscompile && [ -x "${ROOT}/usr/sbin/iconvconfig" ] ; then - # Generate fastloading iconv module configuration file. - ${ROOT}/usr/sbin/iconvconfig --prefix=${ROOT} - fi - - if [ ! -e "${ROOT}/lib/ld.so.1" ] && use ppc64 && ! has_multilib_profile ; then - ## SHOULDN'T THIS BE lib64?? - ln -s ld64.so.1 ${ROOT}/lib/ld.so.1 - fi - - # Reload init ... - if ! is_crosscompile && [ "${ROOT}" = "/" ] ; then - /sbin/init U &> /dev/null - fi - - # warn the few multicast-dns-by-default users we've had about the change - # in behavior... - echo - einfo "Gentoo's glibc now disables multicast dns by default in our" - einfo "example host.conf. To re-enable this functionality, simply" - einfo "remove the line that disables it (mdns off)." - echo - - if want_nptl && want_linuxthreads ; then - einfo "The default behavior of glibc on your system is to use NPTL. If" - einfo "you want to use linuxthreads for a particular program, start it" - einfo "by executing 'LD_ASSUME_KERNEL=${LT_KERNEL_VERSION} []'" - echo - fi -} - -### SUPPORT FUNCTIONS ### -# We need to be able to set alternative headers for -# compiling for non-native platform -# Will also become useful for testing kernel-headers without screwing up -# the whole system. -# note: intentionally undocumented. -alt_headers() { - if [[ -z ${ALT_HEADERS} ]] ; then - if is_crosscompile ; then - ALT_HEADERS="/usr/${CTARGET}/include" - else - ALT_HEADERS="/usr/include" - fi - fi - echo "${ALT_HEADERS}" -} -alt_build_headers() { - if [[ -z ${ALT_BUILD_HEADERS} ]] ; then - ALT_BUILD_HEADERS=$(alt_headers) - tc-is-cross-compiler && ALT_BUILD_HEADERS=${ROOT}$(alt_headers) - fi - echo "${ALT_BUILD_HEADERS}" -} - -alt_prefix() { - if is_crosscompile ; then - echo /usr/${CTARGET} - else - echo /usr - fi -} - -alt_libdir() { - if is_crosscompile ; then - echo /usr/${CTARGET}/$(get_libdir) - else - echo /$(get_libdir) - fi -} - -alt_usrlibdir() { - if is_crosscompile ; then - echo /usr/${CTARGET}/$(get_libdir) - else - echo /usr/$(get_libdir) - fi -} - -setup_flags() { - # Make sure host make.conf doesn't pollute us - if is_crosscompile || tc-is-cross-compiler ; then - CHOST=${CTARGET} strip-unsupported-flags - fi - - # Store our CFLAGS because it's changed depending on which CTARGET - # we are building when pulling glibc on a multilib profile - CFLAGS_BASE=${CFLAGS_BASE-${CFLAGS}} - CFLAGS=${CFLAGS_BASE} - ASFLAGS_BASE=${ASFLAGS_BASE-${ASFLAGS}} - ASFLAGS=${ASFLAGS_BASE} - - # Over-zealous CFLAGS can often cause problems. What may work for one - # person may not work for another. To avoid a large influx of bugs - # relating to failed builds, we strip most CFLAGS out to ensure as few - # problems as possible. - strip-flags - strip-unsupported-flags - filter-flags -m32 -m64 -mabi=* - - unset CBUILD_OPT CTARGET_OPT - if has_multilib_profile ; then - CTARGET_OPT=$(get_abi_CTARGET) - [[ -z ${CTARGET_OPT} ]] && CTARGET_OPT=$(get_abi_CHOST) - fi - - case $(tc-arch) in - amd64) - # Punt this when amd64's 2004.3 is removed - CFLAGS_x86="-m32" - ;; - ppc) - append-flags "-freorder-blocks" - ;; - sparc) - # Both sparc and sparc64 can use -fcall-used-g6. -g7 is bad, though. - filter-flags "-fcall-used-g7" - append-flags "-fcall-used-g6" - filter-flags "-mvis" - - if is_crosscompile || [[ ${PROFILE_ARCH} == "sparc64" ]] || { has_multilib_profile && ! tc-is-cross-compiler; } ; then - case ${ABI} in - sparc64) - filter-flags -Wa,-xarch -Wa,-A - - if is-flag "-mcpu=ultrasparc3"; then - CTARGET_OPT="sparc64b-unknown-linux-gnu" - append-flags "-Wa,-xarch=v9b" - export ASFLAGS="${ASFLAGS} -Wa,-xarch=v9b" - else - CTARGET_OPT="sparc64-unknown-linux-gnu" - append-flags "-Wa,-xarch=v9a" - export ASFLAGS="${ASFLAGS} -Wa,-xarch=v9a" - fi - ;; - *) - if is-flag "-mcpu=ultrasparc3"; then - CTARGET_OPT="sparcv9b-unknown-linux-gnu" - else - CTARGET_OPT="sparcv9-unknown-linux-gnu" - fi - ;; - esac - else - if is-flag "-mcpu=ultrasparc3"; then - CTARGET_OPT="sparcv9b-unknown-linux-gnu" - elif { is_crosscompile && want_nptl; } || is-flag "-mcpu=ultrasparc2" || is-flag "-mcpu=ultrasparc"; then - CTARGET_OPT="sparcv9-unknown-linux-gnu" - fi - fi - ;; - esac - - if [[ -n ${CTARGET_OPT} && ${CBUILD} == ${CHOST} ]] && ! is_crosscompile; then - CBUILD_OPT=${CTARGET_OPT} - fi - - if $(tc-getCC ${CTARGET}) -v 2>&1 | grep -q 'gcc version 3.[0123]'; then - append-flags -finline-limit=2000 - fi - - # We don't want these flags for glibc - filter-ldflags -pie - - # Lock glibc at -O2 -- linuxthreads needs it and we want to be - # conservative here - filter-flags -O? - append-flags -O2 -} - -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 -} - -check_nptl_support() { - local min_kernel_version="$(KV_to_int "${NPTL_KERNEL_VERSION}")" - - echo - - einfon "Checking gcc for __thread support ... " - if want__thread ; then - echo "yes" - else - echo "no" - echo - eerror "Could not find a gcc that supports the __thread directive!" - eerror "please update to gcc-3.2.2-r1 or later, and try again." - die "No __thread support in gcc!" - fi - - # Building fails on an non-supporting kernel - einfon "Checking kernel version (>=${NPTL_KERNEL_VERSION}) ... " - if [ "`get_KV`" -lt "${min_kernel_version}" ] ; then - echo "no" - echo - eerror "You need a kernel of at least version ${NPTL_KERNEL_VERSION}" - eerror "for NPTL support!" - die "Kernel version too low!" - else - echo "yes" - fi - - # Building fails with too low linux-headers - einfon "Checking linux-headers version (>=${NPTL_KERNEL_VERSION}) ... " - if ! check_kheader_version "${min_kernel_version}"; then - echo "no" - echo - eerror "You need linux-headers of at least version ${NPTL_KERNEL_VERSION}" - eerror "for NPTL support!" - die "linux-headers version too low!" - else - echo "yes" - fi - - echo -} - -want_nptl() { - want_tls || return 1 - use nptl || return 1 - - # Archs that can use NPTL - case $(tc-arch) in - alpha|amd64|ia64|mips|ppc|ppc64|s390|sh|x86) - return 0; - ;; - sparc) - # >= v9 is needed for nptl. - [[ "${PROFILE_ARCH}" == "sparc" ]] && return 1 - return 0; - ;; - esac - - return 1 -} - -want_linuxthreads() { - ! use nptlonly && return 0 - want_nptl || return 0 - return 1 -} - -want_tls() { - # Archs that can use TLS (Thread Local Storage) - case $(tc-arch) in - alpha|amd64|ia64|mips|ppc|ppc64|s390|sh) - return 0; - ;; - sparc) - # 2.3.6 should have tls support on sparc64 - # when using newer binutils - case ${CTARGET/-*} in - sparc64*) return 1 ;; - *) return 0 ;; - esac - ;; - x86) - # requires i486 or better #106556 - [[ ${CTARGET} == i[4567]86* ]] && return 0 - ;; - esac - - return 1 -} - -want__thread() { - want_tls || return 1 - - # For some reason --with-tls --with__thread is causing segfaults on sparc32. - [[ ${PROFILE_ARCH} == "sparc" ]] && return 1 - - [[ -n ${WANT__THREAD} ]] && return ${WANT__THREAD} - - $(tc-getCC ${CTARGET}) -c ${FILESDIR}/test-__thread.c -o ${T}/test2.o &> /dev/null - WANT__THREAD=$? - - return ${WANT__THREAD} -} - -install_locales() { - unset LANGUAGE LANG LC_ALL - cd "${WORKDIR}"/${MYMAINBUILDDIR} || die "${WORKDIR}/${MYMAINBUILDDIR}" - make PARALLELMFLAGS="${MAKEOPTS} -j1" \ - install_root=${D} localedata/install-locales || die -} - -setup_locales() { - if use !userlocales ; then - einfo "userlocales not enabled, installing -ALL- locales..." - install_locales || die - elif [ -e /etc/locales.build ] ; then - einfo "Installing locales in /etc/locales.build..." - echo 'SUPPORTED-LOCALES=\' > SUPPORTED.locales - cat /etc/locales.build | grep -v -e ^$ -e ^\# | sed 's/$/\ \\/g' \ - >> SUPPORTED.locales - cat SUPPORTED.locales > ${S}/localedata/SUPPORTED || die - install_locales || die - elif [ -e ${FILESDIR}/locales.build ] ; then - einfo "Installing locales in ${FILESDIR}/locales.build..." - echo 'SUPPORTED-LOCALES=\' > SUPPORTED.locales - cat ${FILESDIR}/locales.build | grep -v -e ^$ -e ^\# | sed 's/$/\ \\/g' \ - >> SUPPORTED.locales - cat SUPPORTED.locales > ${S}/localedata/SUPPORTED || die - install_locales || die - else - einfo "Installing -ALL- locales..." - install_locales || die - fi -} - -glibc_do_configure() { - local myconf - - # These should not be set, else the - # zoneinfo do not always get installed ... - unset LANGUAGE LANG LC_ALL - # silly users - unset LD_RUN_PATH - - # set addons - pushd ${S} > /dev/null - ADDONS=$(echo */configure | sed -e 's!/configure!!g;s!\(linuxthreads\|nptl\|rtkaio\|glibc-compat\)\( \|$\)!!g;s! \+$!!;s! !,!g;s!^!,!;/^,\*$/d') - use glibc-compat20 && [[ -d glibc-compat ]] && ADDONS="${ADDONS},glibc-compat" - popd > /dev/null - - use nls || myconf="${myconf} --disable-nls" - use erandom || myconf="${myconf} --disable-dev-erandom" - - use glibc-omitfp && myconf="${myconf} --enable-omitfp" - - [[ ${CTARGET} == *-softfloat-* ]] && myconf="${myconf} --without-fp" - - if [ "$1" == "linuxthreads" ] ; then - if want_tls && [[ ${CTARGET} != i[45]86-* ]] ; then - myconf="${myconf} --with-tls" - - if want__thread && use linuxthreads-tls ; then - myconf="${myconf} --with-__thread" - else - myconf="${myconf} --without-__thread" - fi - else - myconf="${myconf} --without-tls --without-__thread" - fi - - myconf="${myconf} --enable-add-ons=linuxthreads${ADDONS}" - myconf="${myconf} --enable-kernel=${LT_KERNEL_VERSION}" - elif [ "$1" == "nptl" ] ; then - myconf="${myconf} --with-tls --with-__thread" - myconf="${myconf} --enable-add-ons=nptl${ADDONS}" - myconf="${myconf} --enable-kernel=${NPTL_KERNEL_VERSION}" - else - die "invalid pthread option" - fi - - # Since SELinux support is only required for nscd, only enable it if: - # 1. USE selinux - # 2. ! USE build - # 3. only for the primary ABI on multilib systems - if use selinux && ! use build; then - if use multilib || has_multilib_profile; then - if is_final_abi; then - myconf="${myconf} --with-selinux" - else - myconf="${myconf} --without-selinux" - fi - else - myconf="${myconf} --with-selinux" - fi - else - myconf="${myconf} --without-selinux" - fi - - # Pick out the correct location for build headers - myconf="${myconf} - --without-cvs - --enable-bind-now - --build=${CBUILD_OPT:-${CBUILD}} - --host=${CTARGET_OPT:-${CTARGET}} - $(use_enable profile) - --without-gd - --with-headers=$(alt_build_headers) - --prefix=$(alt_prefix) - --mandir=$(alt_prefix)/share/man - --infodir=$(alt_prefix)/share/info - --libexecdir=$(alt_prefix)/lib/misc/glibc - ${EXTRA_ECONF}" - - has_version app-admin/eselect-compiler || export CC="$(tc-getCC ${CTARGET})" - - GBUILDDIR=${WORKDIR}/build-${ABI}-${CTARGET}-$1 - mkdir -p ${GBUILDDIR} - cd ${GBUILDDIR} - einfo "Configuring GLIBC for $1 with: ${myconf// /\n\t\t}" - ${S}/configure ${myconf} || die "failed to configure glibc" -} - -fix_lib64_symlinks() { - # the original Gentoo/AMD64 devs decided that since 64bit is the native - # bitdepth for AMD64, lib should be used for 64bit libraries. however, - # this ignores the FHS and breaks multilib horribly... especially - # since it wont even work without a lib64 symlink anyways. *rolls eyes* - # see bug 59710 for more information. - # Travis Tilley (08 Aug 2004) - if [ -L ${ROOT}/lib64 ] ; then - ewarn "removing /lib64 symlink and moving lib to lib64..." - ewarn "dont hit ctrl-c until this is done" - addwrite ${ROOT}/ - rm ${ROOT}/lib64 - # now that lib64 is gone, nothing will run without calling ld.so - # directly. luckily the window of brokenness is almost non-existant - use amd64 && /lib/ld-linux-x86-64.so.2 /bin/mv ${ROOT}/lib ${ROOT}/lib64 - use ppc64 && /lib/ld64.so.1 /bin/mv ${ROOT}/lib ${ROOT}/lib64 - # all better :) - ldconfig - ln -s lib64 ${ROOT}/lib - einfo "done! :-)" - einfo "fixed broken lib64/lib symlink in ${ROOT}" - fi - if [ -L ${ROOT}/usr/lib64 ] ; then - addwrite ${ROOT}/usr - rm ${ROOT}/usr/lib64 - mv ${ROOT}/usr/lib ${ROOT}/usr/lib64 - ln -s lib64 ${ROOT}/usr/lib - einfo "fixed broken lib64/lib symlink in ${ROOT}/usr" - fi - if [ -L ${ROOT}/usr/X11R6/lib64 ] ; then - addwrite ${ROOT}/usr/X11R6 - rm ${ROOT}/usr/X11R6/lib64 - mv ${ROOT}/usr/X11R6/lib ${ROOT}/usr/X11R6/lib64 - ln -s lib64 ${ROOT}/usr/X11R6/lib - einfo "fixed broken lib64/lib symlink in ${ROOT}/usr/X11R6" - fi -} - -use_multilib() { - case ${CTARGET} in - sparc64*|mips64*|x86_64*|powerpc64*|s390x*) - has_multilib_profile || use multilib ;; - *) false ;; - esac -} - -# Setup toolchain variables that would be defined in the profiles for these archs. -setup_env() { - if is_crosscompile || tc-is-cross-compiler ; then - multilib_env ${CTARGET} - if ! use multilib ; then - MULTILIB_ABIS=${DEFAULT_ABI} - else - case ${CTARGET} in - mips64*) MULTILIB_ABIS=${MULTILIB_ABIS/o32} ;; - *) MULTILIB_ABIS=${MULTILIB_ABIS:-${DEFAULT_ABI}} ;; - esac - fi - - # If the user has CFLAGS_ in their make.conf, use that, - # and fall back on CFLAGS. - local VAR=CFLAGS_${CTARGET//[-.]/_} - CFLAGS=${!VAR-${CFLAGS}} - fi - - setup_flags - - export ABI=${ABI:-${DEFAULT_ABI:-default}} - - if is_crosscompile || tc-is-cross-compiler ; then - local VAR=CFLAGS_${ABI} - # We need to export CFLAGS with abi information in them because - # glibc's configure script checks CFLAGS for some targets (like mips) - export CFLAGS="${!VAR} ${CFLAGS}" - fi -} - -### /ECLASS PUNTAGE ### - -if is_crosscompile ; then - SLOT="${CTARGET}-2.2" -else - SLOT="2.2" -fi - -# we'll handle stripping ourself #46186 -RESTRICT="nostrip multilib-pkg-force" - -# We need new cleanup attribute support from gcc for NPTL among things ... -# We also need linux26-headers if using NPTL. Including kernel headers is -# incredibly unreliable, and this new linux-headers release from plasmaroo -# should work with userspace apps, at least on amd64 and ppc64. -# -# We need a new-enough binutils for as-needed -DEPEND=">=sys-devel/gcc-3.4 - nptl? ( >=sys-kernel/linux-headers-${NPTL_KERNEL_VERSION} ) - >=sys-devel/binutils-2.15.94 - || ( app-admin/eselect-compiler >=sys-devel/gcc-config-1.3.12 ) - virtual/os-headers - nls? ( sys-devel/gettext ) - selinux? ( !build? ( sys-libs/libselinux ) )" -RDEPEND="nls? ( sys-devel/gettext ) - selinux? ( !build? ( sys-libs/libselinux ) )" - -if [[ ${CATEGORY/cross-} != ${CATEGORY} ]] ; then - DEPEND="${DEPEND} ${CATEGORY}/gcc" - - if [[ ${CATEGORY} == *-linux* ]] ; then - if [[ ${CATEGORY/mips} != ${CATEGORY} ]] ; then - DEPEND="${DEPEND} >=${CATEGORY}/mips-headers-2.6.10" - else - DEPEND="${DEPEND} ${CATEGORY}/linux-headers" - fi - fi -else - DEPEND="${DEPEND} sys-libs/timezone-data" - RDEPEND="${RDEPEND} sys-libs/timezone-data" -fi - -pkg_setup() { - if has_version '>=sys-libs/glibc-2.3.5.20050201' && \ - has_version ' ${T}/gcc_eh_test.c - if ! $(tc-getCC ${CTARGET}) ${T}/gcc_eh_test.c -lgcc_eh 2>/dev/null ; then - sed -i -e 's:-lgcc_eh::' Makeconfig || die "sed gcc_eh" - fi - - # Some configure checks fail on the first emerge through because they - # try to link. This doesn't work well if we don't have a libc yet. - # http://sourceware.org/ml/libc-alpha/2005-02/msg00042.html - if is_crosscompile && use build; then - rm ${S}/sysdeps/sparc/sparc64/elf/configure{,.in} - rm ${S}/nptl/sysdeps/pthread/configure{,.in} - fi - - cd "${WORKDIR}" - find . -type f '(' -size 0 -o -name "*.orig" ')' -exec rm -f {} \; - find . -name configure -exec touch {} \; - - # Fix permissions on some of the scripts - chmod u+x "${S}"/scripts/*.sh -} - -src_compile() { - setup_env - - if [[ -z ${OABI} ]] ; then - local abilist="" - if has_multilib_profile ; then - abilist=$(get_install_abis) - einfo "Building multilib glibc for ABIs: ${abilist}" - elif is_crosscompile || tc-is-cross-compiler ; then - abilist=${DEFAULT_ABI} - fi - if [[ -n ${abilist} ]] ; then - OABI=${ABI} - for ABI in ${abilist} ; do - export ABI - src_compile - done - ABI=${OABI} - unset OABI - return 0 - fi - fi - - toolchain-glibc_src_compile -} - -src_test() { - setup_env - - if [[ -z ${OABI} ]] && has_multilib_profile ; then - OABI=${ABI} - einfo "Testing multilib glibc for ABIs: $(get_install_abis)" - for ABI in $(get_install_abis) ; do - export ABI - einfo " Testing ${ABI} glibc" - src_test - done - ABI=${OABI} - unset OABI - return 0 - fi - - toolchain-glibc_src_test -} - -src_strip() { - # Now, strip everything but the thread libs #46186, as well as the dynamic - # linker, else we cannot set breakpoints in shared libraries due to bugs in - # gdb. Also want to grab stuff in tls subdir. whee. -#when new portage supports this ... -# env \ -# -uRESTRICT \ -# CHOST=${CTARGET} \ -# STRIP_MASK="/*/{,tls/}{ld-,lib{pthread,thread_db}}*" \ -# prepallstrip - pushd "${D}" > /dev/null - - if ! is_crosscompile ; then - mkdir -p "${T}"/strip-backup - for x in $(find "${D}" -maxdepth 3 \ - '(' -name 'ld-*' -o -name 'libpthread*' -o -name 'libthread_db*' ')' \ - -a '(' '!' -name '*.a' ')' -type f -printf '%P ') - do - mkdir -p "${T}/strip-backup/${x%/*}" - cp -a -- "${D}/${x}" "${T}/strip-backup/${x}" || die "backing up ${x}" - done - fi - env -uRESTRICT CHOST=${CTARGET} prepallstrip - if ! is_crosscompile ; then - cp -a -- "${T}"/strip-backup/* "${D}"/ || die "restoring non-stripped libs" - fi - - popd > /dev/null -} - -src_install() { - setup_env - - if [[ -z ${OABI} ]] ; then - local abilist="" - if has_multilib_profile ; then - abilist=$(get_install_abis) - einfo "Installing multilib glibc for ABIs: ${abilist}" - elif is_crosscompile || tc-is-cross-compiler ; then - abilist=${DEFAULT_ABI} - fi - if [[ -n ${abilist} ]] ; then - OABI=${ABI} - for ABI in ${abilist} ; do - export ABI - src_install - done - ABI=${OABI} - unset OABI - src_strip - return 0 - fi - fi - - # Handle stupid lib32 BS - unset OLD_LIBDIR - if ! is_crosscompile ; then - if [[ $(tc-arch) == "amd64" && ${ABI} == "x86" && $(get_libdir) != "lib" ]] ; then - OLD_LIBDIR=$(get_libdir) - LIBDIR_x86="lib" - fi - - if [[ $(tc-arch) == "ppc64" && ${ABI} == "ppc" && $(get_libdir) != "lib" ]] ; then - OLD_LIBDIR=$(get_libdir) - LIBDIR_ppc="lib" - fi - fi - - toolchain-glibc_src_install - [[ -z ${OABI} ]] && src_strip - - # Handle stupid lib32 BS on amd64 and ppc64 - if [[ -n ${OLD_LIBDIR} ]] ; then - cd "${S}" - [[ $(tc-arch) == "amd64" ]] && LIBDIR_x86=${OLD_LIBDIR} - [[ $(tc-arch) == "ppc64" ]] && LIBDIR_ppc=${OLD_LIBDIR} - unset OLD_LIBDIR - - mv "${D}"/lib "${D}"/$(get_libdir) - mv "${D}"/usr/lib "${D}"/usr/$(get_libdir) - dodir /lib - dodir /usr/lib - mv "${D}"/usr/$(get_libdir)/locale "${D}"/usr/lib - [[ $(tc-arch) == "amd64" ]] && dosym ../$(get_libdir)/ld-linux.so.2 /lib/ld-linux.so.2 - [[ $(tc-arch) == "ppc64" ]] && dosym ../$(get_libdir)/ld.so.1 /lib/ld.so.1 - - for f in "${D}"/usr/$(get_libdir)/*.so; do - local basef=$(basename "${f}") - if [[ -L ${f} ]] ; then - local target=$(readlink "${f}") - target=${target/\/lib\//\/$(get_libdir)\/} - rm "${f}" - dosym "${target}" /usr/$(get_libdir)/"${basef}" - fi - done - - dosed "s:/lib/:/$(get_libdir)/:g" /usr/$(get_libdir)/lib{c,pthread}.so - - if want_nptl && want_linuxthreads ; then - dosed "s:/lib/:/$(get_libdir)/:g" /usr/$(get_libdir)/nptl/lib{c,pthread}.so - fi - fi -} - -pkg_preinst() { - toolchain-glibc_pkg_preinst -} - -pkg_postinst() { - toolchain-glibc_pkg_postinst -} diff --git a/sys-libs/glibc/glibc-2.4-r1.ebuild b/sys-libs/glibc/glibc-2.4-r1.ebuild deleted file mode 100644 index 261bb2eb6566..000000000000 --- a/sys-libs/glibc/glibc-2.4-r1.ebuild +++ /dev/null @@ -1,1387 +0,0 @@ -# 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.4-r1.ebuild,v 1.8 2006/05/30 19:45:22 eradicator Exp $ - -# TODO: -# - fix warning from glibc build system: -# /var/tmp/portage/glibc-2.3.6-r2/work/build-x86-x86_64-pc-linux-gnu-nptl/elf/ldconfig: Can't open configuration file /etc/ld.so.conf: No such file or directory -# - fix warning from ebuild (amd64 multilib): -# mv: cannot stat `/var/tmp/portage/glibc-2.3.6-r2/image//usr/lib32/locale': No such file or directory -# - glibc installs a bunch of lib64 stuff into /usr/lib: -# qlist glibc | grep ^/usr/lib/ | grep -v /debug/ - -# Here's how the cross-compile logic breaks down ... -# CTARGET - machine that will target the binaries -# CHOST - machine that will host the binaries -# CBUILD - machine that will build the binaries -# If CTARGET != CHOST, it means you want a libc for cross-compiling. -# If CHOST != CBUILD, it means you want to cross-compile the libc. -# CBUILD = CHOST = CTARGET - native build/install -# CBUILD != (CHOST = CTARGET) - cross-compile a native build -# (CBUILD = CHOST) != CTARGET - libc for cross-compiler -# CBUILD != CHOST != CTARGET - cross-compile a libc for a cross-compiler -# For install paths: -# CHOST = CTARGET - install into / -# CHOST != CTARGET - install into /usr/CTARGET/ - -KEYWORDS="-* ~amd64 ~ia64 ~x86" - -BRANCH_UPDATE="" - -# Generated man pages -GLIBC_MANPAGE_VERSION="none" - -# Generated stuff in manual subdir -GLIBC_INFOPAGE_VERSION="none" - -# Gentoo patchset -PATCH_VER="1.3" - -# Fedora addons (like c_stubs) -# sniped from RHEL's glibc-2.4-4.src.rpm -FEDORA_VER="20060306T1239" -FEDORA_TARBALL="glibc-fedora-${FEDORA_VER}.tar.bz2" -FEDORA_URI="mirror://gentoo/${FEDORA_TARBALL}" - -GENTOO_TOOLCHAIN_BASE_URI="mirror://gentoo" -GENTOO_TOOLCHAIN_DEV_URI="http://dev.gentoo.org/~azarah/glibc" - -### PUNT OUT TO ECLASS?? ### -inherit eutils versionator libtool toolchain-funcs flag-o-matic gnuconfig multilib - -DESCRIPTION="GNU libc6 (also called glibc2) C library" -HOMEPAGE="http://www.gnu.org/software/libc/libc.html" -LICENSE="LGPL-2" - -IUSE="nls pic build nptl nptlonly hardened userlocales multilib selinux glibc-omitfp profile" - -export CBUILD=${CBUILD:-${CHOST}} -export CTARGET=${CTARGET:-${CHOST}} -if [[ ${CTARGET} == ${CHOST} ]] ; then - if [[ ${CATEGORY/cross-} != ${CATEGORY} ]] ; then - export CTARGET=${CATEGORY/cross-} - fi -fi -if [[ ${CTARGET} == ${CHOST} ]] ; then - PROVIDE="virtual/libc" -fi - -is_crosscompile() { - [[ ${CHOST} != ${CTARGET} ]] -} -just_headers() { - is_crosscompile && has _E_CROSS_HEADERS_ONLY ${USE} -} - -GLIBC_RELEASE_VER=$(get_version_component_range 1-3) - -# Don't set this to :-, - allows BRANCH_UPDATE="" -BRANCH_UPDATE=${BRANCH_UPDATE-$(get_version_component_range 4)} - -# (Recent snapshots fails with 2.6.5 and earlier with NPTL) -NPTL_KERNEL_VERSION=${NPTL_KERNEL_VERSION:-"2.6.9"} -LT_KERNEL_VERSION=${LT_KERNEL_VERSION:-"2.4.1"} - -### SRC_URI ### - -# This function handles the basics of setting the SRC_URI for a glibc ebuild. -# To use, set SRC_URI with: -# -# SRC_URI="$(get_glibc_src_uri)" -# -# Other than the variables normally set by portage, this function's behavior -# can be altered by setting the following: -# -# GENTOO_TOOLCHAIN_BASE_URI -# This sets the base URI for all gentoo-specific patch files. Note -# that this variable is only important for a brief period of time, -# before your source files get picked up by mirrors. However, it is -# still highly suggested that you keep files in this location -# available. -# -# BRANCH_UPDATE -# If set, this variable signals that we should be using the main -# release tarball (determined by ebuild version) and applying a -# CVS branch update patch against it. The location of this branch -# update patch is assumed to be in ${GENTOO_TOOLCHAIN_BASE_URI}. -# Just like with SNAPSHOT, this variable is ignored if the ebuild -# has a _pre suffix. -# -# PATCH_VER -# PATCH_GLIBC_VER -# This should be set to the version of the gentoo patch tarball. -# The resulting filename of this tarball will be: -# glibc-${PATCH_GLIBC_VER:-${GLIBC_RELEASE_VER}}-patches-${PATCH_VER}.tar.bz2 -# -# GLIBC_MANPAGE_VERSION -# GLIBC_INFOPAGE_VERSION -# The version of glibc for which we will download pages. This will -# default to ${GLIBC_RELEASE_VER}, but we may not want to pre-generate man pages -# for prerelease test ebuilds for example. This allows you to -# continue using pre-generated manpages from the last stable release. -# If set to "none", this will prevent the downloading of manpages, -# which is useful for individual library targets. -# -get_glibc_src_uri() { - GENTOO_TOOLCHAIN_BASE_URI=${GENTOO_TOOLCHAIN_BASE_URI:-"mirror://gentoo"} - -# GLIBC_SRC_URI="http://ftp.gnu.org/gnu/glibc/glibc-${GLIBC_RELEASE_VER}.tar.bz2 -# http://ftp.gnu.org/gnu/glibc/glibc-linuxthreads-${GLIBC_RELEASE_VER}.tar.bz2 -# http://ftp.gnu.org/gnu/glibc/glibc-libidn-${GLIBC_RELEASE_VER}.tar.bz2 - GLIBC_SRC_URI="mirror://gnu/glibc/glibc-${GLIBC_RELEASE_VER}.tar.bz2 - mirror://gnu/glibc/glibc-ports-${GLIBC_RELEASE_VER}.tar.bz2 - mirror://gnu/glibc/glibc-libidn-${GLIBC_RELEASE_VER}.tar.bz2" - - if [[ -n ${BRANCH_UPDATE} ]] ; then - GLIBC_SRC_URI="${GLIBC_SRC_URI} - ${GENTOO_TOOLCHAIN_BASE_URI}/glibc-${GLIBC_RELEASE_VER}-branch-update-${BRANCH_UPDATE}.patch.bz2" - [[ -n ${GENTOO_TOOLCHAIN_DEV_URI} ]] && - GLIBC_SRC_URI="${GLIBC_SRC_URI} - ${GENTOO_TOOLCHAIN_DEV_URI}/glibc-${GLIBC_RELEASE_VER}-branch-update-${BRANCH_UPDATE}.patch.bz2" - fi - - if [[ -n ${PATCH_VER} ]] ; then - GLIBC_SRC_URI="${GLIBC_SRC_URI} - ${GENTOO_TOOLCHAIN_BASE_URI}/glibc-${PATCH_GLIBC_VER:-${GLIBC_RELEASE_VER}}-patches-${PATCH_VER}.tar.bz2" - [[ -n ${GENTOO_TOOLCHAIN_DEV_URI} ]] && - GLIBC_SRC_URI="${GLIBC_SRC_URI} - ${GENTOO_TOOLCHAIN_DEV_URI}/glibc-${PATCH_GLIBC_VER:-${GLIBC_RELEASE_VER}}-patches-${PATCH_VER}.tar.bz2" - fi - - if [[ ${GLIBC_MANPAGE_VERSION} != "none" ]] ; then - GLIBC_SRC_URI="${GLIBC_SRC_URI} - ${GENTOO_TOOLCHAIN_BASE_URI}/glibc-manpages-${GLIBC_MANPAGE_VERSION:-${GLIBC_RELEASE_VER}}.tar.bz2" - [[ -n ${GENTOO_TOOLCHAIN_DEV_URI} ]] && - GLIBC_SRC_URI="${GLIBC_SRC_URI} - ${GENTOO_TOOLCHAIN_DEV_URI}/glibc-manpages-${GLIBC_MANPAGE_VERSION:-${GLIBC_RELEASE_VER}}.tar.bz2" - fi - - if [[ ${GLIBC_INFOPAGE_VERSION} != "none" ]] ; then - GLIBC_SRC_URI="${GLIBC_SRC_URI} - ${GENTOO_TOOLCHAIN_BASE_URI}/glibc-infopages-${GLIBC_INFOPAGE_VERSION:-${GLIBC_RELEASE_VER}}.tar.bz2" - [[ -n ${GENTOO_TOOLCHAIN_DEV_URI} ]] && - GLIBC_SRC_URI="${GLIBC_SRC_URI} - ${GENTOO_TOOLCHAIN_DEV_URI}/glibc-infopages-${GLIBC_INFOPAGE_VERSION:-${GLIBC_RELEASE_VER}}.tar.bz2" - fi - - if [[ -n ${FEDORA_URI} ]] ; then - GLIBC_SRC_URI="${GLIBC_SRC_URI} ${FEDORA_URI}" - fi - - echo "${GLIBC_SRC_URI}" -} - -SRC_URI=$(get_glibc_src_uri) -S=${WORKDIR}/glibc-${GLIBC_RELEASE_VER} - -### EXPORTED FUNCTIONS ### -toolchain-glibc_src_unpack() { - # Check NPTL support _before_ we unpack things to save some time - want_nptl && check_nptl_support - - unpack glibc-${GLIBC_RELEASE_VER}.tar.bz2 - - cd "${S}" - #unpack glibc-linuxthreads-${GLIBC_RELEASE_VER}.tar.bz2 - unpack glibc-libidn-${GLIBC_RELEASE_VER}.tar.bz2 && mv glibc-libidn-${GLIBC_RELEASE_VER} libidn - unpack glibc-ports-${GLIBC_RELEASE_VER}.tar.bz2 && mv glibc-ports-${GLIBC_RELEASE_VER} ports - - if [[ -n ${FEDORA_TARBALL} ]] ; then - # only pull out the stuff we actually want - mkdir "${WORKDIR}"/fedora - cd "${WORKDIR}"/fedora || die - unpack ${FEDORA_TARBALL} - mv c_stubs "${S}"/ || die - cd "${S}" - rm -r "${WORKDIR}"/fedora - fi - - if [[ -n ${PATCH_VER} ]] ; then - cd "${WORKDIR}" - unpack glibc-${PATCH_GLIBC_VER:-${GLIBC_RELEASE_VER}}-patches-${PATCH_VER}.tar.bz2 - fi - - # XXX: We should do the branchupdate, before extracting the manpages and - # infopages else it does not help much (mtimes change if there is a change - # to them with branchupdate) - if [[ -n ${BRANCH_UPDATE} ]] ; then - cd "${S}" - epatch "${DISTDIR}"/glibc-${GLIBC_RELEASE_VER}-branch-update-${BRANCH_UPDATE}.patch.bz2 - - # Snapshot date patch - einfo "Patching version to display snapshot date ..." - sed -i -e "s:\(#define RELEASE\).*:\1 \"${BRANCH_UPDATE}\":" version.h - fi - - if [[ ${GLIBC_MANPAGE_VERSION} != "none" ]] ; then - cd "${WORKDIR}" - unpack glibc-manpages-${GLIBC_MANPAGE_VERSION:-${GLIBC_RELEASE_VER}}.tar.bz2 - fi - - if [[ ${GLIBC_INFOPAGE_VERSION} != "none" ]] ; then - cd "${S}" - unpack glibc-infopages-${GLIBC_INFOPAGE_VERSION:-${GLIBC_RELEASE_VER}}.tar.bz2 - fi - - if [[ -n ${PATCH_VER} ]] ; then - cd "${S}" - EPATCH_MULTI_MSG="Applying Gentoo Glibc Patchset ${PATCH_GLIBC_VER:-${GLIBC_RELEASE_VER}}-${PATCH_VER} ..." \ - EPATCH_EXCLUDE=${GLIBC_PATCH_EXCLUDE} \ - EPATCH_SUFFIX="patch" \ - ARCH=$(tc-arch) \ - epatch "${WORKDIR}"/patches - fi - - gnuconfig_update -} - -toolchain-glibc_src_compile() { - # Set gconvdir to /usr/$(get_libdir)/gconv on archs with multiple ABIs - local MAKEFLAGS="" - has_multilib_profile && MAKEFLAGS="gconvdir=$(alt_usrlibdir)/gconv" - - echo - for v in ABI CBUILD CHOST CTARGET CBUILD_OPT CTARGET_OPT CC CFLAGS ; do - einfo " $(printf '%15s' ${v}:) ${!v}" - done - echo - - if want_linuxthreads ; then - glibc_do_configure linuxthreads - einfo "Building GLIBC with linuxthreads..." - make PARALLELMFLAGS="${MAKEOPTS}" ${MAKEFLAGS} || die "make for ${ABI} failed" - fi - if want_nptl ; then - # ... and then do the optional nptl build - unset LD_ASSUME_KERNEL - glibc_do_configure nptl - einfo "Building GLIBC with NPTL..." - make PARALLELMFLAGS="${MAKEOPTS}" ${MAKEFLAGS} || die "make for ${ABI} failed" - fi -} - -toolchain-glibc_headers_compile() { - GBUILDDIR=${WORKDIR}/build-${ABI}-${CTARGET}-headers - mkdir -p "${GBUILDDIR}" - cd "${GBUILDDIR}" - - # Pick out the correct location for build headers - local myconf="--disable-sanity-checks --enable-hacker-mode" - myconf="${myconf} - --enable-add-ons=nptl,ports - --without-cvs - --enable-bind-now - --build=${CBUILD_OPT:-${CBUILD}} - --host=${CTARGET_OPT:-${CTARGET}} - --with-headers=$(alt_build_headers) - --prefix=$(alt_prefix) - --mandir=$(alt_prefix)/share/man - --infodir=$(alt_prefix)/share/info - --libexecdir=$(alt_prefix)/lib/misc/glibc - ${EXTRA_ECONF}" - - einfo "Configuring GLIBC headers with: ${myconf// /\n\t\t}" - CC=gcc \ - CFLAGS="-O1 -pipe" \ - ${S}/configure ${myconf} || die "failed to configure glibc" -} - -toolchain-glibc_src_test() { - # This is wrong, but glibc's tests fail bad when screwing - # around with sandbox, so lets just punt it - unset LD_PRELOAD - - # do the linuxthreads build unless we're using nptlonly - if want_linuxthreads ; then - cd "${WORKDIR}"/build-${ABI}-${CTARGET}-linuxthreads - einfo "Checking GLIBC with linuxthreads..." - make check || die "linuxthreads glibc did not pass make check" - fi - if want_nptl ; then - cd "${WORKDIR}"/build-${ABI}-${CTARGET}-nptl - unset LD_ASSUME_KERNEL || : - einfo "Checking GLIBC with NPTL..." - make check || die "nptl glibc did not pass make check" - fi -} - -toolchain-glibc_pkg_preinst() { - # PPC64+others may want to eventually be added to this logic if they - # decide to be multilib compatible and FHS compliant. note that this - # chunk of FHS compliance only applies to 64bit archs where 32bit - # compatibility is a major concern (not IA64, for example). - - # amd64's 2005.0 is the first amd64 profile to not need this code. - # 2005.0 is setup properly, and this is executed as part of the - # 2004.3 -> 2005.0 upgrade script. - # 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 ]] && ! { want_nptl && want_linuxthreads; }; then - addwrite "${ROOT}"/$(alt_libdir)/ - ewarn "nptlonly or -nptl in USE, removing /${ROOT}$(alt_libdir)/tls..." - rm -r "${ROOT}"/$(alt_libdir)/tls || die - fi - - # Shouldnt need to keep this updated - [[ -e ${ROOT}/etc/locales.build ]] && rm -f "${D}"/etc/locales.build -} - -toolchain-glibc_src_install() { - # Need to dodir first because it might not exist (bad amd64 profiles) - dodir $(alt_usrlibdir) - - # These should not be set, else the - # zoneinfo do not always get installed ... - unset LANGUAGE LANG LC_ALL - - if want_linuxthreads ; then - cd "${WORKDIR}"/build-${ABI}-${CTARGET}-linuxthreads - einfo "Installing GLIBC ${ABI} with linuxthreads ..." - make PARALLELMFLAGS="${MAKEOPTS} -j1" \ - install_root="${D}" \ - install || die - else # nptlonly - cd "${WORKDIR}"/build-${ABI}-${CTARGET}-nptl - einfo "Installing GLIBC ${ABI} with NPTL ..." - make PARALLELMFLAGS="${MAKEOPTS} -j1" \ - install_root="${D}" \ - install || die - fi - - if is_crosscompile ; then - # punt all the junk not needed by a cross-compiler - rm -rf "${D}"$(alt_prefix)/{bin,etc,$(get_libdir)/{gconv,misc},sbin,share} - else - # zoneinfo stuff is now provided by the timezone-data package - rm -rf "${D}"/usr/share/zoneinfo - rm -f "${D}"/usr/bin/tzselect - rm -f "${D}"/usr/sbin/{zic,zdump} - fi - - if want_linuxthreads && want_nptl ; then - einfo "Installing NPTL to $(alt_libdir)/tls/..." - cd "${WORKDIR}"/build-${ABI}-${CTARGET}-nptl - mkdir -p "${D}"$(alt_libdir)/tls/ - - libcsofile=$(basename "${D}"$(alt_libdir)/libc-*.so) - cp -a libc.so "${D}"$(alt_libdir)/tls/${libcsofile} || die - dosym ${libcsofile} $(alt_libdir)/tls/$(ls libc.so.*) - - libmsofile=$(basename "${D}"$(alt_libdir)/libm-*.so) - pushd math > /dev/null - cp -a libm.so "${D}"$(alt_libdir)/tls/${libmsofile} || die - dosym ${libmsofile} $(alt_libdir)/tls/$(ls libm.so.*) - popd > /dev/null - - librtsofile=$(basename "${D}"$(alt_libdir)/librt-*.so) - pushd rt > /dev/null - cp -a librt.so "${D}"$(alt_libdir)/tls/${librtsofile} || die - dosym ${librtsofile} $(alt_libdir)/tls/$(ls librt.so.*) - popd > /dev/null - - libthreaddbsofile=$(basename "${D}"$(alt_libdir)/libthread_db-*.so) - pushd nptl_db > /dev/null - cp -a libthread_db.so "${D}"$(alt_libdir)/tls/${libthreaddbsofile} || die - dosym ${libthreaddbsofile} $(alt_libdir)/tls/$(ls libthread_db.so.*) - popd > /dev/null - - libpthreadsofile=libpthread-${GLIBC_RELEASE_VER}.so - cp -a nptl/libpthread.so "${D}"$(alt_libdir)/tls/${libpthreadsofile} || die - dosym ${libpthreadsofile} $(alt_libdir)/tls/libpthread.so.0 - - # and now for the static libs - mkdir -p "${D}"$(alt_usrlibdir)/nptl - cp -a libc.a nptl/libpthread.a nptl/libpthread_nonshared.a rt/librt.a \ - "${D}"$(alt_usrlibdir)/nptl - - # linker script crap - for lib in libc libpthread; do - sed -e "s:$(alt_libdir)/${lib}.so:$(alt_libdir)/tls/${lib}.so:g" \ - -e "s:$(alt_usrlibdir)/${lib}_nonshared.a:$(alt_usrlibdir)/nptl/${lib}_nonshared.a:g" \ - "${D}"$(alt_usrlibdir)/${lib}.so \ - > "${D}"$(alt_usrlibdir)/nptl/${lib}.so - - chmod 755 "${D}"$(alt_usrlibdir)/nptl/${lib}.so - done - - dosym ../librt.so $(alt_usrlibdir)/nptl/librt.so - - # last but not least... headers. - mkdir -p "${D}"/nptl "${D}"$(alt_headers)/nptl - make install_root="${D}"/nptl install-headers PARALLELMFLAGS="${MAKEOPTS} -j1" - pushd "${D}"/nptl/$(alt_headers) > /dev/null - for i in $(find . -type f) ; do - if ! [[ -f ${D}$(alt_headers)/$i ]] \ - || ! cmp -s $i ${D}$(alt_headers)/$i; then - mkdir -p ${D}$(alt_headers)/nptl/`dirname $i` - cp -a $i ${D}$(alt_headers)/nptl/$i - fi - done - popd > /dev/null - rm -rf ${D}/nptl - fi - - if use pic && [[ $(tc-arch) != "amd64" ]] ; then - find ${S}/${buildtarget}/ -name "soinit.os" -exec cp {} ${D}$(alt_libdir)/soinit.o \; - find ${S}/${buildtarget}/ -name "sofini.os" -exec cp {} ${D}$(alt_libdir)/sofini.o \; - find ${S}/${buildtarget}/ -name "*_pic.a" -exec cp {} ${D}$(alt_libdir) \; - find ${S}/${buildtarget}/ -name "*.map" -exec cp {} ${D}$(alt_libdir) \; - - for i in ${D}$(alt_libdir)/*.map; do - mv ${i} ${i%.map}_pic.map - done - fi - - # We'll take care of the cache ourselves - rm -f ${D}/etc/ld.so.cache - - # Some things want this, notably ash. - dosym libbsd-compat.a $(alt_usrlibdir)/libbsd.a - - # Handle includes for different ABIs - prep_ml_includes $(alt_headers) - - ################################################################# - # EVERYTHING AFTER THIS POINT IS FOR NATIVE GLIBC INSTALLS ONLY # - # Make sure we install the sys-include symlink so that when - # we build a 2nd stage cross-compiler, gcc finds the target - # system headers correctly. See gcc/doc/gccinstall.info - if is_crosscompile ; then - dosym include $(alt_prefix)/sys-include - dosym . $(alt_prefix)/usr - return 0 - fi - - # Everything past this point just needs to be done once... don't waste time building locale files twice... - is_final_abi || return 0 - - if want_linuxthreads ; then - MYMAINBUILDDIR=build-${ABI}-${CTARGET}-linuxthreads - else - MYMAINBUILDDIR=build-${ABI}-${CTARGET}-nptl - fi - cd "${WORKDIR}"/${MYMAINBUILDDIR} - if ! use build ; then - if ! has noinfo ${FEATURES} && [[ ${GLIBC_INFOPAGE_VERSION} != "none" ]] ; then - einfo "Installing info pages..." - - make PARALLELMFLAGS="${MAKEOPTS} -j1" \ - install_root=${D} \ - info -i - fi - - setup_locales - - if [[ ${GLIBC_MANPAGE_VERSION} != "none" ]] ; then - einfo "Installing man pages..." - - # Install linuxthreads man pages even if nptl is enabled - cd "${WORKDIR}"/man - doman *.3thr - fi - - # Install nscd config file - insinto /etc - doins ${FILESDIR}/nscd.conf - doins "${FILESDIR}"/nsswitch.conf - - doinitd "${FILESDIR}"/nscd - - cd ${S} - dodoc BUGS ChangeLog* CONFORMANCE FAQ INTERFACE NEWS NOTES PROJECTS README* - else - rm -rf ${D}/usr/share - for dir in $(get_all_libdirs); do - rm -rf ${D}/usr/${dir}/gconv &> /dev/null - done - fi - - # Is this next line actually needed or does the makefile get it right? - # It previously has 0755 perms which was killing things. - fperms 4711 $(alt_prefix)/lib/misc/glibc/pt_chown - - # Prevent overwriting of the /etc/localtime symlink. We'll handle the - # creation of the "factory" symlink in pkg_postinst(). - rm -f ${D}/etc/localtime - - insinto /etc - # This is our new config file for building locales - doins ${FILESDIR}/locales.build - # example host.conf with multicast dns disabled by default - doins ${FILESDIR}/2.3.6/host.conf - - # simple test to make sure our new glibc isnt completely broken. - # for now, skip the multilib scenario. also make sure we don't - # test with statically built binaries since they will fail. - [[ ${CBUILD} != ${CHOST} ]] && return 0 - [[ $(get_libdir) != "lib" ]] && return 0 - for x in date env ls true uname ; do - x=$(type -p ${x}) - [[ -z ${x} ]] && continue - striptest=$(file -L ${x} 2>/dev/null) - [[ -z ${striptest} ]] && continue - [[ ${striptest/statically linked} != "${striptest}" ]] && continue - "${D}"/$(get_libdir)/ld-*.so \ - --library-path "${D}"/$(get_libdir) \ - ${x} > /dev/null \ - || die "simple run test (${x}) failed" - done -} - -toolchain-glibc_headers_install() { - GBUILDDIR=${WORKDIR}/build-${ABI}-${CTARGET}-headers - cd "${GBUILDDIR}" - make install_root="${D}" install-headers || die "install-headers failed" - # Copy over headers that are not part of install-headers ... these - # are pretty much taken verbatim from crosstool, see it for more details - insinto $(alt_headers)/bits - doins misc/syscall-list.h bits/stdio_lim.h || die "doins include bits" - insinto $(alt_headers)/gnu - doins "${S}"/include/gnu/stubs.h || die "doins include gnu" - # Make sure we install the sys-include symlink so that when - # we build a 2nd stage cross-compiler, gcc finds the target - # system headers correctly. See gcc/doc/gccinstall.info - dosym include $(alt_prefix)/sys-include - dosym . $(alt_prefix)/usr -} - -toolchain-glibc_pkg_postinst() { - # Mixing nptlonly and -nptlonly glibc can prove dangerous if libpthread - # isn't removed in unmerge which happens sometimes. See bug #87671 - if ! is_crosscompile && want_linuxthreads ; then - for libdir in $(get_all_libdirs) ; do - for f in ${ROOT}/${libdir}/libpthread-2.* ${ROOT}/${libdir}/libpthread-0.6* ; do - if [[ -f ${f} ]] ; then - rm -f ${f} - ldconfig - fi - done - done - fi - - if ! is_crosscompile && [ -x "${ROOT}/usr/sbin/iconvconfig" ] ; then - # Generate fastloading iconv module configuration file. - ${ROOT}/usr/sbin/iconvconfig --prefix=${ROOT} - fi - - if [ ! -e "${ROOT}/lib/ld.so.1" ] && use ppc64 && ! has_multilib_profile ; then - ## SHOULDN'T THIS BE lib64?? - ln -s ld64.so.1 ${ROOT}/lib/ld.so.1 - fi - - # Reload init ... - if ! is_crosscompile && [ "${ROOT}" = "/" ] ; then - /sbin/init U &> /dev/null - fi - - echo - einfo "Gentoo's glibc no longer includes mdns." - einfo "If you want mdns, emerge the sys-auth/nss-mdns package." - echo - - if want_nptl && want_linuxthreads ; then - einfo "The default behavior of glibc on your system is to use NPTL. If" - einfo "you want to use linuxthreads for a particular program, start it" - einfo "by executing 'LD_ASSUME_KERNEL=${LT_KERNEL_VERSION} []'" - echo - fi -} - -### SUPPORT FUNCTIONS ### -# We need to be able to set alternative headers for -# compiling for non-native platform -# Will also become useful for testing kernel-headers without screwing up -# the whole system. -# note: intentionally undocumented. -alt_headers() { - if [[ -z ${ALT_HEADERS} ]] ; then - if is_crosscompile ; then - ALT_HEADERS="/usr/${CTARGET}/include" - else - ALT_HEADERS="/usr/include" - fi - fi - echo "${ALT_HEADERS}" -} -alt_build_headers() { - if [[ -z ${ALT_BUILD_HEADERS} ]] ; then - ALT_BUILD_HEADERS=$(alt_headers) - tc-is-cross-compiler && ALT_BUILD_HEADERS=${ROOT}$(alt_headers) - fi - echo "${ALT_BUILD_HEADERS}" -} - -alt_prefix() { - if is_crosscompile ; then - echo /usr/${CTARGET} - else - echo /usr - fi -} - -alt_libdir() { - if is_crosscompile ; then - echo /usr/${CTARGET}/$(get_libdir) - else - echo /$(get_libdir) - fi -} - -alt_usrlibdir() { - if is_crosscompile ; then - echo /usr/${CTARGET}/$(get_libdir) - else - echo /usr/$(get_libdir) - fi -} - -setup_flags() { - # Make sure host make.conf doesn't pollute us - if is_crosscompile || tc-is-cross-compiler ; then - CHOST=${CTARGET} strip-unsupported-flags - fi - - # Store our CFLAGS because it's changed depending on which CTARGET - # we are building when pulling glibc on a multilib profile - CFLAGS_BASE=${CFLAGS_BASE-${CFLAGS}} - CFLAGS=${CFLAGS_BASE} - ASFLAGS_BASE=${ASFLAGS_BASE-${ASFLAGS}} - ASFLAGS=${ASFLAGS_BASE} - - # Over-zealous CFLAGS can often cause problems. What may work for one - # person may not work for another. To avoid a large influx of bugs - # relating to failed builds, we strip most CFLAGS out to ensure as few - # problems as possible. - strip-flags - strip-unsupported-flags - filter-flags -m32 -m64 -mabi=* - - unset CBUILD_OPT CTARGET_OPT - if has_multilib_profile ; then - CTARGET_OPT=$(get_abi_CTARGET) - [[ -z ${CTARGET_OPT} ]] && CTARGET_OPT=$(get_abi_CHOST) - fi - - case $(tc-arch) in - amd64) - # Punt this when amd64's 2004.3 is removed - CFLAGS_x86="-m32" - ;; - ppc) - append-flags "-freorder-blocks" - ;; - sparc) - # Both sparc and sparc64 can use -fcall-used-g6. -g7 is bad, though. - filter-flags "-fcall-used-g7" - append-flags "-fcall-used-g6" - filter-flags "-mvis" - - if is_crosscompile || [[ ${PROFILE_ARCH} == "sparc64" ]] || { has_multilib_profile && ! tc-is-cross-compiler; } ; then - case ${ABI} in - sparc64) - filter-flags -Wa,-xarch -Wa,-A - - if is-flag "-mcpu=ultrasparc3"; then - CTARGET_OPT="sparc64b-unknown-linux-gnu" - append-flags "-Wa,-xarch=v9b" - export ASFLAGS="${ASFLAGS} -Wa,-xarch=v9b" - else - CTARGET_OPT="sparc64-unknown-linux-gnu" - append-flags "-Wa,-xarch=v9a" - export ASFLAGS="${ASFLAGS} -Wa,-xarch=v9a" - fi - ;; - *) - if is-flag "-mcpu=ultrasparc3"; then - CTARGET_OPT="sparcv9b-unknown-linux-gnu" - else - CTARGET_OPT="sparcv9-unknown-linux-gnu" - fi - ;; - esac - else - if is-flag "-mcpu=ultrasparc3"; then - CTARGET_OPT="sparcv9b-unknown-linux-gnu" - elif { is_crosscompile && want_nptl; } || is-flag "-mcpu=ultrasparc2" || is-flag "-mcpu=ultrasparc"; then - CTARGET_OPT="sparcv9-unknown-linux-gnu" - fi - fi - ;; - esac - - if [[ -n ${CTARGET_OPT} && ${CBUILD} == ${CHOST} ]] && ! is_crosscompile; then - CBUILD_OPT=${CTARGET_OPT} - fi - - if $(tc-getCC ${CTARGET}) -v 2>&1 | grep -q 'gcc version 3.[0123]'; then - append-flags -finline-limit=2000 - fi - - # We dont want these flags for glibc - filter-ldflags -pie - - # We cannot build glibc with Bdirect support - filter-flags -Wl,-Bdirect - filter-ldflags -Bdirect - filter-ldflags -Wl,-Bdirect - - # Same for hashvals ... - filter-flags -Wl,-hashvals - filter-ldflags -hashvals - filter-ldflags -Wl,-hashvals - - # Lock glibc at -O2 -- linuxthreads needs it and we want to be - # conservative here - filter-flags -O? - append-flags -O2 -} - -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 -} - -check_nptl_support() { - local min_kernel_version="$(KV_to_int "${NPTL_KERNEL_VERSION}")" - - echo - - einfon "Checking gcc for __thread support ... " - if want__thread ; then - echo "yes" - else - echo "no" - echo - eerror "Could not find a gcc that supports the __thread directive!" - eerror "please update to gcc-3.2.2-r1 or later, and try again." - die "No __thread support in gcc!" - fi - - # Building fails on an non-supporting kernel - einfon "Checking kernel version (>=${NPTL_KERNEL_VERSION}) ... " - if [ "`get_KV`" -lt "${min_kernel_version}" ] ; then - echo "no" - echo - eerror "You need a kernel of at least version ${NPTL_KERNEL_VERSION}" - eerror "for NPTL support!" - die "Kernel version too low!" - else - echo "yes" - fi - - # Building fails with too low linux-headers - einfon "Checking linux-headers version (>=${NPTL_KERNEL_VERSION}) ... " - if ! check_kheader_version "${min_kernel_version}"; then - echo "no" - echo - eerror "You need linux-headers of at least version ${NPTL_KERNEL_VERSION}" - eerror "for NPTL support!" - die "linux-headers version too low!" - else - echo "yes" - fi - - echo -} - -want_nptl() { - want_tls || return 1 - use nptl || return 1 - - # Only list the arches that cannot do NPTL - case $(tc-arch) in - hppa|m68k) return 1;; - sparc) - # >= v9 is needed for nptl. - [[ "${PROFILE_ARCH}" == "sparc" ]] && return 1 - ;; - esac - - return 0 -} - -want_linuxthreads() { - ! use nptlonly && return 0 - want_nptl || return 0 - return 1 -} - -want_tls() { - # Archs that can use TLS (Thread Local Storage) - case $(tc-arch) in - sparc) - # 2.3.6 should have tls support on sparc64 - # when using newer binutils - case ${CTARGET/-*} in - sparc64*) return 1 ;; - *) return 0 ;; - esac - ;; - x86) - # requires i486 or better #106556 - [[ ${CTARGET} == i[4567]86* ]] && return 0 - return 1 - ;; - esac - - return 0 -} - -want__thread() { - want_tls || return 1 - - # For some reason --with-tls --with__thread is causing segfaults on sparc32. - [[ ${PROFILE_ARCH} == "sparc" ]] && return 1 - - [[ -n ${WANT__THREAD} ]] && return ${WANT__THREAD} - - echo 'extern __thread int i;' > "${T}"/test-__thread.c - $(tc-getCC ${CTARGET}) -c "${T}"/test-__thread.c -o "${T}"/test-__thread.o &> /dev/null - WANT__THREAD=$? - rm -f "${T}"/test-__thread.[co] - - return ${WANT__THREAD} -} - -install_locales() { - unset LANGUAGE LANG LC_ALL - cd "${WORKDIR}"/${MYMAINBUILDDIR} || die "${WORKDIR}/${MYMAINBUILDDIR}" - make PARALLELMFLAGS="${MAKEOPTS} -j1" \ - install_root=${D} localedata/install-locales || die -} - -setup_locales() { - if use !userlocales ; then - einfo "userlocales not enabled, installing -ALL- locales..." - install_locales || die - elif [ -e /etc/locales.build ] ; then - einfo "Installing locales in /etc/locales.build..." - echo 'SUPPORTED-LOCALES=\' > SUPPORTED.locales - cat /etc/locales.build | grep -v -e ^$ -e ^\# | sed 's/$/\ \\/g' \ - >> SUPPORTED.locales - cat SUPPORTED.locales > ${S}/localedata/SUPPORTED || die - install_locales || die - elif [ -e ${FILESDIR}/locales.build ] ; then - einfo "Installing locales in ${FILESDIR}/locales.build..." - echo 'SUPPORTED-LOCALES=\' > SUPPORTED.locales - cat ${FILESDIR}/locales.build | grep -v -e ^$ -e ^\# | sed 's/$/\ \\/g' \ - >> SUPPORTED.locales - cat SUPPORTED.locales > ${S}/localedata/SUPPORTED || die - install_locales || die - else - einfo "Installing -ALL- locales..." - install_locales || die - fi -} - -glibc_do_configure() { - local myconf - - # set addons - pushd ${S} > /dev/null - local ADDONS=$(echo */configure | sed \ - -e 's:/configure::g' \ - -e 's:\(linuxthreads\|nptl\|rtkaio\|glibc-compat\)\( \|$\)::g' \ - -e 's: \+$::' \ - -e 's! !,!g' \ - -e 's!^!,!' \ - -e '/^,\*$/d') - popd > /dev/null - - use nls || myconf="${myconf} --disable-nls" - myconf="${myconf} $(use_enable hardened stackguard-randomization)" - if [[ $(<"${T}"/.ssp.compat) == "yes" ]] ; then - myconf="${myconf} --enable-old-ssp-compat" - else - myconf="${myconf} --disable-old-ssp-compat" - fi - - use glibc-omitfp && myconf="${myconf} --enable-omitfp" - - [[ ${CTARGET} == *-softfloat-* ]] && myconf="${myconf} --without-fp" - - if [ "$1" == "linuxthreads" ] ; then - if want_tls ; then - myconf="${myconf} --with-tls" - - if want__thread && use linuxthreads-tls ; then - myconf="${myconf} --with-__thread" - else - myconf="${myconf} --without-__thread" - fi - else - myconf="${myconf} --without-tls --without-__thread" - fi - - myconf="${myconf} --enable-add-ons=ports,linuxthreads${ADDONS}" - myconf="${myconf} --enable-kernel=${LT_KERNEL_VERSION}" - elif [ "$1" == "nptl" ] ; then - myconf="${myconf} --with-tls --with-__thread" - myconf="${myconf} --enable-add-ons=ports,nptl${ADDONS}" - myconf="${myconf} --enable-kernel=${NPTL_KERNEL_VERSION}" - else - die "invalid pthread option" - fi - - # Since SELinux support is only required for nscd, only enable it if: - # 1. USE selinux - # 2. ! USE build - # 3. only for the primary ABI on multilib systems - if use selinux && ! use build; then - if use multilib || has_multilib_profile; then - if is_final_abi; then - myconf="${myconf} --with-selinux" - else - myconf="${myconf} --without-selinux" - fi - else - myconf="${myconf} --with-selinux" - fi - else - myconf="${myconf} --without-selinux" - fi - - # Pick out the correct location for build headers - myconf="${myconf} - --without-cvs - --enable-bind-now - --build=${CBUILD_OPT:-${CBUILD}} - --host=${CTARGET_OPT:-${CTARGET}} - $(use_enable profile) - --without-gd - --with-headers=$(alt_build_headers) - --prefix=$(alt_prefix) - --mandir=$(alt_prefix)/share/man - --infodir=$(alt_prefix)/share/info - --libexecdir=$(alt_prefix)/lib/misc/glibc - ${EXTRA_ECONF}" - - has_version app-admin/eselect-compiler || export CC="$(tc-getCC ${CTARGET})" - - GBUILDDIR=${WORKDIR}/build-${ABI}-${CTARGET}-$1 - mkdir -p ${GBUILDDIR} - cd ${GBUILDDIR} - einfo "Configuring GLIBC for $1 with: ${myconf// /\n\t\t}" - ${S}/configure ${myconf} || die "failed to configure glibc" -} - -fix_lib64_symlinks() { - # the original Gentoo/AMD64 devs decided that since 64bit is the native - # bitdepth for AMD64, lib should be used for 64bit libraries. however, - # this ignores the FHS and breaks multilib horribly... especially - # since it wont even work without a lib64 symlink anyways. *rolls eyes* - # see bug 59710 for more information. - # Travis Tilley (08 Aug 2004) - if [ -L ${ROOT}/lib64 ] ; then - ewarn "removing /lib64 symlink and moving lib to lib64..." - ewarn "dont hit ctrl-c until this is done" - addwrite ${ROOT}/ - rm ${ROOT}/lib64 - # now that lib64 is gone, nothing will run without calling ld.so - # directly. luckily the window of brokenness is almost non-existant - use amd64 && /lib/ld-linux-x86-64.so.2 /bin/mv ${ROOT}/lib ${ROOT}/lib64 - use ppc64 && /lib/ld64.so.1 /bin/mv ${ROOT}/lib ${ROOT}/lib64 - # all better :) - ldconfig - ln -s lib64 ${ROOT}/lib - einfo "done! :-)" - einfo "fixed broken lib64/lib symlink in ${ROOT}" - fi - if [ -L ${ROOT}/usr/lib64 ] ; then - addwrite ${ROOT}/usr - rm ${ROOT}/usr/lib64 - mv ${ROOT}/usr/lib ${ROOT}/usr/lib64 - ln -s lib64 ${ROOT}/usr/lib - einfo "fixed broken lib64/lib symlink in ${ROOT}/usr" - fi - if [ -L ${ROOT}/usr/X11R6/lib64 ] ; then - addwrite ${ROOT}/usr/X11R6 - rm ${ROOT}/usr/X11R6/lib64 - mv ${ROOT}/usr/X11R6/lib ${ROOT}/usr/X11R6/lib64 - ln -s lib64 ${ROOT}/usr/X11R6/lib - einfo "fixed broken lib64/lib symlink in ${ROOT}/usr/X11R6" - fi -} - -use_multilib() { - case ${CTARGET} in - sparc64*|mips64*|x86_64*|powerpc64*|s390x*) - has_multilib_profile || use multilib ;; - *) false ;; - esac -} - -# Setup toolchain variables that would be defined in the profiles for these archs. -setup_env() { - # These should not be set, else the zoneinfo do not always get installed ... - unset LANGUAGE LANG LC_ALL - # silly users - unset LD_RUN_PATH - - if is_crosscompile || tc-is-cross-compiler ; then - multilib_env ${CTARGET} - if ! use multilib ; then - MULTILIB_ABIS=${DEFAULT_ABI} - else - MULTILIB_ABIS=${MULTILIB_ABIS:-${DEFAULT_ABI}} - fi - - # If the user has CFLAGS_ in their make.conf, use that, - # and fall back on CFLAGS. - local VAR=CFLAGS_${CTARGET//[-.]/_} - CFLAGS=${!VAR-${CFLAGS}} - fi - - setup_flags - - export ABI=${ABI:-${DEFAULT_ABI:-default}} - - if is_crosscompile || tc-is-cross-compiler ; then - local VAR=CFLAGS_${ABI} - # We need to export CFLAGS with abi information in them because - # glibc's configure script checks CFLAGS for some targets (like mips) - export CFLAGS="${!VAR} ${CFLAGS}" - fi -} - -### /ECLASS PUNTAGE ### - -if is_crosscompile ; then - SLOT="${CTARGET}-2.2" -else - SLOT="2.2" -fi - -# we'll handle stripping ourself #46186 -RESTRICT="nostrip multilib-pkg-force" - -# General: We need a new-enough binutils for as-needed -# arch: we need to make sure our binutils/gcc supports TLS -DEPEND=">=sys-devel/gcc-3.4.4 - arm? ( >=sys-devel/binutils-2.16.90 >=sys-devel/gcc-4.1.0 ) - ppc? ( >=sys-devel/gcc-4.1.0 ) - ppc64? ( >=sys-devel/gcc-4.1.0 ) - nptl? ( >=sys-kernel/linux-headers-${NPTL_KERNEL_VERSION} ) - >=sys-devel/binutils-2.15.94 - || ( app-admin/eselect-compiler >=sys-devel/gcc-config-1.3.12 ) - >=app-misc/pax-utils-0.1.10 - virtual/os-headers - nls? ( sys-devel/gettext ) - selinux? ( !build? ( sys-libs/libselinux ) )" -RDEPEND="nls? ( sys-devel/gettext ) - selinux? ( !build? ( sys-libs/libselinux ) )" - -if [[ ${CATEGORY/cross-} != ${CATEGORY} ]] ; then - DEPEND="${DEPEND} ${CATEGORY}/gcc" - - if [[ ${CATEGORY} == *-linux* ]] ; then - if [[ ${CATEGORY} == cross-mips* ]] ; then - DEPEND="${DEPEND} >=${CATEGORY}/mips-headers-2.6.10" - else - DEPEND="${DEPEND} ${CATEGORY}/linux-headers" - fi - fi -else - DEPEND="${DEPEND} sys-libs/timezone-data" - RDEPEND="${RDEPEND} sys-libs/timezone-data" -fi - -pkg_setup() { - if want_linuxthreads ; then - ewarn "glibc-2.4 is nptl-only!" - [[ ${CHOST} == i386-* ]] && eerror "NPTL requires a CHOST of i486 or better" - die "please add USE='nptl nptlonly' to make.conf" - fi - - if use nptlonly && ! use nptl ; then - eerror "If you want nptlonly, add nptl to your USE too ;p" - die "nptlonly without nptl" - fi - - # give some sort of warning about the nptl logic changes... - if want_nptl && want_linuxthreads ; then - - ewarn "Warning! Gentoo's GLIBC with NPTL enabled now behaves like the" - ewarn "glibc from almost every other distribution out there. This means" - ewarn "that glibc is compiled -twice-, once with linuxthreads and once" - ewarn "with nptl. The NPTL version is installed to lib/tls and is still" - ewarn "used by default. If you do not need nor want the linuxthreads" - ewarn "fallback, you can disable this behavior by adding nptlonly to" - ewarn "USE to save yourself some compile time." - - ebeep - epause 5 - fi -} - -src_unpack() { - setup_env - - case $(tc-arch) in - mips) - use_multilib \ - && GLIBC_PATCH_EXCLUDE="${GLIBC_PATCH_EXCLUDE} 6680_mips_nolib3264.patch" \ - || GLIBC_PATCH_EXCLUDE="${GLIBC_PATCH_EXCLUDE} 5005_all_enable-multilib-with-cross-compile.patch" - ;; - amd64) - if ! has_multilib_profile && ! is_crosscompile ; then - # the gentoo-libdir patch hack conflicts with these - GLIBC_PATCH_EXCLUDE="${GLIBC_PATCH_EXCLUDE} 5005_all_enable-multilib-with-cross-compile.patch" - fi - ;; - esac - - # Optimized amd64 funcs appear to be unstable, enable at your own risk ! - GLIBC_PATCH_EXCLUDE="${GLIBC_PATCH_EXCLUDE} 6905_all_glibc-2.4-amd64-string.patch" - # These should be pretty safe though ... - GLIBC_PATCH_EXCLUDE="${GLIBC_PATCH_EXCLUDE} 6901_all_2.4-new-libm-20060314.patch 6902_all_2.4-new-libm-s_ceil.patch" - - toolchain-glibc_src_unpack - - # Backwards SSP support - cd "${S}" -# For now, we force everyone to have the extra symbols -# if ! type -p scanelf > /dev/null ; then -# einfon "Scanning system for __guard to see if we need SSP compat ... " -# if [[ -n $(scanelf -qyls__guard -F'#s%F' | grep -v '^/lib.*/libc-2.*.so$') ]] ; then -# echo "yes" > "${T}"/.ssp.compat -# else -# # ok, a quick scan didnt find it, so lets do a deep scan ... -# if [[ -n $(scanelf -qyRlps__guard -F'#s%F' | grep -v '^/lib.*/libc-2.*.so$') ]] ; then -# echo "yes" > "${T}"/.ssp.compat -# else -# echo "no" > "${T}"/.ssp.compat -# fi -# fi -# cat "${T}"/.ssp.compat -# else - echo "yes" > "${T}"/.ssp.compat -# fi - - case $(tc-arch) in - #alpha) - # # Is this still needed? - # rm -f sysdeps/alpha/alphaev6/memcpy.S - #;; - amd64) - if ! has_multilib_profile && ! is_crosscompile; then - # CONF_LIBDIR support - epatch "${FILESDIR}"/2.4/glibc-gentoo-libdir.patch - sed -i -e "s:@GENTOO_LIBDIR@:$(get_libdir):g" "${S}"/sysdeps/unix/sysv/linux/configure - fi - ;; - ppc64) - # setup lib -- seems like a good place to set this up - has_multilib_profile || get_libdir_override lib64 - ;; - esac - - # Glibc is stupid sometimes, and doesn't realize that with a - # static C-Only gcc, -lgcc_eh doesn't exist. - # http://sources.redhat.com/ml/libc-alpha/2003-09/msg00100.html - # http://sourceware.org/ml/libc-alpha/2005-02/msg00042.html - echo 'int main(){}' > ${T}/gcc_eh_test.c - if ! $(tc-getCC ${CTARGET}) ${T}/gcc_eh_test.c -lgcc_eh 2>/dev/null ; then - sed -i -e 's:-lgcc_eh::' Makeconfig || die "sed gcc_eh" - fi - - # Some configure checks fail on the first emerge through because they - # try to link. This doesn't work well if we don't have a libc yet. - # http://sourceware.org/ml/libc-alpha/2005-02/msg00042.html - if is_crosscompile && use build; then - rm ${S}/sysdeps/sparc/sparc64/elf/configure{,.in} - rm ${S}/nptl/sysdeps/pthread/configure{,.in} - fi - - cd "${WORKDIR}" - find . -type f '(' -size 0 -o -name "*.orig" ')' -exec rm -f {} \; - find . -name configure -exec touch {} \; - - # Fix permissions on some of the scripts - chmod u+x "${S}"/scripts/*.sh -} - -src_compile() { - setup_env - - if [[ -z ${OABI} ]] ; then - local abilist="" - if has_multilib_profile ; then - abilist=$(get_install_abis) - einfo "Building multilib glibc for ABIs: ${abilist}" - elif is_crosscompile || tc-is-cross-compiler ; then - abilist=${DEFAULT_ABI} - fi - if [[ -n ${abilist} ]] ; then - OABI=${ABI} - for ABI in ${abilist} ; do - export ABI - src_compile - done - ABI=${OABI} - unset OABI - return 0 - fi - fi - - if just_headers ; then - toolchain-glibc_headers_compile - else - toolchain-glibc_src_compile - fi -} - -src_test() { - setup_env - - if [[ -z ${OABI} ]] && has_multilib_profile ; then - OABI=${ABI} - einfo "Testing multilib glibc for ABIs: $(get_install_abis)" - for ABI in $(get_install_abis) ; do - export ABI - einfo " Testing ${ABI} glibc" - src_test - done - ABI=${OABI} - unset OABI - return 0 - fi - - toolchain-glibc_src_test -} - -src_strip() { - # Now, strip everything but the thread libs #46186, as well as the dynamic - # linker, else we cannot set breakpoints in shared libraries due to bugs in - # gdb. Also want to grab stuff in tls subdir. whee. -#when new portage supports this ... -# env \ -# -uRESTRICT \ -# CHOST=${CTARGET} \ -# STRIP_MASK="/*/{,tls/}{ld-,lib{pthread,thread_db}}*" \ -# prepallstrip - pushd "${D}" > /dev/null - - if ! is_crosscompile ; then - mkdir -p "${T}"/strip-backup - for x in $(find "${D}" -maxdepth 3 \ - '(' -name 'ld-*' -o -name 'libpthread*' -o -name 'libthread_db*' ')' \ - -a '(' '!' -name '*.a' ')' -type f -printf '%P ') - do - mkdir -p "${T}/strip-backup/${x%/*}" - cp -a -- "${D}/${x}" "${T}/strip-backup/${x}" || die "backing up ${x}" - done - fi - env -uRESTRICT CHOST=${CTARGET} prepallstrip - if ! is_crosscompile ; then - cp -a -- "${T}"/strip-backup/* "${D}"/ || die "restoring non-stripped libs" - fi - - popd > /dev/null -} - -src_install() { - setup_env - - if [[ -z ${OABI} ]] ; then - local abilist="" - if has_multilib_profile ; then - abilist=$(get_install_abis) - einfo "Installing multilib glibc for ABIs: ${abilist}" - elif is_crosscompile || tc-is-cross-compiler ; then - abilist=${DEFAULT_ABI} - fi - if [[ -n ${abilist} ]] ; then - OABI=${ABI} - for ABI in ${abilist} ; do - export ABI - src_install - done - ABI=${OABI} - unset OABI - src_strip - return 0 - fi - fi - - # Handle stupid lib32 BS - unset OLD_LIBDIR - if ! is_crosscompile ; then - if [[ $(tc-arch) == "amd64" && ${ABI} == "x86" && $(get_libdir) != "lib" ]] ; then - OLD_LIBDIR=$(get_libdir) - LIBDIR_x86="lib" - fi - - if [[ $(tc-arch) == "ppc64" && ${ABI} == "ppc" && $(get_libdir) != "lib" ]] ; then - OLD_LIBDIR=$(get_libdir) - LIBDIR_ppc="lib" - fi - fi - - if just_headers ; then - toolchain-glibc_headers_install - else - toolchain-glibc_src_install - fi - [[ -z ${OABI} ]] && src_strip - - # Handle stupid lib32 BS on amd64 and ppc64 - if [[ -n ${OLD_LIBDIR} ]] ; then - cd "${S}" - [[ $(tc-arch) == "amd64" ]] && LIBDIR_x86=${OLD_LIBDIR} - [[ $(tc-arch) == "ppc64" ]] && LIBDIR_ppc=${OLD_LIBDIR} - unset OLD_LIBDIR - - mv "${D}"/lib "${D}"/$(get_libdir) - mv "${D}"/usr/lib "${D}"/usr/$(get_libdir) - dodir /lib - dodir /usr/lib - mv "${D}"/usr/$(get_libdir)/locale "${D}"/usr/lib - [[ $(tc-arch) == "amd64" ]] && dosym ../$(get_libdir)/ld-linux.so.2 /lib/ld-linux.so.2 - [[ $(tc-arch) == "ppc64" ]] && dosym ../$(get_libdir)/ld.so.1 /lib/ld.so.1 - - for f in "${D}"/usr/$(get_libdir)/*.so; do - local basef=$(basename "${f}") - if [[ -L ${f} ]] ; then - local target=$(readlink "${f}") - target=${target/\/lib\//\/$(get_libdir)\/} - rm "${f}" - dosym "${target}" /usr/$(get_libdir)/"${basef}" - fi - done - - dosed "s:/lib/:/$(get_libdir)/:g" /usr/$(get_libdir)/lib{c,pthread}.so - - if want_nptl && want_linuxthreads ; then - dosed "s:/lib/:/$(get_libdir)/:g" /usr/$(get_libdir)/nptl/lib{c,pthread}.so - fi - fi - - # PPC NPTL fix - if [[ $(tc-arch) == "ppc" ]] && use nptl && ! use nptlonly ; then - cp ${WORKDIR}/build-default-${CTARGET}-nptl/elf/ld.so ${D}/lib/ld-${PV}.so - fi -} - -pkg_preinst() { - toolchain-glibc_pkg_preinst -} - -pkg_postinst() { - toolchain-glibc_pkg_postinst -} diff --git a/sys-libs/glibc/glibc-2.4-r2.ebuild b/sys-libs/glibc/glibc-2.4-r2.ebuild deleted file mode 100644 index d472cb6858a1..000000000000 --- a/sys-libs/glibc/glibc-2.4-r2.ebuild +++ /dev/null @@ -1,1271 +0,0 @@ -# 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.4-r2.ebuild,v 1.26 2006/05/30 19:45:22 eradicator Exp $ - -# Here's how the cross-compile logic breaks down ... -# CTARGET - machine that will target the binaries -# CHOST - machine that will host the binaries -# CBUILD - machine that will build the binaries -# If CTARGET != CHOST, it means you want a libc for cross-compiling. -# If CHOST != CBUILD, it means you want to cross-compile the libc. -# CBUILD = CHOST = CTARGET - native build/install -# CBUILD != (CHOST = CTARGET) - cross-compile a native build -# (CBUILD = CHOST) != CTARGET - libc for cross-compiler -# CBUILD != CHOST != CTARGET - cross-compile a libc for a cross-compiler -# For install paths: -# CHOST = CTARGET - install into / -# CHOST != CTARGET - install into /usr/CTARGET/ - -KEYWORDS="-* ~amd64 ~ia64 ~x86" - -BRANCH_UPDATE="" - -# Generated man pages -GLIBC_MANPAGE_VERSION="none" - -# Generated stuff in manual subdir -GLIBC_INFOPAGE_VERSION="none" - -# Gentoo patchset -PATCH_VER="1.13" - -# Fedora addons (like c_stubs) ... sniped from RHEL's glibc-2.4-4.src.rpm -# http://download.fedora.redhat.com/pub/fedora/linux/core/ -FEDORA_VER="20060501T0751" -FEDORA_TARBALL="glibc-fedora-${FEDORA_VER}.tar.bz2" -FEDORA_URI="mirror://gentoo/${FEDORA_TARBALL}" - -# PPC cpu addon -# http://penguinppc.org/dev/glibc/glibc-powerpc-cpu-addon.html -PPC_CPU_ADDON_VER="0.01" -PPC_CPU_ADDON_TARBALL="glibc-powerpc-cpu-addon-v${PPC_CPU_ADDON_VER}.tgz" -PPC_CPU_ADDON_URI="http://penguinppc.org/dev/glibc/${PPC_CPU_ADDON_TARBALL}" - -# LinuxThreads addon -LT_VER="20060508" -LT_TARBALL="glibc-linuxthreads-${LT_VER}.tar.bz2" -LT_URI="ftp://sources.redhat.com/pub/glibc/snapshots/${LT_TARBALL}" - -GENTOO_TOOLCHAIN_BASE_URI="mirror://gentoo" -GENTOO_TOOLCHAIN_DEV_URI="http://dev.gentoo.org/~azarah/glibc/XXX http://dev.gentoo.org/~vapier/dist/XXX" - -### PUNT OUT TO ECLASS?? ### -inherit eutils versionator libtool toolchain-funcs flag-o-matic gnuconfig multilib - -DESCRIPTION="GNU libc6 (also called glibc2) C library" -HOMEPAGE="http://www.gnu.org/software/libc/libc.html" -LICENSE="LGPL-2" - -IUSE="nls build nptl nptlonly hardened multilib selinux glibc-omitfp profile" - -export CBUILD=${CBUILD:-${CHOST}} -export CTARGET=${CTARGET:-${CHOST}} -if [[ ${CTARGET} == ${CHOST} ]] ; then - if [[ ${CATEGORY/cross-} != ${CATEGORY} ]] ; then - export CTARGET=${CATEGORY/cross-} - fi -fi -if [[ ${CTARGET} == ${CHOST} ]] ; then - PROVIDE="virtual/libc" -fi - -is_crosscompile() { - [[ ${CHOST} != ${CTARGET} ]] -} -just_headers() { - is_crosscompile && has _E_CROSS_HEADERS_ONLY ${USE} -} - -GLIBC_RELEASE_VER=$(get_version_component_range 1-3) - -# Don't set this to :-, - allows BRANCH_UPDATE="" -BRANCH_UPDATE=${BRANCH_UPDATE-$(get_version_component_range 4)} - -# (Recent snapshots fails with 2.6.5 and earlier with NPTL) -NPTL_KERNEL_VERSION=${NPTL_KERNEL_VERSION:-"2.6.9"} -LT_KERNEL_VERSION=${LT_KERNEL_VERSION:-"2.4.1"} - -### SRC_URI ### - -# This function handles the basics of setting the SRC_URI for a glibc ebuild. -# To use, set SRC_URI with: -# -# SRC_URI="$(get_glibc_src_uri)" -# -# Other than the variables normally set by portage, this function's behavior -# can be altered by setting the following: -# -# GENTOO_TOOLCHAIN_BASE_URI -# This sets the base URI for all gentoo-specific patch files. Note -# that this variable is only important for a brief period of time, -# before your source files get picked up by mirrors. However, it is -# still highly suggested that you keep files in this location -# available. -# -# BRANCH_UPDATE -# If set, this variable signals that we should be using the main -# release tarball (determined by ebuild version) and applying a -# CVS branch update patch against it. The location of this branch -# update patch is assumed to be in ${GENTOO_TOOLCHAIN_BASE_URI}. -# Just like with SNAPSHOT, this variable is ignored if the ebuild -# has a _pre suffix. -# -# PATCH_VER -# PATCH_GLIBC_VER -# This should be set to the version of the gentoo patch tarball. -# The resulting filename of this tarball will be: -# glibc-${PATCH_GLIBC_VER:-${GLIBC_RELEASE_VER}}-patches-${PATCH_VER}.tar.bz2 -# -# GLIBC_MANPAGE_VERSION -# GLIBC_INFOPAGE_VERSION -# The version of glibc for which we will download pages. This will -# default to ${GLIBC_RELEASE_VER}, but we may not want to pre-generate man pages -# for prerelease test ebuilds for example. This allows you to -# continue using pre-generated manpages from the last stable release. -# If set to "none", this will prevent the downloading of manpages, -# which is useful for individual library targets. -# -get_glibc_src_uri() { - GENTOO_TOOLCHAIN_BASE_URI=${GENTOO_TOOLCHAIN_BASE_URI:-"mirror://gentoo"} - -# GLIBC_SRC_URI="http://ftp.gnu.org/gnu/glibc/glibc-${GLIBC_RELEASE_VER}.tar.bz2 -# http://ftp.gnu.org/gnu/glibc/glibc-linuxthreads-${GLIBC_RELEASE_VER}.tar.bz2 -# http://ftp.gnu.org/gnu/glibc/glibc-libidn-${GLIBC_RELEASE_VER}.tar.bz2 - GLIBC_SRC_URI="mirror://gnu/glibc/glibc-${GLIBC_RELEASE_VER}.tar.bz2 - mirror://gnu/glibc/glibc-ports-${GLIBC_RELEASE_VER}.tar.bz2 - mirror://gnu/glibc/glibc-libidn-${GLIBC_RELEASE_VER}.tar.bz2" - - if [[ -n ${BRANCH_UPDATE} ]] ; then - GLIBC_SRC_URI="${GLIBC_SRC_URI} - ${GENTOO_TOOLCHAIN_BASE_URI}/glibc-${GLIBC_RELEASE_VER}-branch-update-${BRANCH_UPDATE}.patch.bz2 - ${GENTOO_TOOLCHAIN_DEV_URI//XXX/glibc-${GLIBC_RELEASE_VER}-branch-update-${BRANCH_UPDATE}.patch.bz2}" - fi - - if [[ -n ${PATCH_VER} ]] ; then - GLIBC_SRC_URI="${GLIBC_SRC_URI} - ${GENTOO_TOOLCHAIN_BASE_URI}/glibc-${PATCH_GLIBC_VER:-${GLIBC_RELEASE_VER}}-patches-${PATCH_VER}.tar.bz2 - ${GENTOO_TOOLCHAIN_DEV_URI//XXX/glibc-${PATCH_GLIBC_VER:-${GLIBC_RELEASE_VER}}-patches-${PATCH_VER}.tar.bz2}" - fi - - if [[ ${GLIBC_MANPAGE_VERSION} != "none" ]] ; then - GLIBC_SRC_URI="${GLIBC_SRC_URI} - ${GENTOO_TOOLCHAIN_BASE_URI}/glibc-manpages-${GLIBC_MANPAGE_VERSION:-${GLIBC_RELEASE_VER}}.tar.bz2 - ${GENTOO_TOOLCHAIN_DEV_URI//XXX/glibc-manpages-${GLIBC_MANPAGE_VERSION:-${GLIBC_RELEASE_VER}}.tar.bz2}" - fi - - if [[ ${GLIBC_INFOPAGE_VERSION} != "none" ]] ; then - GLIBC_SRC_URI="${GLIBC_SRC_URI} - ${GENTOO_TOOLCHAIN_BASE_URI}/glibc-infopages-${GLIBC_INFOPAGE_VERSION:-${GLIBC_RELEASE_VER}}.tar.bz2 - ${GENTOO_TOOLCHAIN_DEV_URI//XXX/glibc-infopages-${GLIBC_INFOPAGE_VERSION:-${GLIBC_RELEASE_VER}}.tar.bz2}" - fi - - [[ -n ${LT_VER} ]] && GLIBC_SRC_URI="${GLIBC_SRC_URI} ${LT_URI}" - - GLIBC_SRC_URI="${GLIBC_SRC_URI} ${FEDORA_URI}" - GLIBC_SRC_URI="${GLIBC_SRC_URI} ${PPC_CPU_ADDON_URI}" - - echo "${GLIBC_SRC_URI}" -} - -SRC_URI=$(get_glibc_src_uri) -S=${WORKDIR}/glibc-${GLIBC_RELEASE_VER} - -### EXPORTED FUNCTIONS ### -unpack_addon() { - local addon=$1 ver=${2:-${GLIBC_RELEASE_VER}} - unpack glibc-${addon}-${ver}.tar.bz2 - mv glibc-${addon}-${ver} ${addon} || die -} -toolchain-glibc_src_unpack() { - # Check NPTL support _before_ we unpack things to save some time - want_nptl && check_nptl_support - - unpack glibc-${GLIBC_RELEASE_VER}.tar.bz2 - - cd "${S}" - if [[ -n ${LT_VER} ]] ; then - unpack ${LT_TARBALL} - mv glibc-linuxthreads-${LT_VER}/* . || die - fi - unpack_addon libidn - unpack_addon ports - - if [[ -n ${FEDORA_TARBALL} ]] ; then - # only pull out the stuff we actually want - mkdir "${WORKDIR}"/fedora - cd "${WORKDIR}"/fedora || die - unpack ${FEDORA_TARBALL} - mv c_stubs "${S}"/ || die - cd "${S}" - rm -r "${WORKDIR}"/fedora - fi - if [[ -n ${PPC_CPU_ADDON_TARBALL} ]] ; then - cd "${S}" - unpack ${PPC_CPU_ADDON_TARBALL} - fi - - if [[ -n ${PATCH_VER} ]] ; then - cd "${WORKDIR}" - unpack glibc-${PATCH_GLIBC_VER:-${GLIBC_RELEASE_VER}}-patches-${PATCH_VER}.tar.bz2 - fi - - # XXX: We should do the branchupdate, before extracting the manpages and - # infopages else it does not help much (mtimes change if there is a change - # to them with branchupdate) - if [[ -n ${BRANCH_UPDATE} ]] ; then - cd "${S}" - epatch "${DISTDIR}"/glibc-${GLIBC_RELEASE_VER}-branch-update-${BRANCH_UPDATE}.patch.bz2 - - # Snapshot date patch - einfo "Patching version to display snapshot date ..." - sed -i -e "s:\(#define RELEASE\).*:\1 \"${BRANCH_UPDATE}\":" version.h - fi - - if [[ ${GLIBC_MANPAGE_VERSION} != "none" ]] ; then - cd "${WORKDIR}" - unpack glibc-manpages-${GLIBC_MANPAGE_VERSION:-${GLIBC_RELEASE_VER}}.tar.bz2 - fi - - if [[ ${GLIBC_INFOPAGE_VERSION} != "none" ]] ; then - cd "${S}" - unpack glibc-infopages-${GLIBC_INFOPAGE_VERSION:-${GLIBC_RELEASE_VER}}.tar.bz2 - fi - - if [[ -n ${PATCH_VER} ]] ; then - cd "${S}" - EPATCH_MULTI_MSG="Applying Gentoo Glibc Patchset ${PATCH_GLIBC_VER:-${GLIBC_RELEASE_VER}}-${PATCH_VER} ..." \ - EPATCH_EXCLUDE=${GLIBC_PATCH_EXCLUDE} \ - EPATCH_SUFFIX="patch" \ - ARCH=$(tc-arch) \ - epatch "${WORKDIR}"/patches - fi - - gnuconfig_update -} - -toolchain-glibc_src_compile() { - echo - local v - for v in ABI CBUILD CHOST CTARGET CBUILD_OPT CTARGET_OPT CC CFLAGS ; do - einfo " $(printf '%15s' ${v}:) ${!v}" - done - echo - - if want_linuxthreads ; then - glibc_do_configure linuxthreads - einfo "Building GLIBC with linuxthreads..." - make PARALLELMFLAGS="${MAKEOPTS}" || die "make for ${ABI} failed" - fi - if want_nptl ; then - # ... and then do the optional nptl build - unset LD_ASSUME_KERNEL - glibc_do_configure nptl - einfo "Building GLIBC with NPTL..." - make PARALLELMFLAGS="${MAKEOPTS}" || die "make for ${ABI} failed" - fi -} - -toolchain-glibc_headers_compile() { - local GBUILDDIR=${WORKDIR}/build-${ABI}-${CTARGET}-headers - mkdir -p "${GBUILDDIR}" - cd "${GBUILDDIR}" - - # Pick out the correct location for build headers - local myconf="--disable-sanity-checks --enable-hacker-mode" - myconf="${myconf} - --enable-add-ons=nptl,ports - --without-cvs - --enable-bind-now - --build=${CBUILD_OPT:-${CBUILD}} - --host=${CTARGET_OPT:-${CTARGET}} - --with-headers=$(alt_build_headers) - --prefix=/usr - ${EXTRA_ECONF}" - - einfo "Configuring GLIBC headers with: ${myconf// /\n\t\t}" - CC=gcc \ - CFLAGS="-O1 -pipe" \ - "${S}"/configure ${myconf} || die "failed to configure glibc" -} - -toolchain-glibc_src_test() { - # This is wrong, but glibc's tests fail bad when screwing - # around with sandbox, so lets just punt it - unset LD_PRELOAD - - # do the linuxthreads build unless we're using nptlonly - if want_linuxthreads ; then - cd "${WORKDIR}"/build-${ABI}-${CTARGET}-linuxthreads - einfo "Checking GLIBC with linuxthreads..." - make check || die "linuxthreads glibc did not pass make check" - fi - if want_nptl ; then - cd "${WORKDIR}"/build-${ABI}-${CTARGET}-nptl - unset LD_ASSUME_KERNEL || : - einfo "Checking GLIBC with NPTL..." - make check || die "nptl glibc did not pass make check" - fi -} - -toolchain-glibc_pkg_preinst() { - # PPC64+others may want to eventually be added to this logic if they - # decide to be multilib compatible and FHS compliant. note that this - # chunk of FHS compliance only applies to 64bit archs where 32bit - # compatibility is a major concern (not IA64, for example). - - # amd64's 2005.0 is the first amd64 profile to not need this code. - # 2005.0 is setup properly, and this is executed as part of the - # 2004.3 -> 2005.0 upgrade script. - # 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 ]] && ! { want_nptl && want_linuxthreads; }; then - addwrite "${ROOT}"/$(alt_libdir)/ - ewarn "nptlonly or -nptl in USE, removing /${ROOT}$(alt_libdir)/tls..." - rm -r "${ROOT}"/$(alt_libdir)/tls || die - fi - - # Shouldnt need to keep this updated - [[ -e ${ROOT}/etc/locale.gen ]] && rm -f "${D}"/etc/locale.gen -} - -toolchain-glibc_src_install() { - # These should not be set, else the - # zoneinfo do not always get installed ... - unset LANGUAGE LANG LC_ALL - - local GBUILDDIR - if want_linuxthreads ; then - GBUILDDIR=${WORKDIR}/build-${ABI}-${CTARGET}-linuxthreads - else - GBUILDDIR=${WORKDIR}/build-${ABI}-${CTARGET}-nptl - fi - - local install_root=${D} - if is_crosscompile ; then - install_root="${install_root}/usr/${CTARGET}" - fi - if want_linuxthreads ; then - cd "${WORKDIR}"/build-${ABI}-${CTARGET}-linuxthreads - einfo "Installing GLIBC ${ABI} with linuxthreads ..." - make PARALLELMFLAGS="${MAKEOPTS} -j1" \ - install_root="${install_root}" \ - install || die - else # nptlonly - cd "${WORKDIR}"/build-${ABI}-${CTARGET}-nptl - einfo "Installing GLIBC ${ABI} with NPTL ..." - make PARALLELMFLAGS="${MAKEOPTS} -j1" \ - install_root="${install_root}" \ - install || die - fi - - if is_crosscompile ; then - # punt all the junk not needed by a cross-compiler - cd "${D}"/usr/${CTARGET} || die - rm -rf ./{,usr/}{bin,etc,sbin,share} ./{,usr/}*/{gconv,misc} - fi - - if want_linuxthreads && want_nptl ; then - einfo "Installing NPTL to $(alt_libdir)/tls/..." - cd "${WORKDIR}"/build-${ABI}-${CTARGET}-nptl - dodir $(alt_libdir)/tls $(alt_usrlibdir)/nptl - - local l src_lib - for l in libc libm librt libpthread libthread_db ; do - # take care of shared lib first ... - l=${l}.so - if [[ -e ${l} ]] ; then - src_lib=${l} - else - src_lib=$(eval echo */${l}) - fi - cp -a ${src_lib} "${D}"$(alt_libdir)/tls/${l} || die "copying nptl ${l}" - fperms a+rx $(alt_libdir)/tls/${l} - dosym ${l} $(alt_libdir)/tls/$(scanelf -qSF'%S#F' ${src_lib}) - - # then grab the linker script or the symlink ... - if [[ -L ${D}$(alt_usrlibdir)/${l} ]] ; then - dosym $(alt_libdir)/tls/${l} $(alt_usrlibdir)/nptl/${l} - else - sed \ - -e "s:/${l}:/tls/${l}:g" \ - -e "s:/${l/%.so/_nonshared.a}:/nptl/${l/%.so/_nonshared.a}:g" \ - "${D}"$(alt_usrlibdir)/${l} > "${D}"$(alt_usrlibdir)/nptl/${l} - fi - - # then grab the static lib ... - src_lib=${src_lib/%.so/.a} - [[ ! -e ${src_lib} ]] && src_lib=${src_lib/%.a/_pic.a} - cp -a ${src_lib} "${D}"$(alt_usrlibdir)/nptl/ || die "copying nptl ${src_lib}" - src_lib=${src_lib/%.a/_nonshared.a} - if [[ -e ${src_lib} ]] ; then - cp -a ${src_lib} "${D}"$(alt_usrlibdir)/nptl/ || die "copying nptl ${src_lib}" - fi - done - - # use the nptl linker instead of the linuxthreads one as the linuxthreads - # one may lack TLS support and that can be really bad for business - cp -a elf/ld.so "${D}"$(alt_libdir)/$(scanelf -qSF'%S#F' elf/ld.so) || die "copying nptl interp" - fi - - # We'll take care of the cache ourselves - rm -f "${D}"/etc/ld.so.cache - - # Some things want this, notably ash. - dosym libbsd-compat.a $(alt_usrlibdir)/libbsd.a - - # Handle includes for different ABIs - prep_ml_includes $(alt_headers) - - # When cross-compiling for a non-multilib setup, make sure we have - # lib and a proper symlink setup - if ! use multilib && ! has_multilib_profile && [[ $(get_libdir) != "lib" ]] ; then - cd "${D}"$(alt_libdir)/.. - mv $(get_libdir) lib || die - ln -s lib $(get_libdir) || die - cd "${D}"$(alt_usrlibdir)/.. - mv $(get_libdir) lib || die - ln -s lib $(get_libdir) || die - fi - - ################################################################# - # EVERYTHING AFTER THIS POINT IS FOR NATIVE GLIBC INSTALLS ONLY # - # Make sure we install some symlink hacks so that when we build - # a 2nd stage cross-compiler, gcc finds the target system - # headers correctly. See gcc/doc/gccinstall.info - if is_crosscompile ; then - dosym usr/include /usr/${CTARGET}/sys-include - return 0 - fi - - # Everything past this point just needs to be done once ... - is_final_abi || return 0 - - # Make sure the non-native interp can be found on multilib systems - if has_multilib_profile ; then - case $(tc-arch) in - amd64) - [[ ! -e ${D}/lib ]] && dosym $(get_abi_LIBDIR amd64) /lib - dosym /$(get_abi_LIBDIR x86)/ld-linux.so.2 /lib/ld-linux.so.2 - ;; - ppc64) - [[ ! -e ${D}/lib ]] && dosym $(get_abi_LIBDIR ppc64) /lib - dosym /$(get_abi_LIBDIR ppc)/ld.so.1 /lib/ld.so.1 - ;; - esac - fi - - # Files for Debian-style locale updating - dodir /usr/share/i18n - sed \ - -e "/^#/d" \ - -e "/SUPPORTED-LOCALES=/d" \ - -e "s: \\\\::g" -e "s:/: :g" \ - "${S}"/localedata/SUPPORTED > "${D}"/usr/share/i18n/SUPPORTED \ - || die "generating /usr/share/i18n/SUPPORTED failed" - cd "${WORKDIR}"/extra/locale - dosbin locale-gen || die - doman *.[0-8] - insinto /etc - doins locale.gen || die - - # Make sure all the ABI's can find the locales and so we only - # have to generate one set - keepdir /usr/$(get_libdir)/locale - for l in $(get_all_libdirs) ; do - if [[ ! -e ${D}/usr/${l}/locale ]] ; then - dosym /usr/$(get_libdir)/locale /usr/${l}/locale - fi - done - - if ! has noinfo ${FEATURES} && [[ ${GLIBC_INFOPAGE_VERSION} != "none" ]] ; then - einfo "Installing info pages..." - - make \ - -C "${GBUILDDIR}" \ - PARALLELMFLAGS="${MAKEOPTS} -j1" \ - install_root="${install_root}" \ - info -i || die - fi - - if [[ ${GLIBC_MANPAGE_VERSION} != "none" ]] ; then - einfo "Installing man pages..." - - # Install linuxthreads man pages even if nptl is enabled - cd "${WORKDIR}"/man - doman *.3thr - fi - - # Install misc network config files - insinto /etc - doins "${FILESDIR}"/nscd.conf - doins "${FILESDIR}"/nsswitch.conf - doins "${FILESDIR}"/2.3.6/host.conf - doinitd "${FILESDIR}"/nscd - - cd "${S}" - dodoc BUGS ChangeLog* CONFORMANCE FAQ INTERFACE NEWS NOTES PROJECTS README* - - # Prevent overwriting of the /etc/localtime symlink. We'll handle the - # creation of the "factory" symlink in pkg_postinst(). - rm -f "${D}"/etc/localtime - - # simple test to make sure our new glibc isnt completely broken. - # for now, skip the multilib scenario. also make sure we don't - # test with statically built binaries since they will fail. - [[ ${CBUILD} != ${CHOST} ]] && return 0 - [[ $(get_libdir) != "lib" ]] && return 0 - for x in date env ls true uname ; do - x=$(type -p ${x}) - [[ -z ${x} ]] && continue - striptest=$(file -L ${x} 2>/dev/null) - [[ -z ${striptest} ]] && continue - [[ ${striptest/statically linked} != "${striptest}" ]] && continue - "${D}"/$(get_libdir)/ld-*.so \ - --library-path "${D}"/$(get_libdir) \ - ${x} > /dev/null \ - || die "simple run test (${x}) failed" - done -} - -toolchain-glibc_headers_install() { - local GBUILDDIR=${WORKDIR}/build-${ABI}-${CTARGET}-headers - cd "${GBUILDDIR}" - make install_root="${D}/usr/${CTARGET}" install-headers || die "install-headers failed" - # Copy over headers that are not part of install-headers ... these - # are pretty much taken verbatim from crosstool, see it for more details - insinto $(alt_headers)/bits - doins misc/syscall-list.h bits/stdio_lim.h || die "doins include bits" - insinto $(alt_headers)/gnu - doins "${S}"/include/gnu/stubs.h || die "doins include gnu" - # Make sure we install the sys-include symlink so that when - # we build a 2nd stage cross-compiler, gcc finds the target - # system headers correctly. See gcc/doc/gccinstall.info - dosym usr/include /usr/${CTARGET}/sys-include -} - -toolchain-glibc_pkg_postinst() { - # Mixing nptlonly and -nptlonly glibc can prove dangerous if libpthread - # isn't removed in unmerge which happens sometimes. See bug #87671 - if ! is_crosscompile && want_linuxthreads && [[ ${ROOT} == "/" ]] ; then - for libdir in $(get_all_libdirs) ; do - for f in "${ROOT}"/${libdir}/libpthread-2.* "${ROOT}"/${libdir}/libpthread-0.6* ; do - if [[ -f ${f} ]] ; then - rm -f ${f} - ldconfig - fi - done - done - fi - - if ! tc-is-cross-compiler && [[ -x ${ROOT}/usr/sbin/iconvconfig ]] ; then - # Generate fastloading iconv module configuration file. - "${ROOT}"/usr/sbin/iconvconfig --prefix="${ROOT}" - fi - - if [[ ! -e ${ROOT}/lib/ld.so.1 ]] && use ppc64 && ! has_multilib_profile ; then - ## SHOULDN'T THIS BE lib64?? - ln -s ld64.so.1 "${ROOT}"/lib/ld.so.1 - fi - - if ! is_crosscompile && [[ ${ROOT} == "/" ]] ; then - # Reload init ... - /sbin/init U &> /dev/null - - # if the host locales.gen contains no entries, we'll install everything - local locale_list="${ROOT}etc/locale.gen" - if [[ -z $(locale-gen --list --config "${locale_list}") ]] ; then - ewarn "Generating all locales; edit /etc/locale.gen to save time/space" - locale_list="${ROOT}usr/share/i18n/SUPPORTED" - fi - locale-gen --config "${locale_list}" - fi - - echo - einfo "Gentoo's glibc no longer includes mdns." - einfo "If you want mdns, emerge the sys-auth/nss-mdns package." - echo - - if want_nptl && want_linuxthreads ; then - einfo "The default behavior of glibc on your system is to use NPTL. If" - einfo "you want to use linuxthreads for a particular program, start it" - einfo "by executing 'LD_ASSUME_KERNEL=${LT_KERNEL_VERSION} []'" - echo - fi -} - -### SUPPORT FUNCTIONS ### -# We need to be able to set alternative headers for -# compiling for non-native platform -# Will also become useful for testing kernel-headers without screwing up -# the whole system. -# note: intentionally undocumented. -alt_headers() { - if [[ -z ${ALT_HEADERS} ]] ; then - if is_crosscompile ; then - ALT_HEADERS="/usr/${CTARGET}/usr/include" - else - ALT_HEADERS="/usr/include" - fi - fi - echo "${ALT_HEADERS}" -} -alt_build_headers() { - if [[ -z ${ALT_BUILD_HEADERS} ]] ; then - ALT_BUILD_HEADERS=$(alt_headers) - tc-is-cross-compiler && ALT_BUILD_HEADERS=${ROOT}$(alt_headers) - fi - echo "${ALT_BUILD_HEADERS}" -} - -alt_libdir() { - if is_crosscompile ; then - echo /usr/${CTARGET}/$(get_libdir) - else - echo /$(get_libdir) - fi -} - -alt_usrlibdir() { - if is_crosscompile ; then - echo /usr/${CTARGET}/usr/$(get_libdir) - else - echo /usr/$(get_libdir) - fi -} - -setup_flags() { - # Make sure host make.conf doesn't pollute us - if is_crosscompile || tc-is-cross-compiler ; then - CHOST=${CTARGET} strip-unsupported-flags - fi - - # Store our CFLAGS because it's changed depending on which CTARGET - # we are building when pulling glibc on a multilib profile - CFLAGS_BASE=${CFLAGS_BASE-${CFLAGS}} - CFLAGS=${CFLAGS_BASE} - ASFLAGS_BASE=${ASFLAGS_BASE-${ASFLAGS}} - ASFLAGS=${ASFLAGS_BASE} - - # Over-zealous CFLAGS can often cause problems. What may work for one - # person may not work for another. To avoid a large influx of bugs - # relating to failed builds, we strip most CFLAGS out to ensure as few - # problems as possible. - strip-flags - strip-unsupported-flags - filter-flags -m32 -m64 -mabi=* - - unset CBUILD_OPT CTARGET_OPT - if has_multilib_profile ; then - CTARGET_OPT=$(get_abi_CTARGET) - [[ -z ${CTARGET_OPT} ]] && CTARGET_OPT=$(get_abi_CHOST) - fi - - case $(tc-arch) in - amd64) - # Punt this when amd64's 2004.3 is removed - CFLAGS_x86="-m32" - ;; - ppc) - append-flags "-freorder-blocks" - ;; - sparc) - # Both sparc and sparc64 can use -fcall-used-g6. -g7 is bad, though. - filter-flags "-fcall-used-g7" - append-flags "-fcall-used-g6" - filter-flags "-mvis" - - if is_crosscompile || [[ ${PROFILE_ARCH} == "sparc64" ]] || { has_multilib_profile && ! tc-is-cross-compiler; } ; then - case ${ABI} in - sparc64) - filter-flags -Wa,-xarch -Wa,-A - - if is-flag "-mcpu=ultrasparc3"; then - CTARGET_OPT="sparc64b-unknown-linux-gnu" - append-flags "-Wa,-xarch=v9b" - export ASFLAGS="${ASFLAGS} -Wa,-xarch=v9b" - else - CTARGET_OPT="sparc64-unknown-linux-gnu" - append-flags "-Wa,-xarch=v9a" - export ASFLAGS="${ASFLAGS} -Wa,-xarch=v9a" - fi - ;; - *) - if is-flag "-mcpu=ultrasparc3"; then - CTARGET_OPT="sparcv9b-unknown-linux-gnu" - else - CTARGET_OPT="sparcv9-unknown-linux-gnu" - fi - ;; - esac - else - if is-flag "-mcpu=ultrasparc3"; then - CTARGET_OPT="sparcv9b-unknown-linux-gnu" - elif { is_crosscompile && want_nptl; } || is-flag "-mcpu=ultrasparc2" || is-flag "-mcpu=ultrasparc"; then - CTARGET_OPT="sparcv9-unknown-linux-gnu" - fi - fi - ;; - esac - - if [[ -n ${CTARGET_OPT} && ${CBUILD} == ${CHOST} ]] && ! is_crosscompile; then - CBUILD_OPT=${CTARGET_OPT} - fi - - if $(tc-getCC ${CTARGET}) -v 2>&1 | grep -q 'gcc version 3.[0123]'; then - append-flags -finline-limit=2000 - fi - - # We dont want these flags for glibc - filter-ldflags -pie - - # We cannot build glibc with Bdirect support - filter-flags -Wl,-Bdirect - filter-ldflags -Bdirect - filter-ldflags -Wl,-Bdirect - - # Same for hashvals ... - filter-flags -Wl,-hashvals - filter-ldflags -hashvals - filter-ldflags -Wl,-hashvals - - # Lock glibc at -O2 -- linuxthreads needs it and we want to be - # conservative here - filter-flags -O? - append-flags -O2 -} - -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 -} - -check_nptl_support() { - local min_kernel_version=$(KV_to_int "${NPTL_KERNEL_VERSION}") - - echo - - ebegin "Checking gcc for __thread support" - if ! eend $(want__thread) ; then - echo - eerror "Could not find a gcc that supports the __thread directive!" - eerror "Please update your binutils/gcc and try again." - die "No __thread support in gcc!" - fi - - 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 - echo - eerror "You need a kernel of at least version ${NPTL_KERNEL_VERSION}" - eerror "for NPTL support!" - die "Kernel version too low!" - fi - fi - - # Building fails with too low linux-headers - ebegin "Checking linux-headers version (>=${NPTL_KERNEL_VERSION})" - if ! eend $(check_kheader_version "${min_kernel_version}") ; then - echo - eerror "You need linux-headers of at least version ${NPTL_KERNEL_VERSION}" - eerror "for NPTL support!" - die "linux-headers version too low!" - fi - - echo -} - -want_nptl() { - want_tls || return 1 - use nptl || return 1 - - # Only list the arches that cannot do NPTL - case $(tc-arch) in - hppa|m68k) return 1;; - sparc) - # >= v9 is needed for nptl. - [[ "${PROFILE_ARCH}" == "sparc" ]] && return 1 - ;; - esac - - return 0 -} - -want_linuxthreads() { - ! use nptlonly && return 0 - want_nptl || return 0 - return 1 -} - -want_tls() { - # Archs that can use TLS (Thread Local Storage) - case $(tc-arch) in - sparc) - # 2.3.6 should have tls support on sparc64 - # when using newer binutils - case ${CTARGET/-*} in - sparc64*) return 1 ;; - *) return 0 ;; - esac - ;; - x86) - # requires i486 or better #106556 - [[ ${CTARGET} == i[4567]86* ]] && return 0 - return 1 - ;; - esac - - return 0 -} - -want__thread() { - want_tls || return 1 - - # For some reason --with-tls --with__thread is causing segfaults on sparc32. - [[ ${PROFILE_ARCH} == "sparc" ]] && return 1 - - [[ -n ${WANT__THREAD} ]] && return ${WANT__THREAD} - - echo 'extern __thread int i;' > "${T}"/test-__thread.c - $(tc-getCC ${CTARGET}) -c "${T}"/test-__thread.c -o "${T}"/test-__thread.o &> /dev/null - WANT__THREAD=$? - rm -f "${T}"/test-__thread.[co] - - return ${WANT__THREAD} -} - -glibc_do_configure() { - local myconf - - # set addons - pushd "${S}" > /dev/null - local ADDONS=$(echo */configure | sed \ - -e 's:/configure::g' \ - -e 's:\(linuxthreads\|nptl\|rtkaio\|glibc-compat\)\( \|$\)::g' \ - -e 's: \+$::' \ - -e 's! !,!g' \ - -e 's!^!,!' \ - -e '/^,\*$/d') - popd > /dev/null - - if [[ -n ${PPC_CPU_ADDON_VER} ]] && [[ $(tc-arch) == ppc* ]] ; then - ADDONS="${ADDONS},powerpc-cpu" - case $(get-flag mcpu) in - 970|power4|power5|power5+) myconf="${myconf} --with-cpu=$(get-flag mcpu)" - esac - fi - - use nls || myconf="${myconf} --disable-nls" - myconf="${myconf} $(use_enable hardened stackguard-randomization)" - if [[ $(<"${T}"/.ssp.compat) == "yes" ]] ; then - myconf="${myconf} --enable-old-ssp-compat" - else - myconf="${myconf} --disable-old-ssp-compat" - fi - - use glibc-omitfp && myconf="${myconf} --enable-omitfp" - - [[ ${CTARGET} == *-softfloat-* ]] && myconf="${myconf} --without-fp" - - if [ "$1" == "linuxthreads" ] ; then - if want_tls ; then - myconf="${myconf} --with-tls" - - if want__thread ; then - myconf="${myconf} --with-__thread" - else - myconf="${myconf} --without-__thread" - fi - else - myconf="${myconf} --without-tls --without-__thread" - fi - - myconf="${myconf} --disable-sanity-checks" - myconf="${myconf} --enable-add-ons=ports,linuxthreads${ADDONS}" - myconf="${myconf} --enable-kernel=${LT_KERNEL_VERSION}" - elif [ "$1" == "nptl" ] ; then - myconf="${myconf} --with-tls --with-__thread" - myconf="${myconf} --enable-add-ons=ports,nptl${ADDONS}" - myconf="${myconf} --enable-kernel=${NPTL_KERNEL_VERSION}" - else - die "invalid pthread option" - fi - - # Since SELinux support is only required for nscd, only enable it if: - # 1. USE selinux - # 2. ! USE build - # 3. only for the primary ABI on multilib systems - if use selinux && ! use build ; then - if use multilib || has_multilib_profile ; then - if is_final_abi ; then - myconf="${myconf} --with-selinux" - else - myconf="${myconf} --without-selinux" - fi - else - myconf="${myconf} --with-selinux" - fi - else - myconf="${myconf} --without-selinux" - fi - - myconf="${myconf} - --without-cvs - --enable-bind-now - --build=${CBUILD_OPT:-${CBUILD}} - --host=${CTARGET_OPT:-${CTARGET}} - $(use_enable profile) - --without-gd - --with-headers=$(alt_build_headers) - --prefix=/usr - --libdir=/usr/$(get_libdir) - --mandir=/usr/share/man - --infodir=/usr/share/info - --libexecdir=/usr/$(get_libdir)/misc/glibc - ${EXTRA_ECONF}" - - # There is no configure option for this and we need to export it - # since the glibc build will re-run configure on itself - export libc_cv_slibdir=/$(get_libdir) - - has_version app-admin/eselect-compiler || export CC=$(tc-getCC ${CTARGET}) - - local GBUILDDIR=${WORKDIR}/build-${ABI}-${CTARGET}-$1 - mkdir -p "${GBUILDDIR}" - cd "${GBUILDDIR}" - einfo "Configuring GLIBC for $1 with: ${myconf// /\n\t\t}" - "${S}"/configure ${myconf} || die "failed to configure glibc" -} - -fix_lib64_symlinks() { - # the original Gentoo/AMD64 devs decided that since 64bit is the native - # bitdepth for AMD64, lib should be used for 64bit libraries. however, - # this ignores the FHS and breaks multilib horribly... especially - # since it wont even work without a lib64 symlink anyways. *rolls eyes* - # see bug 59710 for more information. - # Travis Tilley (08 Aug 2004) - if [ -L ${ROOT}/lib64 ] ; then - ewarn "removing /lib64 symlink and moving lib to lib64..." - ewarn "dont hit ctrl-c until this is done" - addwrite ${ROOT}/ - rm ${ROOT}/lib64 - # now that lib64 is gone, nothing will run without calling ld.so - # directly. luckily the window of brokenness is almost non-existant - use amd64 && /lib/ld-linux-x86-64.so.2 /bin/mv ${ROOT}/lib ${ROOT}/lib64 - use ppc64 && /lib/ld64.so.1 /bin/mv ${ROOT}/lib ${ROOT}/lib64 - # all better :) - ldconfig - ln -s lib64 ${ROOT}/lib - einfo "done! :-)" - einfo "fixed broken lib64/lib symlink in ${ROOT}" - fi - if [ -L ${ROOT}/usr/lib64 ] ; then - addwrite ${ROOT}/usr - rm ${ROOT}/usr/lib64 - mv ${ROOT}/usr/lib ${ROOT}/usr/lib64 - ln -s lib64 ${ROOT}/usr/lib - einfo "fixed broken lib64/lib symlink in ${ROOT}/usr" - fi - if [ -L ${ROOT}/usr/X11R6/lib64 ] ; then - addwrite ${ROOT}/usr/X11R6 - rm ${ROOT}/usr/X11R6/lib64 - mv ${ROOT}/usr/X11R6/lib ${ROOT}/usr/X11R6/lib64 - ln -s lib64 ${ROOT}/usr/X11R6/lib - einfo "fixed broken lib64/lib symlink in ${ROOT}/usr/X11R6" - fi -} - -use_multilib() { - case ${CTARGET} in - sparc64*|mips64*|x86_64*|powerpc64*|s390x*) - has_multilib_profile || use multilib ;; - *) false ;; - esac -} - -# Setup toolchain variables that would be defined in the profiles for these archs. -setup_env() { - # These should not be set, else the zoneinfo do not always get installed ... - unset LANGUAGE LANG LC_ALL - # silly users - unset LD_RUN_PATH - - if is_crosscompile || tc-is-cross-compiler ; then - multilib_env ${CTARGET} - if ! use multilib ; then - MULTILIB_ABIS=${DEFAULT_ABI} - else - MULTILIB_ABIS=${MULTILIB_ABIS:-${DEFAULT_ABI}} - fi - - # If the user has CFLAGS_ in their make.conf, use that, - # and fall back on CFLAGS. - local VAR=CFLAGS_${CTARGET//[-.]/_} - CFLAGS=${!VAR-${CFLAGS}} - fi - - setup_flags - - export ABI=${ABI:-${DEFAULT_ABI:-default}} - - if is_crosscompile || tc-is-cross-compiler ; then - local VAR=CFLAGS_${ABI} - # We need to export CFLAGS with abi information in them because - # glibc's configure script checks CFLAGS for some targets (like mips) - export CFLAGS="${!VAR} ${CFLAGS}" - fi -} - -### /ECLASS PUNTAGE ### - -if is_crosscompile ; then - SLOT="${CTARGET}-2.2" -else - SLOT="2.2" -fi - -# we'll handle stripping ourself #46186 -RESTRICT="nostrip multilib-pkg-force" - -# General: We need a new-enough binutils for as-needed -# arch: we need to make sure our binutils/gcc supports TLS -DEPEND=">=sys-devel/gcc-3.4.4 - arm? ( >=sys-devel/binutils-2.16.90 >=sys-devel/gcc-4.1.0 ) - ppc? ( >=sys-devel/gcc-4.1.0 ) - ppc64? ( >=sys-devel/gcc-4.1.0 ) - nptl? ( || ( >=sys-kernel/mips-headers-${NPTL_KERNEL_VERSION} >=sys-kernel/linux-headers-${NPTL_KERNEL_VERSION} ) ) - >=sys-devel/binutils-2.15.94 - || ( app-admin/eselect-compiler >=sys-devel/gcc-config-1.3.12 ) - >=app-misc/pax-utils-0.1.10 - virtual/os-headers - nls? ( sys-devel/gettext ) - selinux? ( !build? ( sys-libs/libselinux ) )" -RDEPEND="nls? ( sys-devel/gettext ) - selinux? ( !build? ( sys-libs/libselinux ) )" - -if [[ ${CATEGORY/cross-} != ${CATEGORY} ]] ; then - DEPEND="${DEPEND} ${CATEGORY}/gcc" - - if [[ ${CATEGORY} == *-linux* ]] ; then - if [[ ${CATEGORY} == cross-mips* ]] ; then - DEPEND="${DEPEND} >=${CATEGORY}/mips-headers-2.6.10" - else - DEPEND="${DEPEND} ${CATEGORY}/linux-headers" - fi - fi -else - DEPEND="${DEPEND} sys-libs/timezone-data" - RDEPEND="${RDEPEND} sys-libs/timezone-data" -fi - -pkg_setup() { - if want_linuxthreads ; then - ewarn "glibc-2.4 is nptl-only!" - [[ ${CHOST} == i386-* ]] && eerror "NPTL requires a CHOST of i486 or better" - die "please add USE='nptl nptlonly' to make.conf" - fi - - if use nptlonly && ! use nptl ; then - eerror "If you want nptlonly, add nptl to your USE too ;p" - die "nptlonly without nptl" - fi - - if ! type -p scanelf > /dev/null ; then - eerror "You do not have pax-utils installed." - die "install pax-utils" - fi - - # give some sort of warning about the nptl logic changes... - if want_nptl && want_linuxthreads ; then - ewarn "Warning! Gentoo's GLIBC with NPTL enabled now behaves like the" - ewarn "glibc from almost every other distribution out there. This means" - ewarn "that glibc is compiled -twice-, once with linuxthreads and once" - ewarn "with nptl. The NPTL version is installed to lib/tls and is still" - ewarn "used by default. If you do not need nor want the linuxthreads" - ewarn "fallback, you can disable this behavior by adding nptlonly to" - ewarn "USE to save yourself some compile time." - - ebeep - epause 5 - fi -} - -src_unpack() { - setup_env - - toolchain-glibc_src_unpack - - # Backwards SSP support - cd "${S}" -# For now, we force everyone to have the extra symbols -# einfon "Scanning system for __guard to see if we need SSP compat ... " -# if [[ -n $(scanelf -qyls__guard -F'#s%F' | grep -v '^/lib.*/libc-2.*.so$') ]] ; then - echo "yes" > "${T}"/.ssp.compat -# else -# # ok, a quick scan didnt find it, so lets do a deep scan ... -# if [[ -n $(scanelf -qyRlps__guard -F'#s%F' | grep -v '^/lib.*/libc-2.*.so$') ]] ; then -# echo "yes" > "${T}"/.ssp.compat -# else -# echo "no" > "${T}"/.ssp.compat -# fi -# fi -# cat "${T}"/.ssp.compat - - # Glibc is stupid sometimes, and doesn't realize that with a - # static C-Only gcc, -lgcc_eh doesn't exist. - # http://sources.redhat.com/ml/libc-alpha/2003-09/msg00100.html - # http://sourceware.org/ml/libc-alpha/2005-02/msg00042.html - echo 'int main(){}' > "${T}"/gcc_eh_test.c - if ! $(tc-getCC ${CTARGET}) "${T}"/gcc_eh_test.c -lgcc_eh 2>/dev/null ; then - sed -i -e 's:-lgcc_eh::' Makeconfig || die "sed gcc_eh" - fi - - # Some configure checks fail on the first emerge through because they - # try to link. This doesn't work well if we don't have a libc yet. - # http://sourceware.org/ml/libc-alpha/2005-02/msg00042.html - if is_crosscompile && use build; then - rm "${S}"/sysdeps/sparc/sparc64/elf/configure{,.in} - rm "${S}"/nptl/sysdeps/pthread/configure{,.in} - fi - - cd "${WORKDIR}" - find . -type f '(' -size 0 -o -name "*.orig" ')' -exec rm -f {} \; - find . -name configure -exec touch {} \; - - # Fix permissions on some of the scripts - chmod u+x "${S}"/scripts/*.sh -} - -src_compile() { - setup_env - - if [[ -z ${OABI} ]] ; then - local abilist="" - if has_multilib_profile ; then - abilist=$(get_install_abis) - einfo "Building multilib glibc for ABIs: ${abilist}" - elif is_crosscompile || tc-is-cross-compiler ; then - abilist=${DEFAULT_ABI} - fi - if [[ -n ${abilist} ]] ; then - OABI=${ABI} - for ABI in ${abilist} ; do - export ABI - src_compile - done - ABI=${OABI} - unset OABI - return 0 - fi - fi - - if just_headers ; then - toolchain-glibc_headers_compile - else - toolchain-glibc_src_compile - fi -} - -src_test() { - setup_env - - if [[ -z ${OABI} ]] && has_multilib_profile ; then - OABI=${ABI} - einfo "Testing multilib glibc for ABIs: $(get_install_abis)" - for ABI in $(get_install_abis) ; do - export ABI - einfo " Testing ${ABI} glibc" - src_test - done - ABI=${OABI} - unset OABI - return 0 - fi - - toolchain-glibc_src_test -} - -src_strip() { - # Now, strip everything but the thread libs #46186, as well as the dynamic - # linker, else we cannot set breakpoints in shared libraries due to bugs in - # gdb. Also want to grab stuff in tls subdir. whee. -#when new portage supports this ... -# env \ -# -uRESTRICT \ -# CHOST=${CTARGET} \ -# STRIP_MASK="/*/{,tls/}{ld-,lib{pthread,thread_db}}*" \ -# prepallstrip - pushd "${D}" > /dev/null - - if ! is_crosscompile ; then - mkdir -p "${T}"/strip-backup - for x in $(find "${D}" -maxdepth 3 \ - '(' -name 'ld-*' -o -name 'libpthread*' -o -name 'libthread_db*' ')' \ - -a '(' '!' -name '*.a' ')' -type f -printf '%P ') - do - mkdir -p "${T}/strip-backup/${x%/*}" - cp -a -- "${D}/${x}" "${T}/strip-backup/${x}" || die "backing up ${x}" - done - fi - env -uRESTRICT CHOST=${CTARGET} prepallstrip - if ! is_crosscompile ; then - cp -a -- "${T}"/strip-backup/* "${D}"/ || die "restoring non-stripped libs" - fi - - popd > /dev/null -} - -src_install() { - setup_env - - if [[ -z ${OABI} ]] ; then - local abilist="" - if has_multilib_profile ; then - abilist=$(get_install_abis) - einfo "Installing multilib glibc for ABIs: ${abilist}" - elif is_crosscompile || tc-is-cross-compiler ; then - abilist=${DEFAULT_ABI} - fi - if [[ -n ${abilist} ]] ; then - OABI=${ABI} - for ABI in ${abilist} ; do - export ABI - src_install - done - ABI=${OABI} - unset OABI - src_strip - return 0 - fi - fi - - if just_headers ; then - toolchain-glibc_headers_install - else - toolchain-glibc_src_install - fi - [[ -z ${OABI} ]] && src_strip -} - -pkg_preinst() { - toolchain-glibc_pkg_preinst -} - -pkg_postinst() { - toolchain-glibc_pkg_postinst -}