diff options
Diffstat (limited to 'sys-libs/glibc')
| -rw-r--r-- | sys-libs/glibc/Manifest | 16 | ||||
| -rw-r--r-- | sys-libs/glibc/glibc-2.30-r9.ebuild | 2 | ||||
| -rw-r--r-- | sys-libs/glibc/glibc-2.31-r6.ebuild (renamed from sys-libs/glibc/glibc-2.31-r4.ebuild) | 57 | ||||
| -rw-r--r-- | sys-libs/glibc/glibc-2.32.ebuild (renamed from sys-libs/glibc/glibc-2.31-r5.ebuild) | 18 | ||||
| -rw-r--r-- | sys-libs/glibc/glibc-9999.ebuild | 24 |
5 files changed, 61 insertions, 56 deletions
diff --git a/sys-libs/glibc/Manifest b/sys-libs/glibc/Manifest index 71de4a766526..197258dc101b 100644 --- a/sys-libs/glibc/Manifest +++ b/sys-libs/glibc/Manifest @@ -15,17 +15,17 @@ DIST glibc-2.25.tar.xz 13873900 BLAKE2B 73ef792fff059f6ad154c9af2155ea15b7869ec1 DIST glibc-2.30-patches-10.tar.xz 72808 BLAKE2B a7a95c99482524b2896d15539766f1e6b1fe34a22f32119248c6dd44f42632076e86fdcbbdc2d604ec73ceccdd8a7f5936a62a6f4c3d039fae8f6901dfc6be77 SHA512 af5e213ff08bf38f6f529816c36b4e38df27207c2df254609ebe45b2f039ab553bbe563aa6f64b6667d328fd2c120dc21b6e2676540bdd94e58079237089eac3 DIST glibc-2.30-sparc-reg-fix-clobber.patch 6106 BLAKE2B cad6a4cbef5d529519ef486f4ef8e189cb4d43dd67fa8f8d50d67072cbb682f60474d482a5c5152d1317de92b98851d8a88eee6b331eb5bc22de065c03c58fde SHA512 a018ef1f196257f3888af20a5cbc97892c8382a4f489da042568e087c077f30cf4dda6ac711b573e1274317866ce97cf817d92a28cf55f18f5e8d32787e6cb3f DIST glibc-2.30.tar.xz 16576920 BLAKE2B bd5aae4c9854f40785b91f83c3b632de6d48d811027ddfe61651cb1bc617db8017d7914c23a770cdd3feed06fcc316da841eea916cdba54179e7eace4ea45484 SHA512 37483990cd653685873e96c45dd1651b32b441b6d7919a68ebe3bae31a0c3f7ce183fc9b110f0b268b353f80312f18370559a1e7aecea0e5aa755c8f2aef1d6b -DIST glibc-2.31-patches-5.tar.xz 52720 BLAKE2B 0e4315a79d4108e8a0eb2d849086de40a3ddebd9c09592ec5ecd02d9a0481f58588d7fca345624b0e345b077f6f3ad4257fb5949a0f05be2a004489af585a329 SHA512 c081aef22efacac19ce343ad6e55b8102869c42142dfd478e1cc03e85d6569771b52b737173df0996e273dc6ad1e8dea391658e03d5bcb69f2ed754801b3f6fa -DIST glibc-2.31-patches-7.tar.xz 56088 BLAKE2B 5af4dc008775c7d7958fc03df3800855685d00af7312f024a966948bd85522d40f357288deb4f13281dc93ace1b08cf40edf0b4c573dcba789887e86b45ce6ed SHA512 059082e5ce052189ed0c36ee97d7295f88cbb9e20dcb5677565a65d60cba11ff969d4382b6c6a69b8d6255da7274c205cf5c167fe76a24db3b9765f1633a9962 -DIST glibc-2.31-sparc-patch1-reg-kabi.patch 8525 BLAKE2B 2600ba4b0e24df2054a6e77ef79b6e5312e5594714d78015c4a949bb2c9b29c9535121bed9d633215710f6f50525fa0d2864aea43abbfeae281a6cc3dab71e5d SHA512 8dab29ea2e9e809806df17f3b707e7be27ac37121d0e3c6ee52fd41c1d6891bf71c0d8c154593754531aee96f8c866e06646f149c8bdd602521b703471d56bd2 -DIST glibc-2.31-sparc-patch2-reg-fix-clobber.patch 6864 BLAKE2B a39a10ff204d74289278125d7f2686db01874e998cb27b46b3b8b9597b5a2eae3b975a5ab08a8f5dd83693455891f6862b6eb70654f215c2ce6c5da222be96a1 SHA512 69bba011a30177386193ac4ac14a4e731c45b12dbb3745619ee802459aa75d6bbd37e62e979ec9790f691edb5f9077d37ee668b8df406f8f1c4d4316ef8c0aa7 +DIST glibc-2.31-patches-8.tar.xz 60868 BLAKE2B c641a77cab0b3e5379a6911a548483266110d747300f6bd4c138754cc35aff266088be8682ba45ac105c946ee309db0bc094b0c3bc48fd4303c925a7594e17e2 SHA512 1bc069d487ff9d4cd33c5d293bb0789114f65af5179b3d9df8ff0a9f043d5ffbcd030d8eabc90b329c896dfdd0409c4b8dac371eafdd380ecc660b9540320637 DIST glibc-2.31.tar.xz 16676764 BLAKE2B 91df1792345f157265eae405185a81fd4b8ce36d4c2388f44b0d5b1ae38174ea374cbc909cd260770b9f38ea58051da13766d4fa22abf41c2d4a2493257b179b SHA512 735e4c0ef10418b6ea945ad3906585e5bbd8b282d76f2131309dce4cec6b15066a5e4a3731773ce428a819b542579c9957867bb0abf05ed2030983fca4412306 +DIST glibc-2.32-patches-1.tar.xz 7640 BLAKE2B 849bdc1108e1f68f307bb9673f5ecda7c5470815f7d2de7956d529b638aafd4a8f37c22f79bc89d8e5f2efd51878927d3999d80586ec1074c46a52b6e148ea18 SHA512 a206d69693c3d9c527e17307b413aed05bcdefdf2537bb16af97ef31e85e4c48812971b60c00107b6a7c4bdc83c7e8ba1c9ea96f5641520852f98928f1018349 +DIST glibc-2.32.tar.xz 16744512 BLAKE2B a56b4afbb35315c5cd6dca0f62e44455dceae3e6e88a8453621f9a5394a60ddf10ca9309b2db0911830c7fd77e3faa5d94694eb94d5b2c05fc5285cef52255da SHA512 8460c155b7003e04f18dabece4ed9ad77445fa2288a7dc08e80a8fc4c418828af29e0649951bd71a54ea2ad2d4da7570aafd9bdfe4a37e9951b772b442afe50b DIST locale-gen-2.00.tar.gz 7738 BLAKE2B cde6de5ba3400aea24d0d5f1b79471f89f09fb747c8e371e38316c7ada92f967e0865f573f23cb353d82419c234724143c0aeca9eb70eb945dfc581cc7491eb1 SHA512 b609fddb9ec5e567c008841fef3390eddb5d6e7699a8271b3b8c0ade1b44b0ac2e5d1daa8b9acabf3432e3b88110b538a96f209b1ad0f9e988b7efce66606dff +DIST locale-gen-2.10.tar.gz 7747 BLAKE2B 49f569c5ae5260fca128503bc6f22d6f6f1cda817920c41fdadadf1527bbb4f3eb161f79fa729830666a4673e9092f99f4685ec8fcac8ddea0b8242bca9c1f4f SHA512 e350e60d458d67638e3090711fca05af6fafac06c51b97648244549f8a0621dab7543f09dc7ad4c62392f13bdae8e5875dc6d0b6c3d83efc29d116bc2eef92db EBUILD glibc-2.19-r2.ebuild 38264 BLAKE2B 935f298661a925624e86efbcbce2a98db4c7136a7bf280971a7022b72130b3b7a05ae8ab876cea12c3d0000ebeba70cdb0c2db084322d1f33a2685d637d8864d SHA512 bad1c42660e84e8035699b91bad4a8765657f87251b6d68e795255209c2bf696cca0ad17f8e77a024e68d93120be2030ed7f4ad1bfd26774f0ec486c59f5641f EBUILD glibc-2.25-r11.ebuild 6063 BLAKE2B a995a2553fad56abe09f0f890e2c70f94568675057367795acc7e62fdeb8b103a8ed9b5228bbe3aa74a70c7d657808ee0420c6c8931386c7a9c2adb0c330d15c SHA512 1b8e906841492e4f9361f909e91069c3a642d84a0216fab18b434f61db991c13765a31e29175854d43bf1b8159b462cd02e138bd593990c2306afd70f163a0cd EBUILD glibc-2.30-r8.ebuild 43113 BLAKE2B e567ea4544419609ce3f02ac06ce8ee2175d11502e947187334ec02cca11dacbb5453d514fe8b1c77418259e8f0bbd4306cdfa6aa573426e95ba56f910a9534c SHA512 b85c7656eb09b9702d352b2e20c334d70b764ddedacc6a218b3a921c990314ec80a4ff14e234a3bebf810f3482c45b323e9edc3c2044266341125b7095186126 -EBUILD glibc-2.30-r9.ebuild 43274 BLAKE2B bc91b14913d23e16b0f730bc1087368f2ec67a310e3a746556d1e5bc55021698b8fe9ee0d9e9485c8ff2030010775a2a4338fcd2215d2adcde19cf257343927d SHA512 95405b87f2ce225ed967fcfd924f098c56707dd12ecf41f41feb7379b212da9ae3bf5b75d55a2c217726dd78d6f07818634224479988a8061028b7c082508946 -EBUILD glibc-2.31-r4.ebuild 44247 BLAKE2B a2339a7458fae41e4abb71d3a87a814ff69752eeaf896995b8393afad12e77aa3d253649ea74db40d1cf228ec15fa643f9d75295ea64df9cc712e3edc2f7e45e SHA512 74cfff2226e8f6e016576d249ec38de06cfbf8e6ccd89d2305688a2aa2b1df278bfd8d905de8b38dc1a74b334b188d580fc4baafa82fb118bf245267fb87fef0 -EBUILD glibc-2.31-r5.ebuild 44322 BLAKE2B 9b730259a4465dbedf8a3199f6d0820901d86791fa16cf373b1f3633ea827cc6eefa253683312b758836059a3d4355b857dc510e2662111c4848398caa24f639 SHA512 31e6281c082509067e650e7c050eee83e4b0bb837756880cb62352c962f95a46ace159bd73c8ad3041293a908c3d3612bbfc9be25c9da7704dd9eacc50908aff -EBUILD glibc-9999.ebuild 44334 BLAKE2B 86aaa3348cf24be6ff081719233b300e6ff84980c80fa81bd00d36364802ad918ba3d2d7d51ed2f122e359ac6251b9fd85882c1e6ff2b35ca52f53031af8779a SHA512 f343775d16babf5b62a7981348fc6d45f6d436df80ef514c931fb121e30afcc911c5f5ba4182dc3bb4639e576bc01fc02236a8180987800cdee83c15cf227d57 +EBUILD glibc-2.30-r9.ebuild 43269 BLAKE2B cfc1ca115def60424b14d76270e0b57dec754992bec50d52110e437c62a68bea860062e65705ba64ddd3e8156e61b6542227678a3613c782f441411d606b286b SHA512 37fe44bf17fe1d3b8f001dfea6326a64c21843a07bb2dc0229856c53eca8d2a6ec13687c3fd038a47045db817f8242deb7d30219b8f08b4b051cd86ccdbe1310 +EBUILD glibc-2.31-r6.ebuild 44378 BLAKE2B 0e123cb1baaecf80c587133becb26ffa8cf01da7f407f3741fb6f2557262fb404381130c3bf280f515b176bee39a8a52d98fc935ad0a23861a78caca2fada551 SHA512 1a1728a26509339e261aed4aaebc4870cf1d9154cd736726b66856b5065c824625f65b60d8e3030287283dad509f624e6fe3e13dc3dd4b0abb45b2f670bc3dc9 +EBUILD glibc-2.32.ebuild 44384 BLAKE2B 114aaddf3c1e3b2f9cf905e77d6b23ebccc4c72ba0e1eb0441cd80ddab36c6fa1e8888b10cf1ee75952be0b298edb019428e7e5c5ebc56e032c32321e9646ef7 SHA512 223b77b5b1b818490fed1250e66b7f25f230560bc2cf090e565d563a5c3018de0c31613b0c10e3449a692d3cee2b2a67764238c4408bfb84d886b9f9b5e00f1f +EBUILD glibc-9999.ebuild 44099 BLAKE2B 0a69313853d99e0c7fda2ed4a6c555f575054523638ccb246be80e87b5d48d34b10e0e78040c5ceb77747651acc45dfb41e4aad2f73bc23fdb7fab4f863b4f29 SHA512 81aae4bd77a3271d70251aa1660b0e89a4d7392769aeb98e6afa1175f2f3a81e35f90236534115bcbabe9ede3ee49edbdd768ee605c026b5700dd974ad179b1e MISC metadata.xml 1491 BLAKE2B 4688b54e937163824a5895f4fbbcc9f09152378c68416f62294f7f1506379ecb82de43e8d2c6a64d1647c16700abe7c750b3cc658a9c7053891b3a9504f2ae93 SHA512 f6c002a52bb81471fbb631c7c430e1e91f6fdefc84a0c1f330606ac6347067b60f8a6d078169d49d2b30fa6991883466fff05caf4f93f53c00e5ced625dd8c88 diff --git a/sys-libs/glibc/glibc-2.30-r9.ebuild b/sys-libs/glibc/glibc-2.30-r9.ebuild index 11a2b4d878ce..2a22b0bde8ed 100644 --- a/sys-libs/glibc/glibc-2.30-r9.ebuild +++ b/sys-libs/glibc/glibc-2.30-r9.ebuild @@ -19,7 +19,7 @@ if [[ ${PV} == 9999* ]]; then EGIT_REPO_URI="https://sourceware.org/git/glibc.git" inherit git-r3 else - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86" + KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86" SRC_URI="mirror://gnu/glibc/${P}.tar.xz" fi diff --git a/sys-libs/glibc/glibc-2.31-r4.ebuild b/sys-libs/glibc/glibc-2.31-r6.ebuild index f4831ba151d2..3ac5fb0e9b15 100644 --- a/sys-libs/glibc/glibc-2.31-r4.ebuild +++ b/sys-libs/glibc/glibc-2.31-r6.ebuild @@ -15,13 +15,16 @@ SLOT="2.2" EMULTILIB_PKG="true" +# Gentoo patchset (ignored for live ebuilds) +PATCH_VER=8 +PATCH_DEV=dilfridge + if [[ ${PV} == 9999* ]]; then - EGIT_REPO_URI="https://sourceware.org/git/glibc.git" inherit git-r3 else - # needs minimal testing - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" + KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86" SRC_URI="mirror://gnu/glibc/${P}.tar.xz" + SRC_URI+=" https://dev.gentoo.org/~${PATCH_DEV}/distfiles/${P}-patches-${PATCH_VER}.tar.xz" fi RELEASE_VER=${PV} @@ -30,17 +33,8 @@ GCC_BOOTSTRAP_VER=20180511 LOCALE_GEN_VER=2.00 -# Gentoo patchset -PATCH_VER=5 -PATCH_DEV=dilfridge - -SRC_URI+=" https://dev.gentoo.org/~${PATCH_DEV}/distfiles/${P}-patches-${PATCH_VER}.tar.xz" SRC_URI+=" https://gitweb.gentoo.org/proj/locale-gen.git/snapshot/locale-gen-${LOCALE_GEN_VER}.tar.gz" SRC_URI+=" multilib? ( https://dev.gentoo.org/~dilfridge/distfiles/gcc-multilib-bootstrap-${GCC_BOOTSTRAP_VER}.tar.xz )" -SRC_URI+=" - https://dev.gentoo.org/~slyfox/distfiles/glibc-2.31-sparc-patch1-reg-kabi.patch - https://dev.gentoo.org/~slyfox/distfiles/glibc-2.31-sparc-patch2-reg-fix-clobber.patch -" IUSE="audit caps cet compile-locales +crypt custom-cflags doc gd headers-only +multiarch multilib nscd profile selinux +ssp +static-libs static-pie suid systemtap test vanilla" @@ -303,16 +297,18 @@ setup_target_flags() { einfo "Auto adding -march=${t} to CFLAGS_x86 #185404 (ABI=${ABI})" fi ;; - ia64) - # Workaround GPREL22 overflow by slightly pessimizing global - # references to go via 64-bit relocations instead of 22-bit ones. - # This allows building glibc on ia64 without an overflow: #723268 - append-flags -fcommon - ;; mips) # The mips abi cannot support the GNU style hashes. #233233 filter-ldflags -Wl,--hash-style=gnu -Wl,--hash-style=both ;; + ppc) + # Many arch-specific implementations do not work on ppc with + # cache-block not equal to 128 bytes. This breaks memset: + # https://sourceware.org/PR26522 + # https://bugs.gentoo.org/737996 + # Use default -mcpu=. For ppc it means non-multiarch setup. + filter-flags '-mcpu=*' + ;; sparc) # Both sparc and sparc64 can use -fcall-used-g6. -g7 is bad, though. filter-flags "-fcall-used-g7" @@ -734,24 +730,36 @@ src_unpack() { setup_env - if [[ -n ${EGIT_REPO_URI} ]] ; then + if [[ ${PV} == 9999* ]] ; then + EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/toolchain/glibc-patches.git" + EGIT_CHECKOUT_DIR=${WORKDIR}/patches-git + git-r3_src_unpack + mv patches-git/9999 patches || die + + EGIT_REPO_URI="https://sourceware.org/git/glibc.git" + EGIT_CHECKOUT_DIR=${S} git-r3_src_unpack else unpack ${P}.tar.xz + + cd "${WORKDIR}" || die + unpack glibc-${RELEASE_VER}-patches-${PATCH_VER}.tar.xz fi cd "${WORKDIR}" || die - unpack glibc-${RELEASE_VER}-patches-${PATCH_VER}.tar.xz - unpack locale-gen-${LOCALE_GEN_VER}.tar.gz } src_prepare() { + local patchsetname if ! use vanilla ; then - elog "Applying Gentoo Glibc Patchset ${RELEASE_VER}-${PATCH_VER}" + if [[ ${PV} == 9999* ]] ; then + patchsetname="from git master" + else + patchsetname="${RELEASE_VER}-${PATCH_VER}" + fi + elog "Applying Gentoo Glibc Patchset ${patchsetname}" eapply "${WORKDIR}"/patches - eapply "${DISTDIR}"/glibc-2.31-sparc-patch1-reg-kabi.patch - eapply "${DISTDIR}"/glibc-2.31-sparc-patch2-reg-fix-clobber.patch einfo "Done." fi @@ -763,6 +771,7 @@ src_prepare() { find . -name configure -exec touch {} + # move the external locale-gen to its old place + mkdir extra || die mv locale-gen-${LOCALE_GEN_VER} extra/locale || die eprefixify extra/locale/locale-gen diff --git a/sys-libs/glibc/glibc-2.31-r5.ebuild b/sys-libs/glibc/glibc-2.32.ebuild index 897a2582eb9c..062f5445621b 100644 --- a/sys-libs/glibc/glibc-2.31-r5.ebuild +++ b/sys-libs/glibc/glibc-2.32.ebuild @@ -16,7 +16,7 @@ SLOT="2.2" EMULTILIB_PKG="true" # Gentoo patchset (ignored for live ebuilds) -PATCH_VER=7 +PATCH_VER=1 PATCH_DEV=dilfridge if [[ ${PV} == 9999* ]]; then @@ -31,7 +31,7 @@ RELEASE_VER=${PV} GCC_BOOTSTRAP_VER=20180511 -LOCALE_GEN_VER=2.00 +LOCALE_GEN_VER=2.10 SRC_URI+=" https://gitweb.gentoo.org/proj/locale-gen.git/snapshot/locale-gen-${LOCALE_GEN_VER}.tar.gz" SRC_URI+=" multilib? ( https://dev.gentoo.org/~dilfridge/distfiles/gcc-multilib-bootstrap-${GCC_BOOTSTRAP_VER}.tar.xz )" @@ -297,16 +297,18 @@ setup_target_flags() { einfo "Auto adding -march=${t} to CFLAGS_x86 #185404 (ABI=${ABI})" fi ;; - ia64) - # Workaround GPREL22 overflow by slightly pessimizing global - # references to go via 64-bit relocations instead of 22-bit ones. - # This allows building glibc on ia64 without an overflow: #723268 - append-flags -fcommon - ;; mips) # The mips abi cannot support the GNU style hashes. #233233 filter-ldflags -Wl,--hash-style=gnu -Wl,--hash-style=both ;; + ppc) + # Many arch-specific implementations do not work on ppc with + # cache-block not equal to 128 bytes. This breaks memset: + # https://sourceware.org/PR26522 + # https://bugs.gentoo.org/737996 + # Use default -mcpu=. For ppc it means non-multiarch setup. + filter-flags '-mcpu=*' + ;; sparc) # Both sparc and sparc64 can use -fcall-used-g6. -g7 is bad, though. filter-flags "-fcall-used-g7" diff --git a/sys-libs/glibc/glibc-9999.ebuild b/sys-libs/glibc/glibc-9999.ebuild index ca5f697b063a..67b4c1240006 100644 --- a/sys-libs/glibc/glibc-9999.ebuild +++ b/sys-libs/glibc/glibc-9999.ebuild @@ -32,7 +32,7 @@ RELEASE_VER=${PV} GCC_BOOTSTRAP_VER=20180511 -LOCALE_GEN_VER=2.00 +LOCALE_GEN_VER=2.10 SRC_URI+=" https://gitweb.gentoo.org/proj/locale-gen.git/snapshot/locale-gen-${LOCALE_GEN_VER}.tar.gz" SRC_URI+=" multilib? ( https://dev.gentoo.org/~dilfridge/distfiles/gcc-multilib-bootstrap-${GCC_BOOTSTRAP_VER}.tar.xz )" @@ -298,16 +298,18 @@ setup_target_flags() { einfo "Auto adding -march=${t} to CFLAGS_x86 #185404 (ABI=${ABI})" fi ;; - ia64) - # Workaround GPREL22 overflow by slightly pessimizing global - # references to go via 64-bit relocations instead of 22-bit ones. - # This allows building glibc on ia64 without an overflow: #723268 - append-flags -fcommon - ;; mips) # The mips abi cannot support the GNU style hashes. #233233 filter-ldflags -Wl,--hash-style=gnu -Wl,--hash-style=both ;; + ppc) + # Many arch-specific implementations do not work on ppc with + # cache-block not equal to 128 bytes. This breaks memset: + # https://sourceware.org/PR26522 + # https://bugs.gentoo.org/737996 + # Use default -mcpu=. For ppc it means non-multiarch setup. + filter-flags '-mcpu=*' + ;; sparc) # Both sparc and sparc64 can use -fcall-used-g6. -g7 is bad, though. filter-flags "-fcall-used-g7" @@ -845,14 +847,6 @@ glibc_do_configure() { # https://sourceware.org/PR24202 myconf+=( --enable-stack-protector=no ) ;; - powerpc-*) - # Currently gcc on powerpc32 generates invalid code for - # __builtin_return_address(0) calls. Normally programs - # don't do that but malloc hooks in glibc do: - # https://gcc.gnu.org/PR81996 - # https://bugs.gentoo.org/629054 - myconf+=( --enable-stack-protector=no ) - ;; *) # Use '=strong' instead of '=all' to protect only functions # worth protecting from stack smashes. |