merge bitcoin#27670: remove redundant glibc patches

knst · Nov 6, 2024 · 6a54603 · 6a54603
1 parent 0c988f0
commit 6a54603
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 254 deletions.
diff --git a/contrib/guix/manifest.scm b/contrib/guix/manifest.scm
@@ -526,9 +526,7 @@ inspecting signatures in Mach-O binaries.")
               (sha256
                (base32
                 "0wm0if2n4z48kpn85va6yb4iac34crds2f55ddpz1hykx6jp1pb6"))
-              (patches (search-our-patches "glibc-ldd-x86_64.patch"
-                                           "glibc-versioned-locpath.patch"
-                                           "glibc-2.27-fcommon.patch"
+              (patches (search-our-patches "glibc-2.27-fcommon.patch"
                                            "glibc-2.27-guix-prefix.patch"))))))
 
 (define (fix-ppc64-nx-default lief)

diff --git a/contrib/guix/patches/glibc-ldd-x86_64.patch b/contrib/guix/patches/glibc-ldd-x86_64.patch
diff --git a/contrib/guix/patches/glibc-versioned-locpath.patch b/contrib/guix/patches/glibc-versioned-locpath.patch