From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id cFPiLCMIzmA7EQEAgWs5BA (envelope-from ) for ; Sat, 19 Jun 2021 17:07:15 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1 with LMTPS id IN2EKCMIzmAOEgAAbx9fmQ (envelope-from ) for ; Sat, 19 Jun 2021 15:07:15 +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 0B52721E96 for ; Sat, 19 Jun 2021 17:07:15 +0200 (CEST) Received: from localhost ([::1]:52014 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lucZ0-0000k1-1h for larch@yhetil.org; Sat, 19 Jun 2021 11:07:14 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:56586) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lucXv-0007qV-CW for guix-patches@gnu.org; Sat, 19 Jun 2021 11:06:07 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:48874) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lucXv-0007si-43 for guix-patches@gnu.org; Sat, 19 Jun 2021 11:06:07 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lucXu-0005ef-Vb for guix-patches@gnu.org; Sat, 19 Jun 2021 11:06:06 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49025] [PATCH v4 core-updates 09/36] libgpg-error: Prevent silent miscompilation some systems. Resent-From: Maxime Devos Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 19 Jun 2021 15:06:06 +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.162411512421446 (code B ref 49025); Sat, 19 Jun 2021 15:06:06 +0000 Received: (at 49025) by debbugs.gnu.org; 19 Jun 2021 15:05:24 +0000 Received: from localhost ([127.0.0.1]:60364 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lucXD-0005Zk-Gd for submit@debbugs.gnu.org; Sat, 19 Jun 2021 11:05:23 -0400 Received: from baptiste.telenet-ops.be ([195.130.132.51]:59208) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lucX1-0005VF-Uf for 49025@debbugs.gnu.org; Sat, 19 Jun 2021 11:05:12 -0400 Received: from localhost.localdomain ([IPv6:2a02:1811:8c09:9d00:aaf1:9810:a0b8:a55d]) by baptiste.telenet-ops.be with bizsmtp id K3552500S0mfAB40135Bom; Sat, 19 Jun 2021 17:05:11 +0200 From: Maxime Devos Date: Sat, 19 Jun 2021 17:04:31 +0200 Message-Id: <20210619150458.12057-10-maximedevos@telenet.be> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210619150458.12057-1-maximedevos@telenet.be> References: <20210619150458.12057-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=1624115111; bh=nKM9iRbL4pxeve/Z9zTlm79RMuw3U+bWD4uPyj+c1VU=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=tpLQrTzLbWVNpxz3331dkgC0AFINZ67k5wzBMl266HSTjziNLerSg7bRf7tLAmm63 V5o68GWmORkJR+3Y+lMLupBusehrUv2D7Hka2TVtuZEphlVgemht70Z3oN5WJdDAk+ +J8XRRMscy4nTc5PaGT9FtM8S6mewNincALOQpe+8thxFE1GPf3jyiiQgLWyuHUM7x /57ZUuqNwlAnrahzxTiPyWow9IV8mPmI6zBpiVPUiyKpLBM61dWz2TjqjCZ77MjH30 aXzsk26Fw7e0pBEwFR84PPT6zTV2Y2MGuGihptYysKLgs8QxfgvuJkaweayMZ3aSCU uAeAyWceQrYWg== 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" X-Migadu-Flow: FLOW_IN ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1624115235; h=from:from:sender:sender: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=AG5EXMYCgZJ3LkD9efVeXBzEqXJPOs2X0QI4ukiXv+TjRjJCxVZRykPwTF8oYL0sWP2vtO G8EznAa6DdC33Eca4BdX2zgulSjtxCKyLmZRxh9CpBGw5wqOjWjxmTjzkglMqf24ESqPrm 6lw8GJsNuYJ2TUl2epTCGUmRC3tL2La6guMVBwjlxwsG/mMHU15se5P7r+wtzwRzeTlRZg UHTMEAd5mK2ecKL1JYxSeq7wTvv3gDe2d0HAioufPUfxKb2CT074B0nLP5Y/N8DcbwzSkA 7BUfrHzTKcmJ1BGua5DuVLZ3V9D64vAM6H7g76stCfUhoH05ONgkI38b/211ig== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1624115235; a=rsa-sha256; cv=none; b=A5gG/yflMSFir0gWuv1ViuVnUILF0tEzhT6LlHslJyCRvEcjO1yJqG8ync1xj1GRut3Aci hC/P3wQJ1gdyqGmCQ94Es17pY+6OGBI9USnCiMw1P1CBAZDTF3wAS9mi+c2Vfj7WtL63Rx i8jaft6cCZCs9DxuVPYy92+hjXbQaa4qMom8EZHzTXm/m0SfyGTyEosPgGJrUCq9pUNzsb OZSxwQJjxyGPcmq1daMpf9PBM9UdzVGehDBwBQIFa13JySDi+EShRcXCqQE/B9wjz2nL3u 8YtBk3/ivPhgNUW3MsmaodgfrcjfM9MZfZtcbI0o8vFJWUeJE3XpQR52p7zxUQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=telenet.be header.s=r21 header.b=tpLQrTzL; 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: -0.32 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=telenet.be header.s=r21 header.b=tpLQrTzL; 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: 0B52721E96 X-Spam-Score: -0.32 X-Migadu-Scanner: scn0.migadu.com X-TUID: BaGobnZahvuw * 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