mirror of
https://git.in.rschanz.org/ryan77627/guix.git
synced 2024-12-24 05:18:07 -05:00
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
This commit is contained in:
parent
e369fa017b
commit
04af0fff52
1 changed files with 7 additions and 8 deletions
|
@ -1161,6 +1161,12 @@ (define-public glibc-2.35
|
||||||
(substitute-keyword-arguments (package-arguments glibc)
|
(substitute-keyword-arguments (package-arguments glibc)
|
||||||
((#:configure-flags flags #~'())
|
((#:configure-flags flags #~'())
|
||||||
#~(cons* "--enable-crypt"
|
#~(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))
|
#$flags))
|
||||||
((#:phases phases)
|
((#:phases phases)
|
||||||
;; The C.UTF-8 fails to build in glibc 2.35:
|
;; The C.UTF-8 fails to build in glibc 2.35:
|
||||||
|
@ -1189,14 +1195,7 @@ (define-public glibc-2.33
|
||||||
(member (basename patch)
|
(member (basename patch)
|
||||||
'("glibc-2.35-CVE-2023-4911.patch"
|
'("glibc-2.35-CVE-2023-4911.patch"
|
||||||
"glibc-hurd-clock_gettime_monotonic.patch")))
|
"glibc-hurd-clock_gettime_monotonic.patch")))
|
||||||
(origin-patches (package-source glibc-2.35)))))))
|
(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))))))
|
|
||||||
|
|
||||||
(define-public glibc-2.32
|
(define-public glibc-2.32
|
||||||
(package
|
(package
|
||||||
|
|
Loading…
Reference in a new issue