diff options
Diffstat (limited to 'gnu/packages/base.scm')
| -rw-r--r-- | gnu/packages/base.scm | 136 |
1 files changed, 1 insertions, 135 deletions
diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm index 602158687f..a9e97e0371 100644 --- a/gnu/packages/base.scm +++ b/gnu/packages/base.scm @@ -1354,124 +1354,6 @@ with the Linux kernel.") ;; This phase fails trying to create /etc/ld.so.cache (delete 'install-utf8-c-locale))))))) -(define-public glibc-2.32 - (package - (inherit glibc-2.35) - (version "2.32") - (source (origin - (inherit (package-source glibc)) - (uri (string-append "mirror://gnu/glibc/glibc-" version ".tar.xz")) - (sha256 - (base32 - "0di848ibffrnwq7g2dvgqrnn4xqhj3h96csn69q4da51ymafl9qn")) - (patches (search-patches - "glibc-skip-c++.patch" - "glibc-ldd-powerpc.patch" - "glibc-ldd-x86_64.patch" - "glibc-dl-cache.patch" - "glibc-hidden-visibility-ldconfig.patch" - "glibc-versioned-locpath.patch" - "glibc-allow-kernel-2.6.32.patch" - "glibc-reinstate-prlimit64-fallback.patch" - "glibc-supported-locales.patch" - "glibc-hurd-clock_t_centiseconds.patch" - "glibc-2.31-hurd-clock_gettime_monotonic.patch" - "glibc-hurd-signal-sa-siginfo.patch" - "glibc-hurd-mach-print.patch" - "glibc-hurd-gettyent.patch")) - #; - (patches (search-patches "glibc-ldd-x86_64.patch" - "glibc-hidden-visibility-ldconfig.patch" - "glibc-versioned-locpath.patch" - "glibc-allow-kernel-2.6.32.patch" - "glibc-reinstate-prlimit64-fallback.patch" - "glibc-supported-locales.patch" - "glibc-hurd-clock_t_centiseconds.patch" - "glibc-hurd-clock_gettime_monotonic.patch" - "glibc-hurd-signal-sa-siginfo.patch")))) - - (arguments - (substitute-keyword-arguments (package-arguments glibc) - ((#:make-flags flags '()) - ;; Arrange so that /etc/rpc & co. go to $out/etc. - `(list (string-append "sysconfdir=" - (assoc-ref %outputs "out") - "/etc"))) - ((#:phases phases) - `(modify-phases ,phases - (add-before 'configure 'set-etc-rpc-installation-directory - (lambda* (#:key outputs #:allow-other-keys) - ;; Install the rpc data base file under `$out/etc/rpc'. - (let ((out (assoc-ref outputs "out"))) - (substitute* "sunrpc/Makefile" - (("^\\$\\(inst_sysconfdir\\)/rpc(.*)$" _ suffix) - (string-append out "/etc/rpc" suffix "\n")) - (("^install-others =.*$") - (string-append "install-others = " out "/etc/rpc\n")))))))))))) - -(define-public glibc-2.31 - (package - (inherit glibc-2.35) - (version "2.31") - (source (origin - (inherit (package-source glibc)) - (uri (string-append "mirror://gnu/glibc/glibc-" version ".tar.xz")) - (sha256 - (base32 - "05zxkyz9bv3j9h0xyid1rhvh3klhsmrpkf3bcs6frvlgyr2gwilj")) - (patches (search-patches - "glibc-skip-c++.patch" - "glibc-ldd-powerpc.patch" - "glibc-ldd-x86_64.patch" - "glibc-dl-cache.patch" - "glibc-hidden-visibility-ldconfig.patch" - "glibc-versioned-locpath.patch" - "glibc-allow-kernel-2.6.32.patch" - "glibc-reinstate-prlimit64-fallback.patch" - "glibc-supported-locales.patch" - "glibc-hurd-clock_t_centiseconds.patch" - "glibc-2.31-hurd-clock_gettime_monotonic.patch" - "glibc-hurd-signal-sa-siginfo.patch" - "glibc-hurd-mach-print.patch" - "glibc-hurd-gettyent.patch")))) - (arguments - (substitute-keyword-arguments (package-arguments glibc) - ((#:phases phases) - `(modify-phases ,phases - (add-before 'configure 'set-etc-rpc-installation-directory - (lambda* (#:key outputs #:allow-other-keys) - ;; Install the rpc data base file under `$out/etc/rpc'. - (let ((out (assoc-ref outputs "out"))) - (substitute* "sunrpc/Makefile" - (("^\\$\\(inst_sysconfdir\\)/rpc(.*)$" _ suffix) - (string-append out "/etc/rpc" suffix "\n")) - (("^install-others =.*$") - (string-append "install-others = " out "/etc/rpc\n")))))))))))) - -(define-public glibc-2.30 - (package - (inherit glibc-2.31) - (version "2.30") - (native-inputs - ;; This fails with a build error in libc-tls.c when using GCC 10. Use an - ;; older compiler. - (modify-inputs (package-native-inputs glibc) - (prepend gcc-8))) - (source (origin - (inherit (package-source glibc)) - (uri (string-append "mirror://gnu/glibc/glibc-" version ".tar.xz")) - (sha256 - (base32 - "1bxqpg91d02qnaz837a5kamm0f43pr1il4r9pknygywsar713i72")) - (patches (search-patches "glibc-skip-c++.patch" - "glibc-ldd-x86_64.patch" - "glibc-CVE-2019-19126.patch" - "glibc-hidden-visibility-ldconfig.patch" - "glibc-versioned-locpath.patch" - "glibc-allow-kernel-2.6.32.patch" - "glibc-reinstate-prlimit64-fallback.patch" - "glibc-2.29-supported-locales.patch")))))) - (define-public (make-gcc-libc base-gcc libc) "Return a GCC that targets LIBC." (package (inherit base-gcc) @@ -1492,14 +1374,7 @@ with the Linux kernel.") (inherit glibc) (name "glibc-locales") (source (origin (inherit (package-source glibc)) - ;; The patch for glibc 2.28 and earlier replaces the same - ;; content, but the context in the patch is different - ;; enough to fail to merge. - (patches (cons (search-patch - (if (version>=? (package-version glibc) - "2.29") - "glibc-locales.patch" - "glibc-locales-2.28.patch")) + (patches (cons (search-patch "glibc-locales.patch") (origin-patches (package-source glibc)))))) (synopsis "All the locales supported by the GNU C Library") (description @@ -1653,15 +1528,6 @@ test environments.") (define-public glibc-locales-2.33 (package (inherit (make-glibc-locales glibc-2.33)) (name "glibc-locales-2.33"))) -(define-public glibc-locales-2.32 - (package (inherit (make-glibc-locales glibc-2.32)) - (name "glibc-locales-2.32"))) -(define-public glibc-locales-2.31 - (package (inherit (make-glibc-locales glibc-2.31)) - (name "glibc-locales-2.31"))) -(define-public glibc-locales-2.30 - (package (inherit (make-glibc-locales glibc-2.30)) - (name "glibc-locales-2.30"))) (define-public which (package |