From patchwork Thu Sep 23 10:38:49 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: M X-Patchwork-Id: 33257 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 8F04A27BBE3; Thu, 23 Sep 2021 11:44:30 +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_H2,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 55DF827BBE1 for ; Thu, 23 Sep 2021 11:44:30 +0100 (BST) Received: from localhost ([::1]:50276 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mTMDN-0002hT-9V for patchwork@mira.cbaines.net; Thu, 23 Sep 2021 06:44:29 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60788) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mTM95-0004Ly-HF for guix-patches@gnu.org; Thu, 23 Sep 2021 06:40:05 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:41240) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mTM95-0004a2-8w for guix-patches@gnu.org; Thu, 23 Sep 2021 06:40:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mTM94-00068g-IN for guix-patches@gnu.org; Thu, 23 Sep 2021 06:40:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#50201] [PATCH core-updates-frozen 0/52] Support cross-compilation in glib-or-gtk-build-system and fix cross-compilation errors Resent-From: Maxime Devos Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 23 Sep 2021 10:40:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 50201 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Ludovic =?utf-8?q?Court=C3=A8s?= Cc: Mathieu Othacehe , 50201@debbugs.gnu.org Received: via spool by 50201-submit@debbugs.gnu.org id=B50201.163239354623512 (code B ref 50201); Thu, 23 Sep 2021 10:40:02 +0000 Received: (at 50201) by debbugs.gnu.org; 23 Sep 2021 10:39:06 +0000 Received: from localhost ([127.0.0.1]:52786 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mTM8A-00067A-6T for submit@debbugs.gnu.org; Thu, 23 Sep 2021 06:39:06 -0400 Received: from xavier.telenet-ops.be ([195.130.132.52]:41672) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mTM87-00066w-Lf for 50201@debbugs.gnu.org; Thu, 23 Sep 2021 06:39:04 -0400 Received: from ptr-bvsjgyjmffd7q9timvx.18120a2.ip6.access.telenet.be ([IPv6:2a02:1811:8c09:9d00:aaf1:9810:a0b8:a55d]) by xavier.telenet-ops.be with bizsmtp id xNf12500P0mfAB401Nf144; Thu, 23 Sep 2021 12:39:02 +0200 Message-ID: <7b4f25ef922a0cb28a16b7740e838238a88f0836.camel@telenet.be> From: Maxime Devos Date: Thu, 23 Sep 2021 12:38:49 +0200 In-Reply-To: <87v92sfmum.fsf_-_@gnu.org> References: <20210825180332.5720-1-maximedevos@telenet.be> <20210825180332.5720-45-maximedevos@telenet.be> <87pmtv9iu8.fsf_-_@gnu.org> <9dad287d9cc30856642f3dda45667ebcb12dc2c9.camel@telenet.be> <87v92sfmum.fsf_-_@gnu.org> User-Agent: Evolution 3.34.2 MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1632393542; bh=62DcgkeaBCIgzQ25N375QMINiT+G1nbiCz9BQTBSFuY=; h=Subject:From:To:Cc:Date:In-Reply-To:References; b=tFlA93wjJVfLSayORh3WdRwUezm9amr+Q0OeVuS7DjIk6XEHH2hyBlCYI0EBia92Q ztbQ0CrQYnraVrBNskSJ99xXR5uhBbf4SUTBniGLC1YBBh7CXS/Zfuscti1ciZYtwm m1EsBOkzEKrPH5LSK5YJT/7dJpAR6fV7S0L1i6tHu7oovq97+eUMwtQT1roSub2yDn /Cu50/Hb/MqxbGkuG6i+/xiFRM0f5ECFoL8pvcZwWeKb5qpxJQbMhQdhqjUnU7YehU P8gz8NGTzTj1z/RAi2PyMDLx3GcJGp6s+TBWV0ZF/GM2G4siYJZ4YFVXJ2iWf5xw+8 IETit5IRM4d1A== 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 Ludovic Courtès schreef op wo 22-09-2021 om 21:10 [+0200]: > > > (native-search-paths > > - (list (search-path-specification > > - (variable "PKG_CONFIG_PATH_FOR_BUILD") > > - (files '("lib/pkgconfig" "lib64/pkgconfig" "share/pkgconfig"))))))) > > + (map (lambda (original) > > + (search-path-specification > > + (inherit original) > > + (variable "PKG_CONFIG_FOR_BUILD"))) > > + (package-native-search-paths %pkg-config))))) > > Isn’t that a typo, “PKG_CONFIG_FOR_BUILD” instead of > “PKG_CONFIG_PATH_FOR_BUILD” or (string-append name "_FOR_BUILD")? > > The original spec above looked more appropriate to me. Yes, it's a typo. The attached patch should fix it (now running ./pre-inst-env guix build --target=... ...). I wonder how I could have missed this. Greetings, Maxime. From d365cf26069984d2a10ea6f9cb1aafea023d30e6 Mon Sep 17 00:00:00 2001 From: Maxime Devos Date: Thu, 23 Sep 2021 12:33:01 +0200 Subject: [PATCH core-updates-frozen] gnu: pkg-config: Fix typo in search paths. * gnu/packages/pkg-config.scm (pkg-config-for-build)[native-search-paths]: Use "PKG_CONFIG_PATH_FOR_BUILD" instead of "PKG_CONFIG_PATH". --- gnu/packages/pkg-config.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/pkg-config.scm b/gnu/packages/pkg-config.scm index 2b4173a7db..dd0d18ae36 100644 --- a/gnu/packages/pkg-config.scm +++ b/gnu/packages/pkg-config.scm @@ -166,5 +166,5 @@ exec ~a \"$@\"" (map (lambda (original) (search-path-specification (inherit original) - (variable "PKG_CONFIG_FOR_BUILD"))) + (variable "PKG_CONFIG_PATH_FOR_BUILD"))) (package-native-search-paths %pkg-config))))) -- 2.33.0