From 425799cb45473616fc884fd23c413ac4f3027729 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Wed, 8 Sep 2021 16:22:11 +0200 Subject: gnu: glibc@2.30: Fix build error. * gnu/packages/base.scm (glibc-2.30)[native-inputs]: New field. [source]: Use "glibc-skip-c++.patch". --- gnu/packages/base.scm | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm index 695a056265..9c9808fcfa 100644 --- a/gnu/packages/base.scm +++ b/gnu/packages/base.scm @@ -965,13 +965,19 @@ with the Linux kernel.") (package (inherit glibc) (version "2.30") + (native-inputs + ;; This fails with a build error in libc-tls.c when using GCC 10. Use an + ;; older compiler. + (modify-inputs (package-native-inputs glibc) + (prepend gcc-8))) (source (origin (inherit (package-source glibc)) (uri (string-append "mirror://gnu/glibc/glibc-" version ".tar.xz")) (sha256 (base32 "1bxqpg91d02qnaz837a5kamm0f43pr1il4r9pknygywsar713i72")) - (patches (search-patches "glibc-ldd-x86_64.patch" + (patches (search-patches "glibc-skip-c++.patch" + "glibc-ldd-x86_64.patch" "glibc-CVE-2019-19126.patch" "glibc-hidden-visibility-ldconfig.patch" "glibc-versioned-locpath.patch" -- cgit v1.2.3