mirror/guix
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/guix.git synced 2025-01-18 13:36:36 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: libgpg-error: Remove now unnecessary x86_64-gnu patch.

Browse source 
* 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
This commit is contained in:
Ludovic Courtès 2025-01-16 12:15:12 +01:00
parent ac6aba1fd7
commit 7c79be186b
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5
3 changed files with 3 additions and 98 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
gnu/local.mk
View file

@ -1,5 +1,5 @@
# GNU Guix --- Functional package management for GNU # GNU Guix --- Functional package management for GNU
# Copyright © 2012-2024 Ludovic Courtès <ludo@gnu.org> # Copyright © 2012-2025 Ludovic Courtès <ludo@gnu.org>
# Copyright © 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2022, 2023, 2024 Andreas Enge <andreas@enge.fr> # Copyright © 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2022, 2023, 2024 Andreas Enge <andreas@enge.fr>
# Copyright © 2016 Mathieu Lirzin <mthl@gnu.org> # Copyright © 2016 Mathieu Lirzin <mthl@gnu.org>
# Copyright © 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021 Mark H Weaver <mhw@netris.org> # Copyright © 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021 Mark H Weaver <mhw@netris.org>
@ -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.0.patch \
%D%/packages/patches/libgeotiff-fix-tests-with-proj-9.3.1.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/libgeotiff-fix-tests-on-i386.patch \
%D%/packages/patches/libgpg-error-hurd64.patch \
%D%/packages/patches/libguestfs-syms.patch \ %D%/packages/patches/libguestfs-syms.patch \
%D%/packages/patches/libobjc2-unbundle-robin-map.patch \ %D%/packages/patches/libobjc2-unbundle-robin-map.patch \
%D%/packages/patches/librewolf-use-system-wide-dir.patch \ %D%/packages/patches/librewolf-use-system-wide-dir.patch \

20
gnu/packages/gnupg.scm
View file

@ -145,25 +145,9 @@ (define (link triplet source)
;; configuration, as this is not correct for ;; configuration, as this is not correct for
;; all architectures. ;; all architectures.
(_ #t))) (_ #t)))
(#t #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)))))
#~())))
((system-hurd?) ((system-hurd?)
#~((add-after 'unpack 'apply-hurd64-patch #~((add-after 'unpack 'skip-tests
(lambda _
(let ((patch
#$(local-file
(search-patch
"libgpg-error-hurd64.patch"))))
(invoke "patch" "--force" "-p1" "-i" patch))))
(add-after 'unpack 'skip-tests
(lambda _ (lambda _
(substitute* "tests/t-syserror.c" (substitute* "tests/t-syserror.c"
(("(^| )main *\\(.*" all) (("(^| )main *\\(.*" all)

78
gnu/packages/patches/libgpg-error-hurd64.patch
View file

@ -1,78 +0,0 @@
Upstream-status: Taken from upstream (1.48 series).
From c62157c615a6379677c8f106bf9413d2611fd95e Mon Sep 17 00:00:00 2001
From: Samuel Thibault <samuel.thibault@ens-lyon.org>
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 <samuel.thibault@ens-lyon.org>
---
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