From patchwork Sat Jun 19 15:04:32 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: M X-Patchwork-Id: 30495 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 B1FD627BC83; Sat, 19 Jun 2021 16:09:27 +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,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 750EC27BC81 for ; Sat, 19 Jun 2021 16:09:27 +0100 (BST) Received: from localhost ([::1]:58314 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lucb8-00059E-Fr for patchwork@mira.cbaines.net; Sat, 19 Jun 2021 11:09:26 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:56584) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lucXv-0007oi-0V for guix-patches@gnu.org; Sat, 19 Jun 2021 11:06:07 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:48873) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lucXu-0007sY-MO for guix-patches@gnu.org; Sat, 19 Jun 2021 11:06:06 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lucXu-0005eY-IG 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 10/36] libgpgerror: Maybe fix a cross-compilation bug. 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.162411512321439 (code B ref 49025); Sat, 19 Jun 2021 15:06:06 +0000 Received: (at 49025) by debbugs.gnu.org; 19 Jun 2021 15:05:23 +0000 Received: from localhost ([127.0.0.1]:60362 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lucXD-0005Za-5z for submit@debbugs.gnu.org; Sat, 19 Jun 2021 11:05:23 -0400 Received: from baptiste.telenet-ops.be ([195.130.132.51]:59236) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lucX2-0005VG-D8 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 K3552500S0mfAB40135Cov; Sat, 19 Jun 2021 17:05:12 +0200 From: Maxime Devos Date: Sat, 19 Jun 2021 17:04:32 +0200 Message-Id: <20210619150458.12057-11-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 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1624115112; bh=IPFgvneN7bHDKrYexwhQDz6Y7ERatBQe8mtSRZ9vaMo=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=AokURjxE3RPDa5/rn2BL2I0yhXQpjJn8AvCcReoSGa1KmABE1khZDjH2AGofZuDHl sIhAxqAGlle1e8pzmK4Hbk6ZSaYsaMd69VhK0OBfVbTWxXbfsHSS88Q6UkQhw9mc0r AaAhkNAySFf+413gOtuvwy8Y0Fo3H30vYXNF4cfHSVKOqw+FyL+P0/FKU5MXV+U5Zw xLSswZk9knC3HzwZJCGgXnJxwdHnw56OE9B79+U++hajO2VwQ0k2K5EPYN7FzKHQRt PDEg/w35EOhC+scZtISP5RDiCQzpknkLk2XUF8OQ2QfHswVfZlD2XnyVBbvG8rP3Wc EMdGjZQsDzJZQ== 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+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 #\-))))