From patchwork Fri Jun 18 16:09:10 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: M X-Patchwork-Id: 30392 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 2358227BC81; Fri, 18 Jun 2021 17:15:39 +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 AC33E27BC78 for ; Fri, 18 Jun 2021 17:15:38 +0100 (BST) Received: from localhost ([::1]:49990 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1luH9d-0000fR-M3 for patchwork@mira.cbaines.net; Fri, 18 Jun 2021 12:15:37 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51924) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1luH5K-0000X5-27 for guix-patches@gnu.org; Fri, 18 Jun 2021 12:11:10 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:46300) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1luH5J-0002A1-M0 for guix-patches@gnu.org; Fri, 18 Jun 2021 12:11:09 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1luH5J-0002zc-HZ for guix-patches@gnu.org; Fri, 18 Jun 2021 12:11:09 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49025] [[PATCH v2 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 16:11:09 +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.162403264511241 (code B ref 49025); Fri, 18 Jun 2021 16:11:09 +0000 Received: (at 49025) by debbugs.gnu.org; 18 Jun 2021 16:10:45 +0000 Received: from localhost ([127.0.0.1]:57799 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1luH4v-0002v9-52 for submit@debbugs.gnu.org; Fri, 18 Jun 2021 12:10:45 -0400 Received: from baptiste.telenet-ops.be ([195.130.132.51]:49146) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1luH4T-0002o5-KP for 49025@debbugs.gnu.org; Fri, 18 Jun 2021 12:10:23 -0400 Received: from localhost.localdomain ([188.188.242.184]) by baptiste.telenet-ops.be with bizsmtp id Jg9t250053zRM2s01gAHMv; Fri, 18 Jun 2021 18:10:17 +0200 From: Maxime Devos Date: Fri, 18 Jun 2021 18:09:10 +0200 Message-Id: <20210618160936.18972-11-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=po7rDv7BdIVE5g9HkdjKKb8vIZeOm4IuDrvIrTcXbG8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:Reply-To; b=MWSuCGLoZCqIpxJKn68bZ67/y40TPs7gTA273bFG74eewKFWj8fSL6QkGMkZw1ZyV qTyBgcPVr/fKAX0M28TmX1YNyuLXNapGpoBOFcOPzWVVJlWoI0AmQy/3UQn9cA3Qto TrkgW+m1/1g9a6nI1gk/3p39jWG7hgOt1D3vEJ/8QGqPQSmO7tXc46x+9PZbhx88ZK QUI3xB7kxrK5tOeg30YzLPK/k2ALoktixVePCxMHe3LQ1h9F/FDzL+4k7lN+b00qdL JLeME1SXWXOzhXCm0s55a8A7p3vwNK1fTXNjo2bRGHoYn+6K8TOFlpTZ8aX7mM58lz FFcCXOXj0StNg== 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