From patchwork Wed Feb 24 03:00:50 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Carl Dong X-Patchwork-Id: 27231 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 4F6F827BC4A; Wed, 24 Feb 2021 03:02:27 +0000 (GMT) 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, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H3,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 B501D27BC4B for ; Wed, 24 Feb 2021 03:02:25 +0000 (GMT) Received: from localhost ([::1]:50348 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lEkRU-0002L2-Rl for patchwork@mira.cbaines.net; Tue, 23 Feb 2021 22:02:24 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:60878) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lEkR9-0002Kn-9U for guix-patches@gnu.org; Tue, 23 Feb 2021 22:02:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:49667) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lEkR8-0003TI-OB for guix-patches@gnu.org; Tue, 23 Feb 2021 22:02:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lEkR8-0000ns-ME for guix-patches@gnu.org; Tue, 23 Feb 2021 22:02:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#46740] [PATCH] gnu: make-nsis: Fix build Resent-From: Carl Dong Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 24 Feb 2021 03:02:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 46740 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 46740@debbugs.gnu.org Cc: Carl Dong X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.16141356643003 (code B ref -1); Wed, 24 Feb 2021 03:02:02 +0000 Received: (at submit) by debbugs.gnu.org; 24 Feb 2021 03:01:04 +0000 Received: from localhost ([127.0.0.1]:32974 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lEkQB-0000mM-QS for submit@debbugs.gnu.org; Tue, 23 Feb 2021 22:01:04 -0500 Received: from lists.gnu.org ([209.51.188.17]:51870) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lEkQA-0000mC-Ih for submit@debbugs.gnu.org; Tue, 23 Feb 2021 22:01:02 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:60654) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lEkQ8-00029v-PQ for guix-patches@gnu.org; Tue, 23 Feb 2021 22:01:02 -0500 Received: from wout3-smtp.messagingengine.com ([64.147.123.19]:46363) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lEkQ4-0002uu-H5 for guix-patches@gnu.org; Tue, 23 Feb 2021 22:01:00 -0500 Received: from compute2.internal (compute2.nyi.internal [10.202.2.42]) by mailout.west.internal (Postfix) with ESMTP id B3FFCD05; Tue, 23 Feb 2021 22:00:52 -0500 (EST) Received: from mailfrontend2 ([10.202.2.163]) by compute2.internal (MEProxy); Tue, 23 Feb 2021 22:00:52 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=carldong.me; h= from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; s=fm3; bh=Dr9I1213CMoO7+C3v1B48ay+5k PVZ4iOh5ye8QUGW68=; b=uMK/9Bg0y6Xy1bz9MDuca650yWy7FdU1rleoEQT7Um D+wOYbaXI8Ku4OEisu4St3RhpqOTWqLslThZpN2SCKOvoSfNdxePgUeatb4Gj+hx h85EL34z7FFMWHIA3LFfFb/gu9rsGXB1pHieHaIwibDU3cMtupEi5ipcoOTh70jh TKYlyegHn6WZ/PSSt3wOA1H5Z20nCMzHqAtvjm6H722UQaEgHW6gxDioZEEGx0f1 fia8bY+LWI0eDH3HPxodlf2PjhtC9y9ko1MoB8fBbqsAYWYUeSEWgL5ak1cRDMAj 7QjTlXIV72jFDQuZxw0NOHVJC5hGkPPjlCI2bHXj8DOQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:date:from :message-id:mime-version:subject:to:x-me-proxy:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm2; bh=Dr9I1213CMoO7+C3v 1B48ay+5kPVZ4iOh5ye8QUGW68=; b=iVBpUVY6fEgRj1j09Bm06P20iV3U0DYWg m4MdlWSkyJI/YQh0oMWpwTeHW1hRWFgfoaLQf9HXkElzjvLoM95B6eqCvq64FGnq YQ63KLJNyht+2Jo5UzEzo8CBswvjLUsOl7IL8c9K/8xu18YJp5Iv8CwIQzaY8CBv pdumJH4m/GAXD6uUfCPjSPxmhNCVfEV/62fATblU2uTigIXPkihuIrSTe9iR3gg3 UYMQV9Vgzr1Dkl1VzqOaEm17EQeM8k1EFfDb7IhuNbtiAJR7ZNUZbRnxQLEI+cUm ERIn/ck9WPpUoSXSy/LrSq1Z5+aeSg41Q1L6aWtbP4vXP9zVIY4EQ== X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeduledrkeeigdehtdcutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecunecujfgurhephffvufffkffoggfgsedtkeertdertd dtnecuhfhrohhmpeevrghrlhcuffhonhhguceotghonhhtrggtthestggrrhhlughonhhg rdhmvgeqnecuggftrfgrthhtvghrnhepleeuueelleeikefftdeuieefvefhjeffhfffje ehveelheffffeiieegteejveeknecukfhppeegrdehfedrledvrdduudegnecuvehluhhs thgvrhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomheptghonhhtrggtthestg grrhhlughonhhgrdhmvg X-ME-Proxy: Received: from dai.int.chaincode.com (unknown [4.53.92.114]) by mail.messagingengine.com (Postfix) with ESMTPA id E6F081080054; Tue, 23 Feb 2021 22:00:51 -0500 (EST) From: Carl Dong Date: Tue, 23 Feb 2021 22:00:50 -0500 Message-Id: <20210224030050.457744-1-contact@carldong.me> X-Mailer: git-send-email 2.30.1 MIME-Version: 1.0 Received-SPF: pass client-ip=64.147.123.19; envelope-from=contact@carldong.me; helo=wout3-smtp.messagingengine.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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 * gnu/packages/installers.scm (make-nsis)[arguments]: Use C{,PLUS}_INCLUDE_PATH instead of CPATH environment variable to fix build. --- gnu/packages/installers.scm | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/gnu/packages/installers.scm b/gnu/packages/installers.scm index a8a5c36a18..e8196b27d0 100644 --- a/gnu/packages/installers.scm +++ b/gnu/packages/installers.scm @@ -96,9 +96,18 @@ ;; CROSS_-prefixed version of env vars (setenv (string-append "CROSS_" env-name) (filter-delimited-string env-val mingw-path?)))) - '("CPATH" "LIBRARY_PATH")) + '("C_INCLUDE_PATH" "CPLUS_INCLUDE_PATH" "LIBRARY_PATH")) ;; Hack to place mingw-w64 path at the end of search ;; paths. Could probably use a specfile and dirafter + (setenv "CROSS_C_INCLUDE_PATH" + (string-join + `(,@(map (cut string-append (assoc-ref %build-inputs "xgcc") + "/lib/gcc/" ,triplet "/" + ,(package-version xgcc) <>) + '("/include" + "/include-fixed")) + ,(getenv "CROSS_C_INCLUDE_PATH")) + ":")) (setenv "CROSS_CPLUS_INCLUDE_PATH" (string-join `(,@(map (cut string-append (assoc-ref %build-inputs "xgcc") <>) @@ -108,7 +117,7 @@ ,@(map (cut string-append "/lib/gcc/" ,triplet "/" ,(package-version xgcc) <>) '("/include" "/include-fixed")))) - ,(getenv "CROSS_CPATH")) + ,(getenv "CROSS_CPLUS_INCLUDE_PATH")) ":")))) (add-before 'build 'fix-target-detection (lambda _