diff options
| author | John Kehayias <john@guixotic.coop> | 2026-03-18 11:12:27 -0400 |
|---|---|---|
| committer | Efraim Flashner <efraim@flashner.co.il> | 2026-03-30 10:36:24 +0300 |
| commit | f571658b7092015352f508732d62cdbb3ddb0b7b (patch) | |
| tree | f5403e2cf4ed209f828083265ea52cc5752ff811 | |
| parent | c144b645bb142a88953e08068d1cebb4b342451f (diff) | |
gnu: glibc: Ungraft.
* gnu/packages/base.scm (%glibc-patches): Add patch.
(glibc)[replacement]: Remove.
(glibc/fixed): Remove variable.
Change-Id: Idb2e194ddc5a777eed913a25a2f59114da26cea2
| -rw-r--r-- | gnu/packages/base.scm | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm index 908eec7cf2f..5ee1a65f39b 100644 --- a/gnu/packages/base.scm +++ b/gnu/packages/base.scm @@ -910,6 +910,7 @@ the store.") "glibc-2.40-dl-cache.patch" "glibc-2.37-versioned-locpath.patch" ;; "glibc-allow-kernel-2.6.32.patch" + "glibc-guix-locpath.patch" "glibc-reinstate-prlimit64-fallback.patch" "glibc-supported-locales.patch" "glibc-2.37-hurd-clock_t_centiseconds.patch" @@ -940,7 +941,6 @@ the store.") (properties `((lint-hidden-cve . ("CVE-2024-2961" "CVE-2024-33601" "CVE-2024-33602" "CVE-2024-33600" "CVE-2024-33599")))) - (replacement glibc/fixed) (build-system gnu-build-system) ;; Glibc's <limits.h> refers to <linux/limit.h>, for instance, so glibc @@ -1218,17 +1218,6 @@ with the Linux kernel.") (license lgpl2.0+) (home-page "https://www.gnu.org/software/libc/"))) -(define glibc/fixed - (package - (inherit glibc) - (name "glibc") - (source (origin - (inherit (package-source glibc)) - ;; XXX: When ungrafting, add the included patch to - ;; %glibc-patches. - (patches (cons (search-patch "glibc-guix-locpath.patch") - (origin-patches (package-source glibc)))))))) - ;; Define a variation of glibc which uses the default /etc/ld.so.cache, useful ;; in FHS containers. (define-public glibc-for-fhs |