summaryrefslogtreecommitdiff
path: root/sys-libs/glibc
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2021-05-11 19:55:43 +0100
committerV3n3RiX <venerix@redcorelinux.org>2021-05-11 19:55:43 +0100
commit185fa19bbf68a4d4dca534d2b46729207a177f16 (patch)
treea8a537b82fda83a0799c2ca9887f212558363aa7 /sys-libs/glibc
parentc8fd0d84af0bfd1949542adc2cbb735b1d28f9ed (diff)
gentoo resync : 11.05.2021
Diffstat (limited to 'sys-libs/glibc')
-rw-r--r--sys-libs/glibc/Manifest4
-rw-r--r--sys-libs/glibc/glibc-2.33.ebuild19
-rw-r--r--sys-libs/glibc/glibc-9999.ebuild19
3 files changed, 10 insertions, 32 deletions
diff --git a/sys-libs/glibc/Manifest b/sys-libs/glibc/Manifest
index 980c68928f54..3ea8f24c1dcb 100644
--- a/sys-libs/glibc/Manifest
+++ b/sys-libs/glibc/Manifest
@@ -35,6 +35,6 @@ EBUILD glibc-2.31-r7.ebuild 44397 BLAKE2B c43a3104751b92239d2bba5121d2d03d0c1279
EBUILD glibc-2.32-r6.ebuild 44725 BLAKE2B d1bbd4f9362d42c262ccd2f2f99802d000fab7268347056bffcd9af24646bf8f9d64f24ac6efea50189cecb26c8b011853b1775ac7e070e8a4dd87072ecf0c68 SHA512 8127942411ae8494552f75a2134221df085c5d1330a1671173acae951c880786c8da4293fc23d206736cffd821c40e5a28eae862318b4c1983cb1fdefb45f3c8
EBUILD glibc-2.32-r7.ebuild 44730 BLAKE2B b08d0de058282a9b974382d0856d9cb1bdf8df57a3d836aa3a1e6545270c75a63c648528b879573cb11da199814982f845cf191ee360ca3de1cbae86d8e23ff0 SHA512 239ce557537fb5eec32818f0aed9965913fa273d547c85b8f998196a3e9f98a04e02a937b5c09e432ffcfe464ef2f4e63c278226d467e0a79f50720ff16f87ac
EBUILD glibc-2.32-r8.ebuild 44736 BLAKE2B d0536afe64d441de0c19686699e956dd9bc90af7d15ac12d392904eef552d54ddb209fcc00f36ddb010d0c77fa55e58b11a37b510654dee4012adfb7712118ec SHA512 5dab53cf1c940cad56004a91d4ced422193272d3994e8ee272958c22702392c891273343f59c62ab4c9660bcc130bc477c4e54c2b07c6d448ea597296efe707e
-EBUILD glibc-2.33.ebuild 44352 BLAKE2B f74aeb29c1ddb8e5e4ca27e549d7d9931259288d09a121b0ae040bb5321d3feb024ca8ab235a261700bb2ffc897320ba5ff4c00234830a212c21e52ecd12337b SHA512 525f6b9c03ef8da12effb47f577ad267f7fa188faf2c1f0991d6166376a93d9e99574173e10004fefb96b91343eef15560b3c18f9dae0f899f634eba06cef428
-EBUILD glibc-9999.ebuild 44364 BLAKE2B 6b04446bab70a41ede93f1584795abd2a20fbce85bec8d97655be0f5b9742db09be7b065dc0c5144384edaafedcb74a2f1058dbb77569c42ff6b9e45c363db67 SHA512 72bdd35b8abbdf166deefa1890b2c580741e423a422421a85e646c4041776f5effadc6f96f16dbcdcfed734648262f840963bc38d9adf8a1130f201fe7639e5f
+EBUILD glibc-2.33.ebuild 43872 BLAKE2B 1fa02900ff3267b5dcdba8ac22689b7de885187d30be8bc2d846e5ea58a0cb4b7fcf19cce90c40982e60c902b009af576fbf3ed7e3865c804fbdcf3a2dcba5c4 SHA512 cc0aeb068c178a4863bd9f25a5a48793afd683328b3b751cfb9634bc05d5b8e562856501dd1475ae5025d8f84aae51bcd9c006eb176d3a067d5862193fac959c
+EBUILD glibc-9999.ebuild 43884 BLAKE2B fdd6469d7669c168908fa1837dd14548d8001b526ab7973bc7fcd5e7841bc88abe25842812670fd57999b3d11fbc77e6863919a63e2b7aa2b5daa7caa25197f5 SHA512 b5f3ee60e142caf8fc652fdb2914b8cbf3a0ce497fb8d9d0d411a40d013b8a24ae226f25ba7f40dd6570ba6a4325803bf8e136ca0f0ed71b3248d84e78febdab
MISC metadata.xml 1611 BLAKE2B 3bd777c160ea20cdbd86cca791d9fd4ff02f8d100344235ec74fff37d5cae1e7119e0ec26969707e75a983dcdb23e994559c8be128ef40fa0ec9ed655017466d SHA512 08be6d085ac47b140fff17a3be8cee77e066a4536cdce76fa44c77875dec2a9dc236ff67ff44301abf75cb196d1902feb2a139dda420220248b46dd9cdb16b9f
diff --git a/sys-libs/glibc/glibc-2.33.ebuild b/sys-libs/glibc/glibc-2.33.ebuild
index 332448bce7bc..f2eabcd84c0f 100644
--- a/sys-libs/glibc/glibc-2.33.ebuild
+++ b/sys-libs/glibc/glibc-2.33.ebuild
@@ -393,6 +393,10 @@ setup_flags() {
# glibc aborts if rpath is set by LDFLAGS
filter-ldflags '-Wl,-rpath=*'
+ # ld can't use -r & --relax at the same time, bug #788901
+ # https://sourceware.org/PR27837
+ filter-ldflags '-Wl,--relax'
+
# #492892
filter-flags -frecord-gcc-switches
@@ -645,21 +649,6 @@ sanity_prechecks() {
ewarn "hypervisor, which is probably not what you want."
fi
- # Check for sanity of /etc/nsswitch.conf
- if [[ -e ${EROOT}/etc/nsswitch.conf ]] ; then
- local entry
- for entry in passwd group shadow; do
- if ! egrep -q "^[ \t]*${entry}:.*files" "${EROOT}"/etc/nsswitch.conf; then
- eerror "Your ${EROOT}/etc/nsswitch.conf is out of date."
- eerror "Please make sure you have 'files' entries for"
- eerror "'passwd:', 'group:' and 'shadow:' databases."
- eerror "For more details see:"
- eerror " https://wiki.gentoo.org/wiki/Project:Toolchain/nsswitch.conf_in_glibc-2.26"
- die "nsswitch.conf has no 'files' provider in '${entry}'."
- fi
- done
- fi
-
# ABI-specific checks follow here. Hey, we have a lot more specific conditions that
# we test for...
if ! is_crosscompile ; then
diff --git a/sys-libs/glibc/glibc-9999.ebuild b/sys-libs/glibc/glibc-9999.ebuild
index 7887443a98c7..d99367f1bca2 100644
--- a/sys-libs/glibc/glibc-9999.ebuild
+++ b/sys-libs/glibc/glibc-9999.ebuild
@@ -394,6 +394,10 @@ setup_flags() {
# glibc aborts if rpath is set by LDFLAGS
filter-ldflags '-Wl,-rpath=*'
+ # ld can't use -r & --relax at the same time, bug #788901
+ # https://sourceware.org/PR27837
+ filter-ldflags '-Wl,--relax'
+
# #492892
filter-flags -frecord-gcc-switches
@@ -646,21 +650,6 @@ sanity_prechecks() {
ewarn "hypervisor, which is probably not what you want."
fi
- # Check for sanity of /etc/nsswitch.conf
- if [[ -e ${EROOT}/etc/nsswitch.conf ]] ; then
- local entry
- for entry in passwd group shadow; do
- if ! egrep -q "^[ \t]*${entry}:.*files" "${EROOT}"/etc/nsswitch.conf; then
- eerror "Your ${EROOT}/etc/nsswitch.conf is out of date."
- eerror "Please make sure you have 'files' entries for"
- eerror "'passwd:', 'group:' and 'shadow:' databases."
- eerror "For more details see:"
- eerror " https://wiki.gentoo.org/wiki/Project:Toolchain/nsswitch.conf_in_glibc-2.26"
- die "nsswitch.conf has no 'files' provider in '${entry}'."
- fi
- done
- fi
-
# ABI-specific checks follow here. Hey, we have a lot more specific conditions that
# we test for...
if ! is_crosscompile ; then