| 1 |
commit: 4d33143e5b807af00d29ec59d9512ac05ab0e131 |
| 2 |
Author: David Seifert <soap <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Jan 2 10:01:47 2022 +0000 |
| 4 |
Commit: David Seifert <soap <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Jan 2 10:01:47 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4d33143e |
| 7 |
|
| 8 |
toolchain.eclass: remove uclibc |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/820905 |
| 11 |
Signed-off-by: David Seifert <soap <AT> gentoo.org> |
| 12 |
|
| 13 |
eclass/toolchain.eclass | 40 +++------------------------------------- |
| 14 |
1 file changed, 3 insertions(+), 37 deletions(-) |
| 15 |
|
| 16 |
diff --git a/eclass/toolchain.eclass b/eclass/toolchain.eclass |
| 17 |
index dfca9ecee0d0..29657c6446b9 100644 |
| 18 |
--- a/eclass/toolchain.eclass |
| 19 |
+++ b/eclass/toolchain.eclass |
| 20 |
@@ -1,4 +1,4 @@ |
| 21 |
-# Copyright 1999-2021 Gentoo Authors |
| 22 |
+# Copyright 1999-2022 Gentoo Authors |
| 23 |
# Distributed under the terms of the GNU General Public License v2 |
| 24 |
|
| 25 |
# @ECLASS: toolchain.eclass |
| 26 |
@@ -359,7 +359,6 @@ gentoo_urls() { |
| 27 |
# with a Cygwin target. |
| 28 |
get_gcc_src_uri() { |
| 29 |
export PATCH_GCC_VER=${PATCH_GCC_VER:-${GCC_RELEASE_VER}} |
| 30 |
- export UCLIBC_GCC_VER=${UCLIBC_GCC_VER:-${PATCH_GCC_VER}} |
| 31 |
export MUSL_GCC_VER=${MUSL_GCC_VER:-${PATCH_GCC_VER}} |
| 32 |
export PIE_GCC_VER=${PIE_GCC_VER:-${GCC_RELEASE_VER}} |
| 33 |
export HTB_GCC_VER=${HTB_GCC_VER:-${GCC_RELEASE_VER}} |
| 34 |
@@ -382,8 +381,6 @@ get_gcc_src_uri() { |
| 35 |
fi |
| 36 |
fi |
| 37 |
|
| 38 |
- [[ -n ${UCLIBC_VER} ]] && \ |
| 39 |
- GCC_SRC_URI+=" $(gentoo_urls gcc-${UCLIBC_GCC_VER}-uclibc-patches-${UCLIBC_VER}.tar.bz2)" |
| 40 |
[[ -n ${PATCH_VER} ]] && \ |
| 41 |
GCC_SRC_URI+=" $(gentoo_urls gcc-${PATCH_GCC_VER}-patches-${PATCH_VER}.tar.bz2)" |
| 42 |
[[ -n ${MUSL_VER} ]] && \ |
| 43 |
@@ -557,10 +554,6 @@ do_gcc_gentoo_patches() { |
| 44 |
BRANDING_GCC_PKGVERSION="${BRANDING_GCC_PKGVERSION} p${PATCH_VER}" |
| 45 |
fi |
| 46 |
|
| 47 |
- if [[ -n ${UCLIBC_VER} ]] ; then |
| 48 |
- tc_apply_patches "Applying uClibc patches ..." "${WORKDIR}"/uclibc/*.patch |
| 49 |
- fi |
| 50 |
- |
| 51 |
if [[ -n ${MUSL_VER} ]] && [[ ${CTARGET} == *musl* ]] ; then |
| 52 |
if [[ ${CATEGORY} == cross-* ]] ; then |
| 53 |
# We don't want to apply some patches when cross-compiling. |
| 54 |
@@ -927,17 +920,6 @@ toolchain_src_configure() { |
| 55 |
*-gnu*) needed_libc=glibc;; |
| 56 |
*-klibc) needed_libc=klibc;; |
| 57 |
*-musl*) needed_libc=musl;; |
| 58 |
- *-uclibc*) |
| 59 |
- # Enable shared library support only on targets |
| 60 |
- # that support it: bug #291870 |
| 61 |
- if ! echo '#include <features.h>' | \ |
| 62 |
- $(tc-getCPP ${CTARGET}) -E -dD - 2>/dev/null | \ |
| 63 |
- grep -q __HAVE_SHARED__ |
| 64 |
- then |
| 65 |
- confgcc+=( --disable-shared ) |
| 66 |
- fi |
| 67 |
- needed_libc=uclibc-ng |
| 68 |
- ;; |
| 69 |
*-cygwin) needed_libc=cygwin;; |
| 70 |
x86_64-*-mingw*|\ |
| 71 |
*-w64-mingw*) needed_libc=mingw64-runtime;; |
| 72 |
@@ -991,14 +973,6 @@ toolchain_src_configure() { |
| 73 |
# __cxa_atexit is "essential for fully standards-compliant handling of |
| 74 |
# destructors", but apparently requires glibc. |
| 75 |
case ${CTARGET} in |
| 76 |
- *-uclibc*) |
| 77 |
- if tc_has_feature nptl ; then |
| 78 |
- confgcc+=( |
| 79 |
- --disable-__cxa_atexit |
| 80 |
- $(use_enable nptl tls) |
| 81 |
- ) |
| 82 |
- fi |
| 83 |
- ;; |
| 84 |
*-elf|*-eabi) |
| 85 |
confgcc+=( --with-newlib ) |
| 86 |
;; |
| 87 |
@@ -2324,17 +2298,9 @@ hardened_gcc_works() { |
| 88 |
hardened_gcc_is_stable() { |
| 89 |
local tocheck |
| 90 |
if [[ $1 == "pie" ]] ; then |
| 91 |
- if [[ ${CTARGET} == *-uclibc* ]] ; then |
| 92 |
- tocheck=${PIE_UCLIBC_STABLE} |
| 93 |
- else |
| 94 |
- tocheck=${PIE_GLIBC_STABLE} |
| 95 |
- fi |
| 96 |
+ tocheck=${PIE_GLIBC_STABLE} |
| 97 |
elif [[ $1 == "ssp" ]] ; then |
| 98 |
- if [[ ${CTARGET} == *-uclibc* ]] ; then |
| 99 |
- tocheck=${SSP_UCLIBC_STABLE} |
| 100 |
- elif [[ ${CTARGET} == *-gnu* ]] ; then |
| 101 |
- tocheck=${SSP_STABLE} |
| 102 |
- fi |
| 103 |
+ tocheck=${SSP_STABLE} |
| 104 |
else |
| 105 |
die "hardened_gcc_stable needs to be called with pie or ssp" |
| 106 |
fi |
Archives