jpoiret pushed a commit to branch core-updates
in repository guix.
commit f8f49e965e928ff0ae63f5938f70125d1be074c5
Author: Josselin Poiret <d...@jpoiret.xyz>
AuthorDate: Sun May 26 16:06:37 2024 +0200
gnu: glibc-2.35: Disable C++ compiler for build.
* gnu/packages/base.scm (glibc-2.33): Move disabling the compiler from
here...
(glibc-2.35): to here, and update the comment.
Change-Id: Ie2511486f0e5791929f1f48529be7cc88c9553c2
---
gnu/packages/base.scm | 15 +++++++--------
1 file changed, 7 insertions(+), 8 deletions(-)
diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm
index 1ff5183289..5c4c7492a8 100644
--- a/gnu/packages/base.scm
+++ b/gnu/packages/base.scm
@@ -1111,6 +1111,12 @@ with the Linux kernel.")
(substitute-keyword-arguments (package-arguments glibc)
((#:configure-flags flags #~'())
#~(cons* "--enable-crypt"
+ ;; We do not want to use the C++ compiler, because its
+ ;; libstdc++ is linked against a newer glibc, and so relies
+ ;; on those newer symbols. Pretend it doesn't link (the test
+ ;; doesn't actually check that the compiler works with new
+ ;; libstdc++ and older glibc).
+ "libc_cv_cxx_link_ok=no"
#$flags))
((#:phases phases)
;; The C.UTF-8 fails to build in glibc 2.35:
@@ -1139,14 +1145,7 @@ with the Linux kernel.")
(member (basename patch)
'("glibc-2.35-CVE-2023-4911.patch"
"glibc-hurd-clock_gettime_monotonic.patch")))
- (origin-patches (package-source glibc-2.35)))))))
- (arguments
- (substitute-keyword-arguments (package-arguments glibc-2.35)
- ((#:configure-flags flags ''())
- ;; There are undefined references to pthread symbols while linking
- ;; 'support/links-dso-program.cc'. Since this isn't needed here, turn
- ;; off C++ tests.
- #~(cons "libc_cv_cxx_link_ok=no" #$flags))))))
+ (origin-patches (package-source
glibc-2.35)))))))))
(define-public glibc-2.32
(package
