From patchwork Fri Jun 18 16:09:09 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: M X-Patchwork-Id: 30377 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 8DDB027BC81; Fri, 18 Jun 2021 17:13:56 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL, SPF_HELO_PASS,T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 397A727BC78 for ; Fri, 18 Jun 2021 17:13:56 +0100 (BST) Received: from localhost ([::1]:45676 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1luH7z-0006BO-6s for patchwork@mira.cbaines.net; Fri, 18 Jun 2021 12:13:55 -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 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+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches 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 #\-))))