From patchwork Tue Oct 22 16:14:33 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Carl Dong X-Patchwork-Id: 15808 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 E70EF1761E; Tue, 22 Oct 2019 17:15:11 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id ACC7D1761B for ; Tue, 22 Oct 2019 17:15:11 +0100 (BST) Received: from localhost ([::1]:35192 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iMwoQ-0002bq-TM for patchwork@mira.cbaines.net; Tue, 22 Oct 2019 12:15:10 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36653) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iMwoJ-0002bb-9h for guix-patches@gnu.org; Tue, 22 Oct 2019 12:15:04 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iMwoI-0004Xy-6m for guix-patches@gnu.org; Tue, 22 Oct 2019 12:15:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:51548) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iMwoI-0004Xq-1K for guix-patches@gnu.org; Tue, 22 Oct 2019 12:15:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1iMwoH-0007V7-QX for guix-patches@gnu.org; Tue, 22 Oct 2019 12:15:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#37870] [PATCH] gnu: make-nsis: Fix cross-compilation. Resent-From: Carl Dong Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 22 Oct 2019 16:15:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 37870 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 37870@debbugs.gnu.org X-Debbugs-Original-To: "guix-patches@gnu.org" Received: via spool by submit@debbugs.gnu.org id=B.157176088928781 (code B ref -1); Tue, 22 Oct 2019 16:15:01 +0000 Received: (at submit) by debbugs.gnu.org; 22 Oct 2019 16:14:49 +0000 Received: from localhost ([127.0.0.1]:60366 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iMwo5-0007U9-0G for submit@debbugs.gnu.org; Tue, 22 Oct 2019 12:14:49 -0400 Received: from lists.gnu.org ([209.51.188.17]:53059) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iMwo3-0007U2-V8 for submit@debbugs.gnu.org; Tue, 22 Oct 2019 12:14:48 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36605) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iMwo2-0002ZK-Ay for guix-patches@gnu.org; Tue, 22 Oct 2019 12:14:47 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iMwo0-0004SQ-SG for guix-patches@gnu.org; Tue, 22 Oct 2019 12:14:45 -0400 Received: from mail2.protonmail.ch ([185.70.40.22]:42641) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iMwo0-0004Rx-I7 for guix-patches@gnu.org; Tue, 22 Oct 2019 12:14:44 -0400 Date: Tue, 22 Oct 2019 16:14:33 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=carldong.me; s=protonmail; t=1571760882; bh=oldz8dSaGem+s5G7MXBmrw4JG1UrZ20IP5TcZi82pqo=; h=Date:To:From:Reply-To:Subject:Feedback-ID:From; b=lsIUGOYCurhkXmNXgjWdOMawAZmgktAvcv0k3TG3UK9gQ9/AqdYm5NhLWPglkawLi tTnXLpGaY7mvtU4I2ndHPcKc4Qu4PDWGk9wXpLc2nQPVk4w695pukwjXRXfLJamnkb lNJdSvL9VOAUdnBpVsYpnod8yN3WOdZUiAaBcRtI= From: Carl Dong Message-ID: Feedback-ID: a8j8tDUaJ4AYuDVBywMTwsJebN4w8TVXadJLsJb8td3t3dZi9RdXFlPaQvoFKnI9KgXySsPXcRkajVyY0cGTcA==:Ext:ProtonMail MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: Carl Dong Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches Hi all, here's the somewhat hacky patch from #37801, I will follow up on #30756 about using `-idirafter` as a potentially cleaner fix for #30756, but this should make nsis work for now! * gnu/packages/installers.scm (make-nsis)[arguments]: Enforce correct ordering of search paths (mingw-w64 last). --- gnu/packages/installers.scm | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) -- 2.23.0 diff --git a/gnu/packages/installers.scm b/gnu/packages/installers.scm index c987254d61..e5e38af152 100644 --- a/gnu/packages/installers.scm +++ b/gnu/packages/installers.scm @@ -92,7 +92,21 @@ ;; CROSS_-prefixed version of env vars (setenv (string-append "CROSS_" env-name) (filter-delimited-string env-val mingw-path?)))) - '("CPLUS_INCLUDE_PATH" "LIBRARY_PATH" "C_INCLUDE_PATH")))) + '("CPATH" "LIBRARY_PATH")) + ;; Hack to place mingw-w64 path at the end of search + ;; paths. Could probably use a specfile and dirafter + (setenv "CROSS_CPLUS_INCLUDE_PATH" + (string-append + (string-join + (map (lambda (x) (string-append (assoc-ref %build-inputs "xgcc") x)) + `("/include/c++" + ,(string-append "/include/c++/" ,triplet) + "/include/c++/backward" + "/lib/gcc/x86_64-w64-mingw32/7.4.0/include" + "/lib/gcc/x86_64-w64-mingw32/7.4.0/include-fixed")) + ":") + ":" + (getenv "CROSS_CPATH"))))) (add-before 'build 'fix-target-detection (lambda _ ;; NSIS target detection is screwed up, manually