From be7021241c5aa67cff732ea4c5c8eba5b1634ac9 Mon Sep 17 00:00:00 2001 From: "Anthony G. Basile" Date: Sun, 1 Feb 2015 04:10:08 +0000 Subject: [PATCH] Backport fix to allow immediate values as 6th syscall arg in i386, bug #538396 Package-Manager: portage-2.2.14/cvs/Linux x86_64 Manifest-Sign-Key: 0xF52D4BBA --- sys-libs/uclibc/ChangeLog | 8 +- sys-libs/uclibc/Manifest | 32 +- sys-libs/uclibc/uclibc-0.9.33.2-r13.ebuild | 4 +- sys-libs/uclibc/uclibc-0.9.33.2-r14.ebuild | 348 +++++++++++++++++++++ 4 files changed, 374 insertions(+), 18 deletions(-) create mode 100644 sys-libs/uclibc/uclibc-0.9.33.2-r14.ebuild diff --git a/sys-libs/uclibc/ChangeLog b/sys-libs/uclibc/ChangeLog index 0a9925bc71dd..96af2883348f 100644 --- a/sys-libs/uclibc/ChangeLog +++ b/sys-libs/uclibc/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for sys-libs/uclibc # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/uclibc/ChangeLog,v 1.95 2015/01/10 16:26:20 blueness Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/uclibc/ChangeLog,v 1.96 2015/02/01 04:09:56 blueness Exp $ + +*uclibc-0.9.33.2-r14 (01 Feb 2015) + + 01 Feb 2015; Anthony G. Basile + +uclibc-0.9.33.2-r14.ebuild, uclibc-0.9.33.2-r13.ebuild: + Backport fix to allow immediate values as 6th syscall arg in i386, bug #538396 *uclibc-0.9.33.2-r13 (10 Jan 2015) diff --git a/sys-libs/uclibc/Manifest b/sys-libs/uclibc/Manifest index d221256c9c35..f6d771109f03 100644 --- a/sys-libs/uclibc/Manifest +++ b/sys-libs/uclibc/Manifest @@ -8,6 +8,7 @@ DIST uClibc-0.9.33.2-patches-12.tar.bz2 27137 SHA256 3582de8f2df50dd70b639ed3be6 DIST uClibc-0.9.33.2-patches-13.tar.bz2 28146 SHA256 80c3e53927bd5c850b2b9ae7ba43e489b50cd7e7d05174074f22fc81eda448b6 SHA512 60d82b67dc3451593a6ab221087c5fea47fab2016821fd3011affa133f1dc84660f46d70821b678a018fb7329928147eaff9722de9157fb99d44893ab5a10319 WHIRLPOOL 820ae31c449347ef9e47916831ee77b2adb968ffb9ab6e6b1072eea9c05efed2ec5a2245ffd6df7abd1f66f5214f5388adf22f656c3405bdc29108c0b2a71451 DIST uClibc-0.9.33.2-patches-14.tar.bz2 28773 SHA256 3d2adac6d27db2a6d9c0ed93eb19e97a1a2fa24835a6bfc102767cd6dea3971b SHA512 45fdbceedf0e80bb0adafad37d1d5ca3ff4315def576bb2570bc26abebcdb60125ee01fb69cdfe72353bac4a664e1e9c7af0671b84f48f546ac32dabbea49e3e WHIRLPOOL 899c5f4781eaa5291ff755221a3895dc4c563ac32ea48ab9bad8715373c91a06e23b9512d65fab093ce5d6e658727fcfa613393b40bccc5b1b5a93e1a42b1906 DIST uClibc-0.9.33.2-patches-15.tar.bz2 31298 SHA256 a1f5b1c100bee1218d24fe27aa00ed9996588448b9ccd4df85ad365d1993d8a7 SHA512 79a1982506f198598a955533e6d7c738f87a3fa74225b2b6ab32bd636642e683d024ad0860d28fe2b42fe6b2c982f4172f950caa62f31761a19e4a49116d5d36 WHIRLPOOL 6272ccf3a1340dde0b754fec996ec2063b45250828f2bedb4ea6e59f8a30e009395ff794b99c46b887e9d71c1499fc1543fa60c1cc09b6169efc9e9161bd880c +DIST uClibc-0.9.33.2-patches-16.tar.bz2 31666 SHA256 26b9261edd23879c1fa3ef4b77221fc808c56125de6943a55b125e066d38e960 SHA512 d95ae817dfaa04504635512150df726d3996bfee443d4ce93894f09c81bad0d2a0718fb6f58e52f354796e4a2f0dec1ff9f0adda3ae6453020586c01b612a0dc WHIRLPOOL 96440db3ffca2f2b9b48aeca40563d06f98068ca10e510fdfd596eae6bad493c03f3ad869a4153593e31beb1f746b237cf70d9b9c221ed1e1102e761cf08432a DIST uClibc-0.9.33.2-patches-2.tar.bz2 2854 SHA256 a43192a582ad5428daaceec23aaf096ac037a723eb79724aa716f3850674fecd SHA512 f7ef2bc1a2498e2215828c52003a4ddc4ebe79dd43def367398fad7895c5e5ce9ae4ce68e51141193ef7d47d0727ed477c7b00fbb95b47cd6f251aacbd15048c WHIRLPOOL 80bd9de5b4c5eb671a462a094cd016d0931885ca4604a489017cc36ae5d960a5f08cb72185011d796d5bf9c4809ed2331416ca9b0dae00991ac1e998fc31f7c9 DIST uClibc-0.9.33.2-patches-3.tar.bz2 4002 SHA256 2c06d1f80c8b7e5b0ef60571720273e2ccc55551a3dacc9ed5f7c04e9eda7018 SHA512 935dded858fbd4ce7317bdd1c097f26d8752bd241c12c9b1420e621bb80e59d8f74f84a8ae4df86bb07a03b2354e6c8ce4ba980aaa6d9be63c5e518da393db52 WHIRLPOOL d72989fbc7c700191b5703591bff4ff39ba6a3bb9c230cefb11c21cb2cd5f3f25bd52e8f6783bc651bd273d15146246491923bb1c357ce117da496910acefe6e DIST uClibc-0.9.33.2-patches-5.tar.bz2 10084 SHA256 9c9814360470b1ff3308a85fe8a61ce35eb57c288301b7244450b894f9627a29 SHA512 efd70db740d090d4791e4afc33db2a26df9151ca5be8bcd499ce65d33222af784cb11cbc1f6a4288cab5a4ad1b686488ce836bb62629a9c04f643d40706ac917 WHIRLPOOL b88c36d0eb3f3398a5e96d155cdd8d1b3f6c02ecba4d3f7b167f35c983cf6098e3795839f3f8e0564a91d364c6e2aa0408adcc4647af2143be51a892f2508b27 @@ -20,7 +21,8 @@ EBUILD uclibc-0.9.33.2-r1.ebuild 10638 SHA256 b3c450389a1c396563382e8061fa206bae EBUILD uclibc-0.9.33.2-r10.ebuild 9111 SHA256 51da60846dd833b34f380d2e02be5f76fb7fff36fab173ba68fad74847b48a8a SHA512 df290b2a19a2b26b72fbcc0bbac4831f270e458c51c1576cc18114fb1292fd8558fae5061d3504f33c20c716b70b11b4874cdb0e30c1c5c439377de60f81b74c WHIRLPOOL 51b1dd43c1dfd6d271f55287f9672fbd5fb9ea888b103679d3719d46c9c323f2ff04b210c4cc286188563d1edbdf7c94e7fe5e28afeacc6017fd014e9e898c7b EBUILD uclibc-0.9.33.2-r11.ebuild 9111 SHA256 4d6d676afb9b5a0024e1cc0b7572cf972a3c0d634ea5b5bdbde49047453613f8 SHA512 f3567ee9895bdefa4421d02a21ef3be493c62767af18f8f477414e4aba515cae79a7560aa17414a58ab71056e02b8bb6a8da3a9985586bf282ff8e6d2ff63aa6 WHIRLPOOL 728024ea502e379d67e4b3b27f636b80bf28d99657a9534dcd7c961b826486fd4810b7b5088a7d1facf08354554b8c14c12d057d76d91e72e99480bba9c2c8d8 EBUILD uclibc-0.9.33.2-r12.ebuild 9231 SHA256 aca7847308bd9cf0937a59dc05dbe482bb2be20fba7a257e1a19450d645d4cdb SHA512 8d4a23bbd9defcbf826ef89cbf0680bec565e81fcdfeef295dc49708d9e4cdf10c51b4a1ac49afa589a59093636f722e19685d416ee3e282ddf6e0f3446e1398 WHIRLPOOL 1bf246048ca71fbc0f8b27169a7d93502489ff78af9ea11aab253e4cf9b49c231b68c9a07df2f43989ed9dff7221fcf154d55a5b6b2b82d032f2eaa5f76d610d -EBUILD uclibc-0.9.33.2-r13.ebuild 9233 SHA256 0f4662059891c8a78eced0367ba16411dad79318fbf633b326435b2a35bb0910 SHA512 5306ae6bc3aa6198193475b144929efc032a4e8444435d45be85333ae5a2765aeeefc83092174f43d950e329465583023e0f8d1855489025e5c1c578c7bcc741 WHIRLPOOL d76526041fd461d636f31958d24fa44df95ce951c24433701fec19a1c493fe08ed3aeae18b788292faac4d782c638b504fec992084bc0a45aecd6c14ad438bab +EBUILD uclibc-0.9.33.2-r13.ebuild 9228 SHA256 fced5b5ce14ccd8335d268a07f987b15baa1b4e136a9b697d65abfda1a667115 SHA512 d9d26c532afe0afcf990ded329cfff802268e4f99c32b63bb732e1418e872f74aacc5662f795bfaf4e3f056b96eb7439c95cc7999b84effd1b50e36d7cd55fb2 WHIRLPOOL 1238947d947ff7ffcbf46778b82123d75a85ba5cf0e76f3066c5bde4e1e594c005024ce5a333c21589e68d8b80c9a35306f3120aac4a2b1797a022df647435a3 +EBUILD uclibc-0.9.33.2-r14.ebuild 9233 SHA256 9b39dee19546f5e358c88f5d4d37b8b44ab19c5aee6895f986718a8e1d474183 SHA512 c5d8de9cd37ad27706aab2b7b864923bb102b3bfde12e20140555af1aed94ad4aba1340906628e573782f09996f77beb4de518589eae56650cbf967736151580 WHIRLPOOL d3215c20e0598d0bd97b3bca03f729792414bd9cd93a634cf0e6685cf5a9c3e8b2cdf80aac428c5e57f67f39aa2ed5d0ddff0245867a27b4f934f569a4806427 EBUILD uclibc-0.9.33.2-r2.ebuild 10631 SHA256 08f05130b3b7b7df2f0a0bb3330e2599132e872f2e38fe9f9b3586df6a180deb SHA512 a5fa061a09d21aa5d743d5d118e2a60357eff384a959e4e099d9056c557fd2f3d995dd79b01c25e7cd905ff66836e2a540b14a1fd6fcf9229db441763c9d17f5 WHIRLPOOL 60f695ca98a92f99618c4bd1c5adc68527c407c30b9ef22a83aafa9372ff16f4e6f67821cbd5aa48bae8d327e9d16c6ac5d5cb5fe39819f04ba492b1d13a9a72 EBUILD uclibc-0.9.33.2-r3.ebuild 10768 SHA256 5efe6a51165a63f7821accf3dd4b09ffed5e0729c965cac560075e6df2e90480 SHA512 5179bcee9831d3d61cbd9fbeeaa615bc7bd71c5c7d81ba2e107bfe65503439ec3a166ed91f3112ee33fea63a53b2505d95795c8fcf94d666373e3e1e918e52ef WHIRLPOOL e9b20565a20bd6e8a6c9c17168629cb885c40a5b9d246d4656c363eee654b4aeda621c81e552fa36ab1cc0292a24a709d0c9cb99d21c30a1952f9f44f5594878 EBUILD uclibc-0.9.33.2-r4.ebuild 9109 SHA256 3b46d25a027c76ebf0c341c0766c1f6272747d29f7fb2790435585efdea542a6 SHA512 5bf8844d582fcdebf05f022866ecd4b14687282f4b2d4e8c1cb1a670af5d8fde653c422778bea8c96aff6bf52bcb807ab1c9f4398aaf1cad9d02f867d2689220 WHIRLPOOL 9e9156aa332d54cb7a03c641038d43344ae4dec64521b3eb5052183b43e60068e4970c80ecf72e9f1a0157664a0cace121c60671b9ef1b75e6394d490b17bc4c @@ -32,22 +34,22 @@ EBUILD uclibc-0.9.33.2-r9.ebuild 9117 SHA256 c7fd2c6d1979dee89dc827486e6322dd223 EBUILD uclibc-0.9.33.2.ebuild 10630 SHA256 db49c741a424d2433ec3978184c979b2a9fcb903f83eeb110adcec76940b342e SHA512 75e974586c57662f2f39d6a80a1162ec611b31b4dfa881a2ab2094f6b35c6b9375c98a53c957580395b4754cc8c27b4a53737b6d9a0f099ab4a3c45ae1169125 WHIRLPOOL 9f8f01465c556c372d926e701abef49770c1772b40ad83325439343d22561a4b1f4cf6c9bcdba78815f2e8af11d3455deee3dd81225c54b83de3dd132e2462c9 EBUILD uclibc-0.9.33.9999.ebuild 9249 SHA256 85c82e7421216252005ca0e92b804620ec6f05d1c2b56848dce1cd04613ddd56 SHA512 650de1e1ac2afe557f2eae0b3ae9e1dcbdc818908b963bb6486f6f13f82be25ea859a039e7f6ca0c78c3ad8d0be685195da3238c94860a521b8d184f5a998eea WHIRLPOOL a6018478e4b4ada31a1ebe1db02cb5c5744f2f8a24adbcee6cbf4320c4e5433668af879cbd867c0b3d873077e93a8a3ec83b877bdae00ba7cc7b2370c3c36cfb EBUILD uclibc-9999.ebuild 9221 SHA256 35be1c605d8371ed9db7528899eaaa3c393d877342c6f9214f7eb873d4b63cbd SHA512 e88f3bc14e75f59ef48162cd6173c8464d4edff48d13f852efa499eb88ddc7744be5511d766abfb07e70b64c22722f0024adcb18a516bc63d5109e65f4accd58 WHIRLPOOL 8b49f9e71178d5d3dbb48df7c2d659ef723a57d226360cc4878f2c6d105c67a0315e34dafeee7b99df482be2a2b1114914a4f2a4841b5faf83748d5826869d11 -MISC ChangeLog 24677 SHA256 fc0b2e5a271799ac4dc7045f3902fce02616108e3af86fed7d3bc08109bd4a7c SHA512 634800c4edafe7e9e95940d45cf8e435d3541131a1ed7a1067a33003f4cedbd2a61d1870f1e792b817cbee0ff2765ae9f62d6e41b16b2f9208ff85c9247254a1 WHIRLPOOL cfd11ce0e2166f68946c1812528ca6998a83f10a10a610113a47fab59838daa9a8b5b70bfaaa943d590b6a2da339bb36f1f7bbf7bb3027bfa0ff49a508bc7c22 +MISC ChangeLog 24909 SHA256 c11d6d5563f86d5a97bb98574e7c432c6e1a4f26a30bc0d687cb98966f926b55 SHA512 a4e2f7a74d5361b4fed6f9b066d89d02a2d280e1455f05871c3918dea82a0bb89553a36dfa5fbb99c140a7cc356cd054ede39452100e5b23f7f8c3b017d77ffe WHIRLPOOL 25245e4b13b9198f1ae847ea6d2e661648e101a14531f084bdf1d5275fb855527e97067bb66ab54091de2a27c83d7171e2ddfae54a7c6c0eb25ea3150419febd MISC metadata.xml 1292 SHA256 b4bdcfd7ab17ae024dcd8c22acab27dd02fbb6232fad9f9f2e266bed316b726e SHA512 c6f18ed33a662a22c8ea24342ab604cbf63009360f6f7ca25560f64876fa5fc81b21f6791fb0f3b7e9205171577334b00e8d81d05953dfd3b02e7304f504424e WHIRLPOOL 29c8024561257c0f36af0a107d891358039ae4631f3218527b30b490abe8cb409e91112945c4ff371cecbf43978b0946d64d873a5a914d025093b4e407ac5687 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 -iQIcBAEBCAAGBQJUsVMDAAoJEJOE+m71LUu6cgsP/A0txdsl2YuBZGGq2yHGguEB -MA9OpU4iId31qB+YPSFDIle7aJihwbQzcANFeOAk9C6fFEnu3IdgTilNpZ96dRhX -BQo3AdA7R1pHpaNOfhIvZQMLWE2BCllqzxl0T2awro8SQn24B/a5YDKthJlfyPm5 -/0efPyNRnlsrh3WeNfetsrutNhbsQeFjDWd3A7TnUe0uIAf5yqQ3KguF/nLmPAP0 -IpgHP+nnNIoJ+y592foaHYmgRWn4SFs5EPqPl+xLU04nQGsfcfQYpET5TcAGpelM -5J371VMpJJO5gagmjvf2x69SuFACRpEKQFpIXq+0SllVRUiHbeUWn+Vo6C5rqLng -tpcgf+eMKcuy81UVROSm4J48NiVrstRnNuq1s0A9JK5wbEu4iKqUnaJwNc7TzmT/ -ou0uo3ANSKHPkTlpyHuPeZObsppzjMfnrs9zLsaKvUiuCc/K40ZcvPtmNI7MRfKX -fOG3BXNew8t9Jwt47bFThJENrGwo/9uk7Pdia037YSmGZZQ0gS8JYwWAC4c56wbl -4+V7t77s8B6DqMkfCMyiVwpFHhAnAtjsi3YE2qIu1Ira4iqIpnp/QWjwEExIH3To -AC6MmLDkAZbxRCMkkUhZzbt/3WnpbTYtpK3+yCrlr7gecOivzkxYsBbisehipu7N -2e6LbCBOzFEt4s5eqxUh -=7P8v +iQIcBAEBCAAGBQJUzaekAAoJEJOE+m71LUu6v44P/iJKOEXSPdo4DJotqOuWECbS +hqlfYxmpi4AZkr6f7EDNu7XvzrMEjZcjzbEd07qNcOR8W5POBhdTq8blZQNyfsUI +PiMekrXMnILAnzvFDVgQcl52NiwSu4ZCiHX96F+H3GKQZZ/qFCaDhAnwtuwtdy/7 +Y2scavDDtTQ5L9q2y+Lv1bKZ0zbfrlbVmsATVBnu8HL8JknrZXAR/iyo+CNEPQoS +fRga0fHfyX6mAoVEJBMnkKw3NjwOK/y3ADxAsDocMTYopFBe/46PWBMiWdEKVm4S +4yFutDKuTgAYICJbftsCpCksHHumYhJo8G+Spam9ZX6Bw13ByveBOi1GXo/Dyc8t +g8lwkbMyZNnQMH/EoSWcTUrdFxvdhdqDe5rU+I7LG21t5muB+ALZlmkzy9PqG6bX +Ua1ehMINfEBzYu6neDOukyEMGOwfNRuK8aKK62Lj8VC7IljPTn0eBXiq1X6i1jS7 +vOrbzcsAJHjCF5aLoafm1qPWQqvOeKO1Sm5bdaot164b7SkM2m6u2SmhEWM0yAaS +veNRhqZjmRVbVisJnwuTOsrbc1nc4R5Yor87gXt97L7O8onB0LGZQRRgBxEW1vcU +nsTecKOGj0KaE51ENwiUmuUntvSnfFAmVcjTvfrsbD5X3+QGfm08XpxGqs/Lk34s +QbLeFb5/9yQB3Y9Tdefv +=91XP -----END PGP SIGNATURE----- diff --git a/sys-libs/uclibc/uclibc-0.9.33.2-r13.ebuild b/sys-libs/uclibc/uclibc-0.9.33.2-r13.ebuild index 096143caeb86..0c473a555c5c 100644 --- a/sys-libs/uclibc/uclibc-0.9.33.2-r13.ebuild +++ b/sys-libs/uclibc/uclibc-0.9.33.2-r13.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/uclibc/uclibc-0.9.33.2-r13.ebuild,v 1.1 2015/01/10 16:26:20 blueness Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/uclibc/uclibc-0.9.33.2-r13.ebuild,v 1.2 2015/02/01 04:09:56 blueness Exp $ inherit eutils flag-o-matic multilib toolchain-funcs savedconfig if [[ ${PV} == "9999" ]] ; then @@ -23,7 +23,7 @@ if [[ ${PV} != "9999" ]] ; then PATCH_VER="15" SRC_URI="http://uclibc.org/downloads/${MY_P}.tar.bz2 ${PATCH_VER:+mirror://gentoo/${MY_P}-patches-${PATCH_VER}.tar.bz2}" - KEYWORDS="-* ~amd64 ~arm ~m68k ~mips ~ppc ~sh ~sparc ~x86" + KEYWORDS="-* ~amd64 ~arm ~m68k ~mips ~ppc ~sh ~sparc" fi LICENSE="LGPL-2" diff --git a/sys-libs/uclibc/uclibc-0.9.33.2-r14.ebuild b/sys-libs/uclibc/uclibc-0.9.33.2-r14.ebuild new file mode 100644 index 000000000000..bc8b0e7fb6d4 --- /dev/null +++ b/sys-libs/uclibc/uclibc-0.9.33.2-r14.ebuild @@ -0,0 +1,348 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-libs/uclibc/uclibc-0.9.33.2-r14.ebuild,v 1.1 2015/02/01 04:09:56 blueness Exp $ + +inherit eutils flag-o-matic multilib toolchain-funcs savedconfig +if [[ ${PV} == "9999" ]] ; then + EGIT_REPO_URI="git://git.busybox.net/uClibc" + inherit git-2 +fi + +export CBUILD=${CBUILD:-${CHOST}} +export CTARGET=${CTARGET:-${CHOST}} +if [[ ${CTARGET} == ${CHOST} ]] ; then + if [[ ${CATEGORY/cross-} != ${CATEGORY} ]] ; then + export CTARGET=${CATEGORY/cross-} + fi +fi + +MY_P=uClibc-${PV} +DESCRIPTION="C library for developing embedded Linux systems" +HOMEPAGE="http://www.uclibc.org/" +if [[ ${PV} != "9999" ]] ; then + PATCH_VER="16" + SRC_URI="http://uclibc.org/downloads/${MY_P}.tar.bz2 + ${PATCH_VER:+mirror://gentoo/${MY_P}-patches-${PATCH_VER}.tar.bz2}" + KEYWORDS="-* ~amd64 ~arm ~m68k ~mips ~ppc ~sh ~sparc ~x86" +fi + +LICENSE="LGPL-2" +SLOT="0" +IUSE="debug hardened iconv ipv6 nptl rpc ssp uclibc-compat wordexp crosscompile_opts_headers-only" +RESTRICT="strip" + +S=${WORKDIR}/${MY_P} + +is_crosscompile() { + [[ ${CHOST} != ${CTARGET} ]] +} +alt_build_kprefix() { + if [[ ${CBUILD} == ${CHOST} && ${CTARGET} == ${CHOST} ]] ; then + echo /usr/include + else + echo /usr/${CTARGET}/usr/include + fi +} + +just_headers() { + use crosscompile_opts_headers-only && is_crosscompile +} + +uclibc_endian() { + # XXX: this wont work for a toolchain which is bi-endian, but we + # dont have any such thing at the moment, so not a big deal + touch "${T}"/endian.s + $(tc-getAS ${CTARGET}) "${T}"/endian.s -o "${T}"/endian.o + case $(file "${T}"/endian.o) in + *" MSB "*) echo "BIG";; + *" LSB "*) echo "LITTLE";; + *) echo "NFC";; + esac + rm -f "${T}"/endian.{s,o} +} + +pkg_setup() { + if [ ${CTARGET} = ${CHOST} ] ; then + case ${CHOST} in + *-uclinux*|*-uclibc*) ;; + *) die "Use sys-devel/crossdev to build a uclibc toolchain" ;; + esac + fi +} + +check_cpu_opts() { + case ${CTARGET} in + # Need to handle $ABI here w/mips. + mips[1234]*) export UCLIBC_CPU="MIPS_ISA_${CTARGET:4:1}";; + sh[2345]*) export UCLIBC_CPU="SH${CTARGET:2:1}";; + i[3456]86*) export UCLIBC_CPU="${CTARGET:1:1}86";; + # XXX: Should figure out how to handle sparc. + esac + + if use nptl ; then + case ${CTARGET} in + i386*) + die "Your target has no support for NPTL" + ;; + esac + fi +} + +kconfig_q_opt() { + local flag=$1; shift + case ${flag} in + y|n) ;; + *) flag=$(usex ${flag} y n) ;; + esac + + local var="defs_${flag}" + eval "${var}+=( $* )" +} + +get_opt() { + ( + unset ${1} + . ${2:-"${S}"/.config} + echo ${!1} + ) +} + +src_oldconfig() { + yes "" 2>/dev/null | emake -s oldconfig >/dev/null +} +src_config() { + restore_config .config + if [ -f .config ]; then + src_oldconfig + return 0 + else + ewarn "Could not locate user configfile, so we will save a default one" + fi + + emake ARCH=${target} defconfig >/dev/null || die + + local defs_{y,n} defs + + defs=( + DO{DEBUG_PT,ASSERTS} + SUPPORT_LD_DEBUG_EARLY + UCLIBC_HAS_PROFILING + ) + kconfig_q_opt n "${defs[@]}" + kconfig_q_opt debug DODEBUG SUPPORT_LD_DEBUG + + sed -i -e '/ARCH_.*_ENDIAN/d' .config + kconfig_q_opt y "ARCH_WANTS_$(uclibc_endian)_ENDIAN" + + if [[ ${CTARGET} == arm* ]] ; then + kconfig_q_opt n CONFIG_ARM_OABI + kconfig_q_opt y CONFIG_ARM_EABI + fi + + defs=( + MALLOC_GLIBC_COMPAT + DO_C99_MATH + UCLIBC_HAS_{CTYPE_CHECKED,WCHAR,HEXADECIMAL_FLOATS,GLIBC_CUSTOM_PRINTF,FOPEN_EXCLUSIVE_MODE,GLIBC_CUSTOM_STREAMS,PRINTF_M_SPEC} + UCLIBC_HAS_FENV + UCLIBC_HAS_{N,}FTW + UCLIBC_HAS_GNU_GLOB + UCLIBC_HAS_LIBUTIL + UCLIBC_HAS_PROGRAM_INVOCATION_NAME + UCLIBC_HAS_RESOLVER_SUPPORT + UCLIBC_HAS_TZ_FILE_READ_MANY + UCLIBC_HAS_UTMPX + UCLIBC_SUPPORT_AI_ADDRCONFIG + UCLIBC_SUSV3_LEGACY + UCLIBC_SUSV3_LEGACY_MACROS + UCLIBC_SUSV4_LEGACY + UCLIBC_USE_NETLINK + PTHREADS_DEBUG_SUPPORT + ) + kconfig_q_opt y "${defs[@]}" + kconfig_q_opt n UCLIBC_HAS_CTYPE_UNSAFE + kconfig_q_opt n UCLIBC_HAS_LOCALE + kconfig_q_opt n HAS_NO_THREADS + kconfig_q_opt ipv6 UCLIBC_HAS_IPV6 + kconfig_q_opt nptl UCLIBC_HAS_THREADS_NATIVE + kconfig_q_opt !nptl LINUXTHREADS_OLD + kconfig_q_opt rpc UCLIBC_HAS_{,{FULL,REENTRANT}_}RPC + kconfig_q_opt wordexp UCLIBC_HAS_WORDEXP + kconfig_q_opt uclibc-compat UCLIBC_HAS_LIB{NSL,RESOLV}_STUB COMPAT_ATEXIT + + # we need to do it independently of hardened to get ssp.c built into libc + kconfig_q_opt y UCLIBC_HAS_SSP + kconfig_q_opt n UCLIBC_HAS_SSP_COMPAT + kconfig_q_opt y UCLIBC_HAS_ARC4RANDOM + kconfig_q_opt n PROPOLICE_BLOCK_ABRT + kconfig_q_opt y PROPOLICE_BLOCK_SEGV + + # arm/mips do not emit PT_GNU_STACK, but if we enable this here + # it will be emitted as RWE, ppc has to be checked, x86 needs it + # this option should be used independently of hardened + if has $(tc-arch) x86 || has $(tc-arch) ppc ; then + kconfig_q_opt y UCLIBC_BUILD_NOEXECSTACK + else + kconfig_q_opt n UCLIBC_BUILD_NOEXECSTACK + fi + kconfig_q_opt y UCLIBC_BUILD_RELRO + kconfig_q_opt hardened UCLIBC_BUILD_PIE + kconfig_q_opt hardened UCLIBC_BUILD_NOW + kconfig_q_opt !ssp SSP_QUICK_CANARY + kconfig_q_opt ssp UCLIBC_BUILD_SSP + + local def + for def in 1 2 ; do + # Run twice as some config opts depend on others being enabled first. + for def in ${defs_y[@]} ; do + sed -i -e "s:.*\<${def}\>.*set:${def}=y:g" .config + done + for def in ${defs_n[@]} ; do + sed -i -e "s:${def}=y:# ${def} is not set:g" .config + done + src_oldconfig + done + + einfo "Enabled options:" + for def in ${defs_y[@]} ; do + einfo " " $(grep "^${def}=y" .config || echo "could not find ${def}") + done + einfo "Disabled options:" + for def in ${defs_n[@]} ; do + einfo " " $(grep "^# ${def} is not set" .config || echo "could not find ${def}") + done + + # setup build and run paths + sed -i \ + -e "/^CROSS_COMPILER_PREFIX/s:=.*:=\"${CTARGET}-\":" \ + -e "/^KERNEL_HEADERS/s:=.*:=\"$(alt_build_kprefix)\":" \ + -e "/^SHARED_LIB_LOADER_PREFIX/s:=.*:=\"/$(get_libdir)\":" \ + -e "/^DEVEL_PREFIX/s:=.*:=\"/usr\":" \ + -e "/^RUNTIME_PREFIX/s:=.*:=\"/\":" \ + -e "/^UCLIBC_EXTRA_CFLAGS/s:=.*:=\"${UCLIBC_EXTRA_CFLAGS}\":" \ + .config || die + + src_oldconfig +} + +src_unpack() { + if [[ ${PV} == "9999" ]] ; then + git-2_src_unpack + else + unpack ${A} + fi + cd "${S}" + if [[ -n ${PATCH_VER} ]] ; then + EPATCH_SUFFIX="patch" epatch "${WORKDIR}"/patch + fi + + epatch_user + + check_cpu_opts + + echo + einfo "Runtime Prefix: /" + einfo "Devel Prefix: /usr" + einfo "Kernel Prefix: $(alt_build_kprefix)" + einfo "CBUILD: ${CBUILD}" + einfo "CHOST: ${CHOST}" + einfo "CTARGET: ${CTARGET}" + einfo "CPU: ${UCLIBC_CPU:-default}" + einfo "ENDIAN: $(uclibc_endian)" + echo + + ########## CPU SELECTION ########## + + local target=$(tc-arch) config_target + case ${target} in + amd64) target="x86_64";; + arm) target="arm"; config_target="GENERIC_ARM";; + avr) target="avr32";; + mips) target="mips"; config_target="MIPS_ISA_1";; + ppc) target="powerpc";; + sh) target="sh"; config_target="SH4";; + x86) target="i386"; config_target="486";; + esac + if [[ -n ${config_target} ]] ; then + sed -i -e "s:default CONFIG_${config_target}:default CONFIG_${UCLIBC_CPU:-${config_target}}:" \ + extra/Configs/Config.${target} || die + fi + sed -i -e "s:^HOSTCC.*=.*:HOSTCC=$(tc-getBUILD_CC):" Rules.mak + + src_config + + if use iconv ; then + # Run after make clean, otherwise files removed + find ./extra/locale/charmaps -name "*.pairs" > extra/locale/codesets.txt + if [[ ! -f /etc/locale.gen ]] ; then + # See ./extra/locale/LOCALES for examples + die "Please create an appropriate /etc/locale.gen for locale support" + fi + echo -e "@euro e\n@cyrillic c\n#---\nUTF-8 yes\n8-BIT yes\n#---\n\n" > ./extra/locale/locales.txt + cat /etc/locale.gen >> ./extra/locale/locales.txt + fi +} + +src_compile() { + emake headers || die + just_headers && return 0 + + emake || die + if is_crosscompile ; then + emake -C utils hostutils || die + else + emake utils || die + fi +} + +src_test() { + is_crosscompile && return 0 + + # assert test fails on pax/grsec enabled kernels - normal + # vfork test fails in sandbox (both glibc/uclibc) + emake UCLIBC_ONLY=1 check || die +} + +src_install() { + local sysroot=${D} + is_crosscompile && sysroot+="/usr/${CTARGET}" + + local target="install" + just_headers && target="install_headers" + emake DESTDIR="${sysroot}" ${target} || die + + save_config .config + + # remove files coming from kernel-headers + rm -rf "${sysroot}"/usr/include/{linux,asm*} + + # 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 usr/include /usr/${CTARGET}/sys-include + if ! just_headers && [[ -n $(get_opt HAVE_SHARED) ]] ; then + newbin utils/ldconfig.host ${CTARGET}-ldconfig || die + newbin utils/ldd.host ${CTARGET}-ldd || die + fi + return 0 + fi + + emake DESTDIR="${D}" install_utils || die + dobin extra/scripts/getent + dodoc Changelog* README TODO docs/*.txt DEDICATION.mjn3 +} + +pkg_postinst() { + is_crosscompile && return 0 + + if [ ! -e "${ROOT}"/etc/TZ ] ; then + ewarn "Please remember to set your timezone in /etc/TZ" + mkdir -p "${ROOT}"/etc + echo "UTC" > "${ROOT}"/etc/TZ + fi + [ "${ROOT}" != "/" ] && return 0 + # update cache before reloading init + ldconfig + # reload init ... + /sbin/telinit U 2>/dev/null +} -- 2.26.2