mirror of
https://git.savannah.gnu.org/git/guix.git
synced 2025-01-18 21:46:35 +01:00
b371174536
* gnu/packages/patches/libgpg-error-hurd64.patch: New file. * gnu/local.mk (dist_patch_DATA): Register it. * gnu/packages/gnupg.scm (libgpg-error)[arguments]: Use it when building for the 64bit Hurd. Change-Id: Icabb7cd7bb5bcc771ccee5b8a7f57f52b9b58183
78 lines
2.5 KiB
Diff
78 lines
2.5 KiB
Diff
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
|
|
|