From 7c79be186bfde98848d95bdd0ceeba87ccb1cf32 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Thu, 16 Jan 2025 12:15:12 +0100 Subject: gnu: libgpg-error: Remove now unnecessary x86_64-gnu patch. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/gnupg.scm (libgpg-error)[arguments]: Remove ‘apply-hurd64-patch’ phases. * gnu/packages/patches/libgpg-error-hurd64.patch: Remove. * gnu/local.mk (dist_patch_DATA): Remove it. Reported-by: yelninei Change-Id: I2c5a5c19ba673f7d8946f755207fc260b7d452b9 --- gnu/local.mk | 3 +- gnu/packages/gnupg.scm | 20 +------ gnu/packages/patches/libgpg-error-hurd64.patch | 78 -------------------------- 3 files changed, 3 insertions(+), 98 deletions(-) delete mode 100644 gnu/packages/patches/libgpg-error-hurd64.patch (limited to 'gnu') diff --git a/gnu/local.mk b/gnu/local.mk index 22f020cb7c..23849f0974 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1,5 +1,5 @@ # GNU Guix --- Functional package management for GNU -# Copyright © 2012-2024 Ludovic Courtès +# Copyright © 2012-2025 Ludovic Courtès # Copyright © 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2022, 2023, 2024 Andreas Enge # Copyright © 2016 Mathieu Lirzin # Copyright © 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021 Mark H Weaver @@ -1654,7 +1654,6 @@ dist_patch_DATA = \ %D%/packages/patches/libgeotiff-fix-tests-with-proj-9.3.0.patch \ %D%/packages/patches/libgeotiff-fix-tests-with-proj-9.3.1.patch \ %D%/packages/patches/libgeotiff-fix-tests-on-i386.patch \ - %D%/packages/patches/libgpg-error-hurd64.patch \ %D%/packages/patches/libguestfs-syms.patch \ %D%/packages/patches/libobjc2-unbundle-robin-map.patch \ %D%/packages/patches/librewolf-use-system-wide-dir.patch \ diff --git a/gnu/packages/gnupg.scm b/gnu/packages/gnupg.scm index aa8b5e4892..ef2344d7e6 100644 --- a/gnu/packages/gnupg.scm +++ b/gnu/packages/gnupg.scm @@ -145,25 +145,9 @@ ;; configuration, as this is not correct for ;; all architectures. (_ #t))) - (#t #t))))) - #$@(if (target-hurd64?) - #~((add-after 'unpack 'apply-hurd64-patch - (lambda _ - (let ((patch - #$(local-file - (search-patch - "libgpg-error-hurd64.patch")))) - (invoke "patch" "--force" "-p1" "-i" patch))))) - #~()))) + (#t #t))))))) ((system-hurd?) - #~((add-after 'unpack 'apply-hurd64-patch - (lambda _ - (let ((patch - #$(local-file - (search-patch - "libgpg-error-hurd64.patch")))) - (invoke "patch" "--force" "-p1" "-i" patch)))) - (add-after 'unpack 'skip-tests + #~((add-after 'unpack 'skip-tests (lambda _ (substitute* "tests/t-syserror.c" (("(^| )main *\\(.*" all) diff --git a/gnu/packages/patches/libgpg-error-hurd64.patch b/gnu/packages/patches/libgpg-error-hurd64.patch deleted file mode 100644 index aac8ce61f1..0000000000 --- a/gnu/packages/patches/libgpg-error-hurd64.patch +++ /dev/null @@ -1,78 +0,0 @@ -Upstream-status: Taken from upstream (1.48 series). - -From c62157c615a6379677c8f106bf9413d2611fd95e Mon Sep 17 00:00:00 2001 -From: Samuel Thibault -Date: Sat, 6 May 2023 16:10:55 +0200 -Subject: [PATCH] core: Add hurd-amd64 support - --- -This supports the x86_64-pc-gnu triplet - -Signed-off-by: Samuel Thibault ---- - src/Makefile.am | 1 + - src/mkheader.c | 2 ++ - src/syscfg/lock-obj-pub.x86_64-unknown-gnu.h | 24 ++++++++++++++++++++ - 3 files changed, 27 insertions(+) - create mode 100644 src/syscfg/lock-obj-pub.x86_64-unknown-gnu.h - -diff --git a/src/Makefile.am b/src/Makefile.am -index c61adde..9389e99 100644 ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -67,6 +67,7 @@ lock_obj_pub = \ - syscfg/lock-obj-pub.sparc-unknown-linux-gnu.h \ - syscfg/lock-obj-pub.sparc64-unknown-linux-gnu.h \ - syscfg/lock-obj-pub.x86_64-apple-darwin.h \ -+ syscfg/lock-obj-pub.x86_64-unknown-gnu.h \ - syscfg/lock-obj-pub.x86_64-unknown-kfreebsd-gnu.h \ - syscfg/lock-obj-pub.x86_64-unknown-linux-gnu.h \ - syscfg/lock-obj-pub.x86_64-unknown-linux-gnux32.h \ -diff --git a/src/mkheader.c b/src/mkheader.c -index 8fbfbd6..cc0eaa3 100644 ---- a/src/mkheader.c -+++ b/src/mkheader.c -@@ -108,6 +108,8 @@ canon_host_triplet (const char *triplet, int no_vendor_hack, char **r_os) - {"x86_64-pc-linux-gnuhardened1", "x86_64-unknown-linux-gnu" }, - {"x86_64-pc-linux-gnu" }, - -+ {"x86_64-pc-gnu"}, -+ - {"powerpc-unknown-linux-gnuspe", "powerpc-unknown-linux-gnu" }, - - {"arm-unknown-linux-gnueabihf", "arm-unknown-linux-gnueabi" }, -diff --git a/src/syscfg/lock-obj-pub.x86_64-unknown-gnu.h b/src/syscfg/lock-obj-pub.x86_64-unknown-gnu.h -new file mode 100644 -index 0000000..7c7e6f1 ---- /dev/null -+++ b/src/syscfg/lock-obj-pub.x86_64-unknown-gnu.h -@@ -0,0 +1,24 @@ -+## lock-obj-pub.x86_64-pc-gnu.h -+## File created by gen-posix-lock-obj - DO NOT EDIT -+## To be included by mkheader into gpg-error.h -+ -+typedef struct -+{ -+ long _vers; -+ union { -+ volatile char _priv[32]; -+ long _x_align; -+ long *_xp_align; -+ } u; -+} gpgrt_lock_t; -+ -+#define GPGRT_LOCK_INITIALIZER {1,{{0,0,0,0,0,0,0,0, \ -+ 0,0,0,0,0,0,0,0, \ -+ 0,0,0,0,0,0,0,0, \ -+ 0,0,0,0,0,0,0,0}}} -+## -+## Local Variables: -+## mode: c -+## buffer-read-only: t -+## End: -+## - -base-commit: 7a42ff0ec971f4f2add28b0edad6cf381b5b8acc --- -2.46.0 - -- cgit v1.2.3