diff options
| author | Andreas Enge <andreas@enge.fr> | 2025-10-23 18:54:18 +0200 |
|---|---|---|
| committer | Andreas Enge <andreas@enge.fr> | 2025-10-23 18:59:22 +0200 |
| commit | 5d3db67cf61298429008110f7e0886fe44496509 (patch) | |
| tree | 3f09328ea3cecb6c8d0e218735b123d15156abc3 /gnu/packages/base.scm | |
| parent | 45d15c65bce1b514d4b3dfa7049b5631490a64e0 (diff) | |
gnu: Remove glibc-2.32.
* gnu/packages/base.scm (glibc-2.32): Delete variable.
* gnu/packages/patches/glibc-2.31-hurd-clock_gettime_monotonic.patch,
gnu/packages/patches/glibc-skip-c++.patch: Remove files.
* gnu/local.mk (dist_patch_DATA): Unregister files. Order glibc patches.
Fixes: guix/guix#3572
Change-Id: I8df841580c64ce0964817700a1f66da41fd5aab4
Diffstat (limited to 'gnu/packages/base.scm')
| -rw-r--r-- | gnu/packages/base.scm | 55 |
1 files changed, 0 insertions, 55 deletions
diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm index 86aaf88bd8c..a9e97e03714 100644 --- a/gnu/packages/base.scm +++ b/gnu/packages/base.scm | |||
| @@ -1354,61 +1354,6 @@ with the Linux kernel.") | |||
| 1354 | ;; This phase fails trying to create /etc/ld.so.cache | 1354 | ;; This phase fails trying to create /etc/ld.so.cache |
| 1355 | (delete 'install-utf8-c-locale))))))) | 1355 | (delete 'install-utf8-c-locale))))))) |
| 1356 | 1356 | ||
| 1357 | (define-public glibc-2.32 | ||
| 1358 | (package | ||
| 1359 | (inherit glibc-2.35) | ||
| 1360 | (version "2.32") | ||
| 1361 | (source (origin | ||
| 1362 | (inherit (package-source glibc)) | ||
| 1363 | (uri (string-append "mirror://gnu/glibc/glibc-" version ".tar.xz")) | ||
| 1364 | (sha256 | ||
| 1365 | (base32 | ||
| 1366 | "0di848ibffrnwq7g2dvgqrnn4xqhj3h96csn69q4da51ymafl9qn")) | ||
| 1367 | (patches (search-patches | ||
| 1368 | "glibc-skip-c++.patch" | ||
| 1369 | "glibc-ldd-powerpc.patch" | ||
| 1370 | "glibc-ldd-x86_64.patch" | ||
| 1371 | "glibc-dl-cache.patch" | ||
| 1372 | "glibc-hidden-visibility-ldconfig.patch" | ||
| 1373 | "glibc-versioned-locpath.patch" | ||
| 1374 | "glibc-allow-kernel-2.6.32.patch" | ||
| 1375 | "glibc-reinstate-prlimit64-fallback.patch" | ||
| 1376 | "glibc-supported-locales.patch" | ||
| 1377 | "glibc-hurd-clock_t_centiseconds.patch" | ||
| 1378 | "glibc-2.31-hurd-clock_gettime_monotonic.patch" | ||
| 1379 | "glibc-hurd-signal-sa-siginfo.patch" | ||
| 1380 | "glibc-hurd-mach-print.patch" | ||
| 1381 | "glibc-hurd-gettyent.patch")) | ||
| 1382 | #; | ||
| 1383 | (patches (search-patches "glibc-ldd-x86_64.patch" | ||
| 1384 | "glibc-hidden-visibility-ldconfig.patch" | ||
| 1385 | "glibc-versioned-locpath.patch" | ||
| 1386 | "glibc-allow-kernel-2.6.32.patch" | ||
| 1387 | "glibc-reinstate-prlimit64-fallback.patch" | ||
| 1388 | "glibc-supported-locales.patch" | ||
| 1389 | "glibc-hurd-clock_t_centiseconds.patch" | ||
| 1390 | "glibc-hurd-clock_gettime_monotonic.patch" | ||
| 1391 | "glibc-hurd-signal-sa-siginfo.patch")))) | ||
| 1392 | |||
| 1393 | (arguments | ||
| 1394 | (substitute-keyword-arguments (package-arguments glibc) | ||
| 1395 | ((#:make-flags flags '()) | ||
| 1396 | ;; Arrange so that /etc/rpc & co. go to $out/etc. | ||
| 1397 | `(list (string-append "sysconfdir=" | ||
| 1398 | (assoc-ref %outputs "out") | ||
| 1399 | "/etc"))) | ||
| 1400 | ((#:phases phases) | ||
| 1401 | `(modify-phases ,phases | ||
| 1402 | (add-before 'configure 'set-etc-rpc-installation-directory | ||
| 1403 | (lambda* (#:key outputs #:allow-other-keys) | ||
| 1404 | ;; Install the rpc data base file under `$out/etc/rpc'. | ||
| 1405 | (let ((out (assoc-ref outputs "out"))) | ||
| 1406 | (substitute* "sunrpc/Makefile" | ||
| 1407 | (("^\\$\\(inst_sysconfdir\\)/rpc(.*)$" _ suffix) | ||
| 1408 | (string-append out "/etc/rpc" suffix "\n")) | ||
| 1409 | (("^install-others =.*$") | ||
| 1410 | (string-append "install-others = " out "/etc/rpc\n")))))))))))) | ||
| 1411 | |||
| 1412 | (define-public (make-gcc-libc base-gcc libc) | 1357 | (define-public (make-gcc-libc base-gcc libc) |
| 1413 | "Return a GCC that targets LIBC." | 1358 | "Return a GCC that targets LIBC." |
| 1414 | (package (inherit base-gcc) | 1359 | (package (inherit base-gcc) |
