From patchwork Fri Jun 18 17:16:05 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: M X-Patchwork-Id: 30427 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 4C5BC27BC81; Fri, 18 Jun 2021 18:22:05 +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 1E69927BC78 for ; Fri, 18 Jun 2021 18:22:05 +0100 (BST) Received: from localhost ([::1]:52566 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1luIBw-0001h2-4R for patchwork@mira.cbaines.net; Fri, 18 Jun 2021 13:22:04 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37714) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1luIA4-0007ie-Ao for guix-patches@gnu.org; Fri, 18 Jun 2021 13:20:08 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:46552) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1luIA4-0004AS-0n for guix-patches@gnu.org; Fri, 18 Jun 2021 13:20:08 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1luIA3-0004sm-Tu for guix-patches@gnu.org; Fri, 18 Jun 2021 13:20:07 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49025] [PATCH v3 core-updates 11/37] libgpg-error: Fix cross-compilation error. Resent-From: Maxime Devos Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 18 Jun 2021 17:20:07 +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.162403676618461 (code B ref 49025); Fri, 18 Jun 2021 17:20:07 +0000 Received: (at 49025) by debbugs.gnu.org; 18 Jun 2021 17:19:26 +0000 Received: from localhost ([127.0.0.1]:58034 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1luI9I-0004nE-6G for submit@debbugs.gnu.org; Fri, 18 Jun 2021 13:19:26 -0400 Received: from andre.telenet-ops.be ([195.130.132.53]:34886) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1luI98-0004j8-Ci for 49025@debbugs.gnu.org; Fri, 18 Jun 2021 13:19:11 -0400 Received: from localhost.localdomain ([213.119.219.214]) by andre.telenet-ops.be with bizsmtp id JhK5250094e8Tal01hK9br; Fri, 18 Jun 2021 19:19:10 +0200 From: Maxime Devos Date: Fri, 18 Jun 2021 19:16:05 +0200 Message-Id: <20210618171631.20534-11-maximedevos@telenet.be> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210618171631.20534-1-maximedevos@telenet.be> References: <20210618171631.20534-1-maximedevos@telenet.be> MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1624036750; bh=po7rDv7BdIVE5g9HkdjKKb8vIZeOm4IuDrvIrTcXbG8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:Reply-To; b=SgOU4CjiL7upYnEQwn6AtANSUFB2+dTlHA/retKoffz2Lh6fW1jf4JTTxRwa7e6Nk E4iV3SwlsHBzZ9ZMEFVNoQU53+SWbKzczUw5AUmUtT63h4uMqpaPNImqub91nzrSip 2u45V7GsheaaN2kimEWIh68u8Zrt6L9cbmxMW8Pxgi+m6wM6lB2R/I2HvtNWF9tNsI Z/Sk2EyuB4XPusHk8lTpFd3Gkd1eEOcLbMagExr4LVyR70KZ/rl9N+El4v5RjRWhvC 1vqGW31iaa2AtHpNFc4ZeItsEMyE8+WaKUMpFJ3x81s9OolpuuqkdhbkIHqcchzZrc rcS3HN9MqlSwg== 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 TODO: inform upstream about the cross-compilation error. * gnu/packages/gnupg.scm (libgpg-error)[arguments]{fix-gen-lock-obj.sh}: Prevent generated header files from being sprinkled with ‘\c’. --- gnu/packages/gnupg.scm | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/gnu/packages/gnupg.scm b/gnu/packages/gnupg.scm index f5d4118af9..1fee30584c 100644 --- a/gnu/packages/gnupg.scm +++ b/gnu/packages/gnupg.scm @@ -100,6 +100,13 @@ (guix build utils)) #:phases (modify-phases %standard-phases + ;; If this is left out, some generated header + ;; files will be sprinkled with ‘\c’, which + ;; the compiler won't like. + (add-after 'unpack 'fix-gen-lock-obj.sh + (lambda _ + (substitute* "src/gen-lock-obj.sh" + (("if test -n `echo -n`") "if ! test -n `echo -n`")))) ;; When cross-compiling, some platform specific properties cannot ;; be detected. Create a symlink to the appropriate platform ;; file if required. Note that these platform files depend on