mirror/guix
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/guix.git synced 2025-01-21 01:26:43 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: glibc-2.33: Fix source build.

Browse source 
* gnu/packages/base.scm (glibc-2.33)[source]: Use patches from glibc-2.35.

Change-Id: Idfcad60a39bdfd54d6126c1b440c8915ec2d4df2
This commit is contained in:
Janneke Nieuwenhuizen 2024-02-21 20:52:29 +01:00 committed by Ludovic Courtès
parent 3c690043ce
commit f6aa4bd960
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5
1 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
gnu/packages/base.scm
View file

@ -6,7 +6,7 @@
;;; Copyright © 2014 Alex Kost <alezost@gmail.com>
;;; Copyright © 2014, 2015 Manolis Fragkiskos Ragkousis <manolis837@gmail.com>
;;; Copyright © 2016, 2017, 2019-2023 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2016, 2020, 2023 Janneke Nieuwenhuizen <janneke@gnu.org>
;;; Copyright © 2016, 2020, 2023, 2024 Janneke Nieuwenhuizen <janneke@gnu.org>
;;; Copyright © 2016, 2018 Alex Vong <alexvong1995@gmail.com>
;;; Copyright © 2017 Rene Saavedra <rennes@openmailbox.org>
;;; Copyright © 2017, 2020 Mathieu Othacehe <m.othacehe@gmail.com>
@ -1201,12 +1201,14 @@ (define-public glibc-2.33
"1zvp0qdfbdyqrzydz18d9zg3n5ygy8ps7cmny1bvsp8h1q05c99f"))
(patches
(cons (search-patch "glibc-2.33-riscv64-miscompilation.patch")
;; Remove a patch that's become irrelevant and that does not
;; apply to this version.
(remove (lambda (patch)
(string=? (basename patch)
"glibc-hurd-clock_gettime_monotonic.patch"))
(origin-patches (package-source glibc)))))))
;; Remove patches that are irrelevant or do not apply to
;; this version.
(remove
(lambda (patch)
(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)
((#:configure-flags flags ''())