From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0 ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id 6Gb+B0bGzGDwQQAAgWs5BA (envelope-from ) for ; Fri, 18 Jun 2021 18:13:58 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0 with LMTPS id ePyRA0bGzGBtGgAA1q6Kng (envelope-from ) for ; Fri, 18 Jun 2021 16:13:58 +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 96F1710D9F for ; Fri, 18 Jun 2021 18:13:57 +0200 (CEST) Received: from localhost ([::1]:45676 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1luH80-0006BO-DU for larch@yhetil.org; Fri, 18 Jun 2021 12:13:56 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51888) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1luH5F-0000Gz-Jx for guix-patches@gnu.org; Fri, 18 Jun 2021 12:11:05 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:46289) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1luH5F-00026Z-8p for guix-patches@gnu.org; Fri, 18 Jun 2021 12:11:05 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1luH5F-0002yI-4S for guix-patches@gnu.org; Fri, 18 Jun 2021 12:11:05 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49025] [[PATCH v2 core-updates] 10/37] libgpgerror: Maybe fix a cross-compilation bug. Resent-From: Maxime Devos Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 18 Jun 2021 16:11:05 +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.162403264111161 (code B ref 49025); Fri, 18 Jun 2021 16:11:05 +0000 Received: (at 49025) by debbugs.gnu.org; 18 Jun 2021 16:10:41 +0000 Received: from localhost ([127.0.0.1]:57777 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1luH4l-0002te-9q for submit@debbugs.gnu.org; Fri, 18 Jun 2021 12:10:41 -0400 Received: from baptiste.telenet-ops.be ([195.130.132.51]:49754) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1luH4T-0002q5-6s for 49025@debbugs.gnu.org; Fri, 18 Jun 2021 12:10:17 -0400 Received: from localhost.localdomain ([188.188.242.184]) by baptiste.telenet-ops.be with bizsmtp id Jg9t250053zRM2s01gAGMp; Fri, 18 Jun 2021 18:10:16 +0200 From: Maxime Devos Date: Fri, 18 Jun 2021 18:09:09 +0200 Message-Id: <20210618160936.18972-10-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-Transfer-Encoding: 8bit DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1624032617; bh=IPFgvneN7bHDKrYexwhQDz6Y7ERatBQe8mtSRZ9vaMo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:Reply-To; b=qcGTRvo2XqOFqWeRMZGNQKdhO3qFQYwHm9VzAB5e3yMixc8z+YEnUFMqUh9trh6jd noSxWTKO1JB8rkh73MWnDqBANN/zyK8bnucDRnzdydbHlLwB9sy6TfK1075Fw6+d4y 63+i7xoKMAn6fpNmrasfVfkItTZfrkBX7t1Ce2MVT1X4zSuA4zCEQJjryNSFjcDwsz jOyB1eUd70t4Iqk+7g3GOHQLdcbH+UNNZq72bF3UGZFrn+dg8cro/zugqyvO3EWMTB baC51LvCvYN7WFHiZzqRIRRBWlD3FC+nabIvxZkXkiQvnXA+/CPzGwbYpBzhsGoVFh FVJpM2DhPDHHQ== 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=1624032837; 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-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=IPFgvneN7bHDKrYexwhQDz6Y7ERatBQe8mtSRZ9vaMo=; b=JENGKvtkW3xC7UVtRmxgmyT9r8K3uaz8h+JCWxwrIgnO1mdE6LTxIhsYvs+j5l1cpFIA3V usscYywXGwhKrxv8hG1q3xP5CDfR5Pt70o+co6yRec213GnJbpdmhhAvOJMxzMeUMNMRfe /7JtXI8640vDmUHrr58iRagZaygHiSXp31ju58BQVDdwLCIANkCsj7cjtqlR8sDsXKYq9l hI6y73e4hw7A9NXxV3moChTb3T1bO/i/eBeslB42buv+CJ/0VSp1H4/HuwpmbHaCjrPOON Wt/jQ37Slmg+eDJKn1XB5kVsO3Jg8uhtXp2Wh1lbb9bQYWD/6+PWIaC2hFnCiA== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1624032837; a=rsa-sha256; cv=none; b=cbC12UYVh8PuNXx/+weYIjzxU+yOz5vEe4pfwEhAWnYpH2O/00mP7IwwEpJkUueLVuhsLf JkY4x+Me52qFqEDVfO6i2lImssM01sCIFEDkw5YGS882LMLxBmah7z1g1zmKjHaXn7bPy7 6IEyb/NhkOpJ1Fgb86twaCio5Xi8VbMmY5+p7wilZPXo5YTpIng9sf1+x0KP1vm+pr5G1I dtqoXzdpUMiV0ebZix4/5GD8jYyqFIGDpMBrqLTzL1q5mD28VapLHXpQLtYtphz1EFQu4l vX1Ubd+yNEy2hm/XCczVc/mmG+/hwdCYup/dRD6KH/omlH2wv1X9GknJq/CbZA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=telenet.be header.s=r21 header.b=qcGTRvo2; 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: 5.17 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=telenet.be header.s=r21 header.b=qcGTRvo2; 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: 96F1710D9F X-Spam-Score: 5.17 X-Migadu-Scanner: scn0.migadu.com X-TUID: 8COAq67j5Z15 Previously, a symlink was created at src/syscfg/lock-obj-pub.linux-gnu.h pointing at lock-obj-pub.MANGLED-TARGET.h. I would think this has to be the other way around, but I am not really sure. * gnu/packages/gnupg.scm (gnupg)[arguments]<#:phases>{cross-symlinks}(link): Switch 'triplet' and 'source'. --- gnu/packages/gnupg.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gnupg.scm b/gnu/packages/gnupg.scm index de213d381f..f5d4118af9 100644 --- a/gnu/packages/gnupg.scm +++ b/gnu/packages/gnupg.scm @@ -110,9 +110,9 @@ (add-after 'unpack 'cross-symlinks (lambda _ (define (link triplet source) - (symlink (string-append "lock-obj-pub." triplet ".h") + (symlink (string-append "lock-obj-pub." source ".h") (string-append "src/syscfg/lock-obj-pub." - source ".h"))) + triplet ".h"))) ,(let* ((target (%current-target-system)) (architecture (string-take target (string-index target #\-)))) -- 2.32.0