From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id WAc9J1jGzGB4QwAAgWs5BA (envelope-from ) for ; Fri, 18 Jun 2021 18:14:16 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0 with LMTPS id aBoFI1jGzGB+GQAA1q6Kng (envelope-from ) for ; Fri, 18 Jun 2021 16:14:16 +0000 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 4C6C112323 for ; Fri, 18 Jun 2021 18:14:16 +0200 (CEST) Received: from localhost ([::1]:46456 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1luH8J-0006gn-98 for larch@yhetil.org; Fri, 18 Jun 2021 12:14:15 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51884) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1luH5F-0000FR-5Z for guix-patches@gnu.org; Fri, 18 Jun 2021 12:11:05 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:46288) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1luH5E-00026C-Rc for guix-patches@gnu.org; Fri, 18 Jun 2021 12:11:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1luH5E-0002yA-M3 for guix-patches@gnu.org; Fri, 18 Jun 2021 12:11:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49025] [[PATCH v2 core-updates] 09/37] libgpg-error: Prevent silent miscompilation some systems. Resent-From: Maxime Devos Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 18 Jun 2021 16:11:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 49025 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 49025@debbugs.gnu.org Cc: othacehe@gnu.org, Maxime Devos Received: via spool by 49025-submit@debbugs.gnu.org id=B49025.162403263511141 (code B ref 49025); Fri, 18 Jun 2021 16:11:04 +0000 Received: (at 49025) by debbugs.gnu.org; 18 Jun 2021 16:10:35 +0000 Received: from localhost ([127.0.0.1]:57775 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1luH4k-0002tW-SM for submit@debbugs.gnu.org; Fri, 18 Jun 2021 12:10:35 -0400 Received: from baptiste.telenet-ops.be ([195.130.132.51]:49146) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1luH4R-0002o5-Ly for 49025@debbugs.gnu.org; Fri, 18 Jun 2021 12:10:16 -0400 Received: from localhost.localdomain ([188.188.242.184]) by baptiste.telenet-ops.be with bizsmtp id Jg9t250053zRM2s01gAFMW; Fri, 18 Jun 2021 18:10:15 +0200 From: Maxime Devos Date: Fri, 18 Jun 2021 18:09:08 +0200 Message-Id: <20210618160936.18972-9-maximedevos@telenet.be> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210618160936.18972-1-maximedevos@telenet.be> References: <20210618160936.18972-1-maximedevos@telenet.be> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1624032615; bh=nKM9iRbL4pxeve/Z9zTlm79RMuw3U+bWD4uPyj+c1VU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:Reply-To; b=aD/UB1WTjJy6LNqYpKmBx87Dz1+UYM26co6HpDIGYdk6xQFxhsC3TbHqzZ4nUYE5X rYQT3WYKAwbudmjo0Die4qoaCQzJJQ4bn+C3FSslvGIUNNW+LGhez9+9GJ3E8aRXv4 4++xikxiA4dA7K3ZVyDG9Sl2oIJP0cDsH5rPyB1OlniR0fHd7rhNQfGUeshsOT/kCd XhJ4CnlOtzzgS7MGs8FvY03NGqeRNZ6nUWgKeDxNGnwzqFwxN1F2bZOyUO/96nRZkR sfqs3SpgCnMVNz3THhxHY2UH2Rk+ig+0ZK/hxoBX3cu1f75eNrS6OMYnPFmbT5Lb8Z NQGBu1ME6BcKg== 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: , Reply-To: 49025@debbugs.gnu.org Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Migadu-Flow: FLOW_IN ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1624032856; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc: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=nKM9iRbL4pxeve/Z9zTlm79RMuw3U+bWD4uPyj+c1VU=; b=cLDOrD3uUjmcvvV6FPG2L0mxSzd9gMRrmxK8l7qEDTIJbm6ynNlvDMua7+BHiSI+qt/TIc NHc2YDxSBoJ67gPZca/s4tbejYq0QIFcAFCpA11+T+pc/wtgK/om9u0XA+BMHU/uKP75ij atW3JTchR55HaWpoPxRSbatSeoVjdrUxdzH2wzU3z/rNwEQQCbheiPghBvsphjzijp26Ox K8ebEiQWUX1P+vWojt7pWhxLe2pOlshRthn4UEduDZMDaXD4PagV1B4aV6A0lMUxjrCUgm YEvdwxk0R2OAVPXWx/LfcTJaJRSFIzi1XCcNOx6jyN5db19dYdrCDwtHaw2Zsw== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1624032856; a=rsa-sha256; cv=none; b=AnoJ+z86DxLnyq7cHgpbhMjsiX+fiUsxau35ArKbe3GIoDXwJ96hUY1urCew/oQA9MKfWl 6s2wQOrOIcSw2RF22T/6epJq9a0sEWQQsqV0M9Wmtm3/b+GNMxH8OXZRB0PWPwzaUnl96Q W5Lf8Ef6B1an/E4op7v89bVMXuPaKOwvDnAQYkpAwUOmG5+Cw+lt8YIAqixKPywqG0gab+ a0I3Lr1Bf3bKrlhDceHlzOmD0caZNDrTVnuSDViYBiTgehVMVB9WPUsWHlc1rRZVcZxzCa FaW0qJfI76eiQqXqkeHYvAbldv6YM/1i9IL0exeTThnnRtDaazdJgtwixM/Wow== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=telenet.be header.s=r21 header.b="aD/UB1WT"; dmarc=fail reason="SPF not aligned (relaxed)" header.from=telenet.be (policy=none); spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Spam-Score: 1.17 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=telenet.be header.s=r21 header.b="aD/UB1WT"; dmarc=fail reason="SPF not aligned (relaxed)" header.from=telenet.be (policy=none); spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Queue-Id: 4C6C112323 X-Spam-Score: 1.17 X-Migadu-Scanner: scn0.migadu.com X-TUID: JpeX27w2eOMB * gnu/packages/gpg.scm (libgpgerror)[arguments]<#:phases>{cross-symlinks}: Only link to src/syscfg/lock-obj-pub.linux-gnu.h if the package is being compiled for a Linux target. Do not link either if the architecture is unknown, as the headers vary with the architecture. --- gnu/packages/gnupg.scm | 40 ++++++++++++++++++++++++++-------------- 1 file changed, 26 insertions(+), 14 deletions(-) diff --git a/gnu/packages/gnupg.scm b/gnu/packages/gnupg.scm index 2f44e6ec6a..de213d381f 100644 --- a/gnu/packages/gnupg.scm +++ b/gnu/packages/gnupg.scm @@ -18,6 +18,7 @@ ;;; Copyright © 2018 Björn Höfling ;;; Copyright © 2019 Mathieu Othacehe ;;; Copyright © 2020 Fredrik Salomonsson +;;; Copyright © 2021 Maxime Devos ;;; ;;; This file is part of GNU Guix. ;;; @@ -77,6 +78,7 @@ #:use-module (guix build-system gnu) #:use-module (guix build-system perl) #:use-module (guix build-system python) + #:use-module (ice-9 match) #:use-module (srfi srfi-1)) (define-public libgpg-error @@ -94,27 +96,37 @@ (build-system gnu-build-system) (arguments (if (%current-target-system) - `(#:modules ((ice-9 match) - (guix build gnu-build-system) + `(#:modules ((guix build gnu-build-system) (guix build utils)) #:phases (modify-phases %standard-phases ;; When cross-compiling, some platform specific properties cannot ;; be detected. Create a symlink to the appropriate platform - ;; file. See Cross-Compiling section at: + ;; file if required. Note that these platform files depend on + ;; both the operating system and architecture! + ;; + ;; See Cross-Compiling section at: ;; https://github.com/gpg/libgpg-error/blob/master/README (add-after 'unpack 'cross-symlinks - (lambda* (#:key target inputs #:allow-other-keys) - (let ((triplet - (match (string-take target - (string-index target #\-)) - ("armhf" "arm-unknown-linux-gnueabi") - ("mips64el" "mips-unknown-linux-gnu") - (x - (string-append x "-unknown-linux-gnu"))))) - (symlink - (string-append "lock-obj-pub." triplet ".h") - "src/syscfg/lock-obj-pub.linux-gnu.h")))))) + (lambda _ + (define (link triplet source) + (symlink (string-append "lock-obj-pub." triplet ".h") + (string-append "src/syscfg/lock-obj-pub." + source ".h"))) + ,(let* ((target (%current-target-system)) + (architecture + (string-take target (string-index target #\-)))) + (cond ((target-linux? target) + (match architecture + ("armhf" + `(link "arm-unknown-linux-gnueabi" "linux-gnu")) + ("mips64el" + `(link "mips-unknown-linux-gnu" "linux-gnu")) + ;; Don't always link to the "linux-gnu" + ;; configuration, as this is not correct for + ;; all architectures. + (_ #t))) + (#t #t))))))) '())) (native-inputs `(("gettext" ,gettext-minimal))) (home-page "https://gnupg.org") -- 2.32.0