From 0e2b817732539c496d3310e42eb4ea5340e8e570 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 24 Mar 2021 15:38:17 +0200 Subject: gnu: glibc: Absorb powerpc patch. * gnu/packages/base.scm (glibc)[source]: Add patch. [arguments]: Remove 'apply-patch phase. [native-inputs]: Remove patch file. * gnu/packages/commencement.scm (glibc-final-with-bootstrap-bash, glibc-final)[native-inputs]: Remove patch file. --- gnu/packages/base.scm | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) (limited to 'gnu/packages/base.scm') diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm index 778f24d465..dbb7c619fe 100644 --- a/gnu/packages/base.scm +++ b/gnu/packages/base.scm @@ -678,7 +678,8 @@ the store.") (sha256 (base32 "0di848ibffrnwq7g2dvgqrnn4xqhj3h96csn69q4da51ymafl9qn")) - (patches (search-patches "glibc-ldd-x86_64.patch" + (patches (search-patches "glibc-ldd-powerpc.patch" + "glibc-ldd-x86_64.patch" "glibc-dl-cache.patch" "glibc-hidden-visibility-ldconfig.patch" "glibc-versioned-locpath.patch" @@ -874,14 +875,6 @@ the store.") (map (cut string-append slib "/" <>) files)))))) - ,@(if (target-powerpc?) - '((add-after 'unpack 'apply-patch - (lambda* (#:key inputs #:allow-other-keys) - (let ((patch (assoc-ref inputs - "powerpc64le-patch"))) - (invoke "patch" "--force" "-p1" - "-i" patch))))) - '()) ,@(if (hurd-target?) '((add-after 'install 'augment-libc.so (lambda* (#:key outputs #:allow-other-keys) @@ -902,10 +895,6 @@ the store.") ("gettext" ,gettext-minimal) ("python" ,python-minimal) - ,@(if (target-powerpc?) - `(("powerpc64le-patch" ,@(search-patches - "glibc-ldd-powerpc.patch"))) - '()) ,@(if (hurd-target?) `(("mig" ,mig) ("perl" ,perl)) -- cgit v1.2.3