From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id WH3/NLEIzmBkEAEAgWs5BA (envelope-from ) for ; Sat, 19 Jun 2021 17:09:37 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2 with LMTPS id UH22MLEIzmD3EQAAB5/wlQ (envelope-from ) for ; Sat, 19 Jun 2021 15:09:37 +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 4BCFD21F15 for ; Sat, 19 Jun 2021 17:09:37 +0200 (CEST) Received: from localhost ([::1]:58314 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lucbI-00059E-8r for larch@yhetil.org; Sat, 19 Jun 2021 11:09:36 -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 Content-Transfer-Encoding: 8bit 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+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=1624115377; h=from:from:sender:sender: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=IcUQRyIrbchjYxr+R0lWd0XrEW2izHbB38D2xVp4UkGm4+KPTGIA0y9GJNzq+l5xij4ene +0kOnZhR0zd8sw/B5nY5vML9XXpj41fIAew065N2Erxa2yghyuqMTJpUNsqRcK0X7Lt8P/ 1YWpBVNhfj3+CQcClIQ3wWdQEI0CVxA1ogVthJ6ErflfuRcliKiywq48nQQ3MXdGgjSyQu c0BLfA98Tw9tSlJgZmQpkE5+ZLXxC9OBPFfMGAp2gFmbjY3Xr2udF7lqbT2IPAhzYZqunp 65uxBbixN8mfknkpRW4xFtMO7ZSOYNEcPH68+jdqZkuJjpqJZZ/hd6sBSEbaGg== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1624115377; a=rsa-sha256; cv=none; b=frvSwdQMhJgFCj7pJs1MED5QXUUEzdXkqLjjsv9PeFt3JQ3mp+EgBaAfrY/2DbfypQ/aE0 F6Soyt0IsTr+4bd7gzZx359hcM8gBWPEE8HB2BhIGa0j53RJrQ0CSQ3Y99NSr8i5IaKFa4 3F1fBPB/6BUnuD0PMgAFNfdhQZP388oD3wY1kBqtW4lBQmWSUJxIKl8TX19s2siGh7DOG6 T2306870BW9LuYb2jpt306238d7LkOmKPsRZVZyaTUqGx9XYxnX4CGUtoFblIsGHxJKKQx cCz5tJs4OYvrYXJlu7PYh5zU2qR1DxWsHazlj/IOVQ7ZbrFBXSYtf4k8bv0P0g== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=telenet.be header.s=r21 header.b=AokURjxE; 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: 3.68 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=telenet.be header.s=r21 header.b=AokURjxE; 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: 4BCFD21F15 X-Spam-Score: 3.68 X-Migadu-Scanner: scn0.migadu.com X-TUID: xdZSbKI5rN5S 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