From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1.migadu.com ([2001:41d0:303:e16b::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms13.migadu.com with LMTPS id iP8SLqs3PGdiNwEA62LTzQ:P1 (envelope-from ) for ; Tue, 19 Nov 2024 07:00:59 +0000 Received: from aspmx1.migadu.com ([2001:41d0:303:e16b::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1.migadu.com with LMTPS id iP8SLqs3PGdiNwEA62LTzQ (envelope-from ) for ; Tue, 19 Nov 2024 08:00:59 +0100 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=pass header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=CyXhTHHS; dkim=fail ("headers rsa verify failed") header.d=gnu.org header.s=fencepost-gnu-org header.b=gqRMQ0fZ; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=pass (policy=none) header.from=gnu.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1731999659; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=B3Pqy5ZDGyQ/fvy+5OmO8jCcLjBlWaBDnk6MStRPdVA=; b=IYxvhDwuMgn0UM2MVE14Txc9TPRO1Gg1RYvvdfsQ8rDTgLA1GYDFc+0lsk5Iyi58Ksaar8 TZCF/V4ALJ232Y/4yXaAhAjAF3ZDPHOLnH/u8TRRtrXs8Iqxio4gwuGp3tuPziBzI7Zv+W KCohkW/SPNA8kBVOm2G28GCupilB5YAz1YTBOJ5WHXzALJ1qPMDKlbLJkCyBtfYKJDSpDx VOLIP+1dGiFQdMomBO3DFZNNoiUJy4i6543Mv4/lgjtrM3tlBKqFc52KVb0ENpuIJ6OBRA ikW+3wkIgBNQlns8faBUlQmeKUm7DZOhKctCpq52iVD1/T3WqvhI538XctyP8Q== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1731999659; a=rsa-sha256; cv=none; b=O36jRMF6o6LKdAMBpbqm96G24K/e0dCdm+U9ZnXzYACN8Pz63WUnY0/92zx1TmEgE+WA50 YQocJAXkG+RcvL/Tq9uaXnKrzeaBLqE3rm0NMItWGkvVJvnxiVdmi2eSjn8GfG1BdrSKNs 4SW3fZEnltdw79m7q0mjoug8SUMftmNLEcwSbPboIJY0d9mPmsL5yGzojPJQccWByQM5FU 3Ao4NYBesCP0P7WLfVCwIH7bJUZgut2n5fYyE8+y/1NE9Flt5syG3XZAe568aBhbmr3Hh7 1OWcyy+t/t4rKAj9N47ZbZ/FL2sWR9cBsu907gvtB2wF6WVofGg2Iqptkumn4A== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=pass header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=CyXhTHHS; dkim=fail ("headers rsa verify failed") header.d=gnu.org header.s=fencepost-gnu-org header.b=gqRMQ0fZ; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=pass (policy=none) header.from=gnu.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 59D5B798AE for ; Tue, 19 Nov 2024 08:00:59 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tDID2-0000BF-22; Tue, 19 Nov 2024 01:59:36 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tDICo-0008Rq-6x for guix-patches@gnu.org; Tue, 19 Nov 2024 01:59:22 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tDICn-0004La-UH for guix-patches@gnu.org; Tue, 19 Nov 2024 01:59:21 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=B3Pqy5ZDGyQ/fvy+5OmO8jCcLjBlWaBDnk6MStRPdVA=; b=CyXhTHHSZvoO6VmwyJrxpTbIArFwj3j9slr5Pbn0dx/SYpbdtBpgXXb5m/U3uCLqe7xo0pO0ho4GEGfsQj+9jVd+M2qvrxl1SyTj0i4akxTmfjPMCTK/qKJPQX6yTIWC8Cdd9vs9FMpHTfy1TrH1WQQA69dDPdB+eyD3mOJTGSGRg8o8416p9jGL0STsHmwc0nmulAsqRC1p737UgudVZF17pnERQeFaraRM6uOlHrvc+loE8J4iInF0zutmBPVe/rDKyy3f/LptI8GQMnL7RM6GNNK/jOZIc29LdP1Y5fPuQGnC6YGQBDiEa+iTl7sY1oRZmTdNJqDDIUT+2jg4zA==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tDICn-0005JX-Er for guix-patches@gnu.org; Tue, 19 Nov 2024 01:59:21 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#74290] [PATCH v3 28/51] gnu: libgpg-error: Support the 64bit Hurd. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 19 Nov 2024 06:59:21 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 74290 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 74290@debbugs.gnu.org Received: via spool by 74290-submit@debbugs.gnu.org id=B74290.173199954820199 (code B ref 74290); Tue, 19 Nov 2024 06:59:21 +0000 Received: (at 74290) by debbugs.gnu.org; 19 Nov 2024 06:59:08 +0000 Received: from localhost ([127.0.0.1]:40579 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tDICZ-0005FK-LW for submit@debbugs.gnu.org; Tue, 19 Nov 2024 01:59:08 -0500 Received: from eggs.gnu.org ([209.51.188.92]:39424) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tDIC1-00059T-Nn for 74290@debbugs.gnu.org; Tue, 19 Nov 2024 01:58:34 -0500 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tDI9q-00041Q-8J; Tue, 19 Nov 2024 01:56:18 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:References:In-Reply-To:Date:Subject:To: From; bh=B3Pqy5ZDGyQ/fvy+5OmO8jCcLjBlWaBDnk6MStRPdVA=; b=gqRMQ0fZCew0mxDPsI7g na59/Lj3aHC6H6NsTcuRhSOAFr+Hmb6M1CwYIRjgenENi6ljns/VsV58ZOmSx1JnkfVqdQOGJXrO8 vMWFdqtGm8V69+KGaNnAyfCX2QvvXKpnYJafV7JvloWfiJFvmhGEqsIU2wM5IPosPATxlzCR/q0VN ImbNf1/L6vBZffM30zut/cYRccYmwdKqvrfTick1MmSkeAqGAy0A7QN6D1emn2S4dZ5XKR/FL/niy S1G7ewgknzQaeeTbKV2/LDAkzRSMbOx6Dte+FiGwb1vFVej/5DRCG8kv45/IcRNM/xS33hirkmhwI cc1jaxZfhyMqgg==; From: Janneke Nieuwenhuizen Date: Tue, 19 Nov 2024 07:54:58 +0100 Message-ID: <25bd177d4c3c8811d46300ee01ab04fb5c7a66b5.1731999203.git.janneke@gnu.org> X-Mailer: git-send-email 2.46.0 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Flow: FLOW_IN X-Migadu-Country: US X-Migadu-Spam-Score: -6.53 X-Spam-Score: -6.53 X-Migadu-Queue-Id: 59D5B798AE X-Migadu-Scanner: mx13.migadu.com X-TUID: HTYHSvw7oDXl * 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 --- gnu/local.mk | 1 + gnu/packages/gnupg.scm | 22 +++++- .../patches/libgpg-error-hurd64.patch | 78 +++++++++++++++++++ 3 files changed, 98 insertions(+), 3 deletions(-) create mode 100644 gnu/packages/patches/libgpg-error-hurd64.patch diff --git a/gnu/local.mk b/gnu/local.mk index be6befb921..147f8d8709 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1625,6 +1625,7 @@ 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/libvirt-add-install-prefix.patch \ diff --git a/gnu/packages/gnupg.scm b/gnu/packages/gnupg.scm index 2e97c2244a..6535f94cb8 100644 --- a/gnu/packages/gnupg.scm +++ b/gnu/packages/gnupg.scm @@ -22,7 +22,7 @@ ;;; Copyright © 2021 Nikita Domnitskii ;;; Copyright © 2021 Aleksandr Vityazev ;;; Copyright © 2022, 2023 Maxim Cournoyer -;;; Copyright © 2023 Janneke Nieuwenhuizen +;;; Copyright © 2023, 2024 Janneke Nieuwenhuizen ;;; Copyright © 2024 Zheng Junjie <873216071@qq.com> ;;; ;;; This file is part of GNU Guix. @@ -144,9 +144,25 @@ (define-public libgpg-error ;; configuration, as this is not correct for ;; all architectures. (_ #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?) - #~((add-after 'unpack 'skip-tests + #~((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 (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 new file mode 100644 index 0000000000..aac8ce61f1 --- /dev/null +++ b/gnu/packages/patches/libgpg-error-hurd64.patch @@ -0,0 +1,78 @@ +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 + -- 2.46.0