From patchwork Tue Oct 29 20:11:22 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Carl Dong X-Patchwork-Id: 15890 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 AB5C117687; Tue, 29 Oct 2019 20:12:15 +0000 (GMT) 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,RCVD_IN_MSPIKE_H2, 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 6DA8617672 for ; Tue, 29 Oct 2019 20:12:15 +0000 (GMT) Received: from localhost ([::1]:33394 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iPXqg-0000eR-RX for patchwork@mira.cbaines.net; Tue, 29 Oct 2019 16:12:14 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51357) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iPXqZ-0000eG-F5 for guix-patches@gnu.org; Tue, 29 Oct 2019 16:12:09 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iPXqX-0006fV-8P for guix-patches@gnu.org; Tue, 29 Oct 2019 16:12:07 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:39825) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iPXqW-0006eK-1z for guix-patches@gnu.org; Tue, 29 Oct 2019 16:12:05 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1iPXqV-00058v-Iw for guix-patches@gnu.org; Tue, 29 Oct 2019 16:12:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#37870] [PATCH v3] gnu: make-nsis: Fix cross-compilation. References: In-Reply-To: Resent-From: Carl Dong Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 29 Oct 2019 20:12:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 37870 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: "37870@debbugs.gnu.org" <37870@debbugs.gnu.org> Received: via spool by 37870-submit@debbugs.gnu.org id=B37870.157237989919736 (code B ref 37870); Tue, 29 Oct 2019 20:12:02 +0000 Received: (at 37870) by debbugs.gnu.org; 29 Oct 2019 20:11:39 +0000 Received: from localhost ([127.0.0.1]:48646 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iPXq6-00058F-Tx for submit@debbugs.gnu.org; Tue, 29 Oct 2019 16:11:39 -0400 Received: from mail1.protonmail.ch ([185.70.40.18]:52989) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iPXq3-000580-O1 for 37870@debbugs.gnu.org; Tue, 29 Oct 2019 16:11:37 -0400 Date: Tue, 29 Oct 2019 20:11:22 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=carldong.me; s=protonmail; t=1572379889; bh=d2SasI1g1XfYyM1k788ZFDauN2hTUHd3yxtdXWdvxgM=; h=Date:To:From:Reply-To:Subject:Feedback-ID:From; b=T4TWxBJtKS/0Q8fe9iPKugGKNecOrf03i9MCZwFLwP59pP1btgijduA7tSyvTtr+o iY+RvWI2D/HA3NYfWjvnkent94MMlAAzd3/gJIfr+N+BR92A+GI8Q8pR4xUEwAGv+J PsAcsOiGegj/793mqjZvmhmwzcqSktk/PL4EMoGI= From: Carl Dong Message-ID: Feedback-ID: a8j8tDUaJ4AYuDVBywMTwsJebN4w8TVXadJLsJb8td3t3dZi9RdXFlPaQvoFKnI9KgXySsPXcRkajVyY0cGTcA==:Ext:ProtonMail MIME-Version: 1.0 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 Updated the patch to address Efraim's suggestion. ----- * gnu/packages/installers.scm (make-nsis)[arguments]: Enforce correct ordering of search paths (mingw-w64 last). --- gnu/packages/installers.scm | 27 ++++++++++++++++++++++----- 1 file changed, 22 insertions(+), 5 deletions(-) -- 2.23.0 diff --git a/gnu/packages/installers.scm b/gnu/packages/installers.scm index c987254d61..9229359fdf 100644 --- a/gnu/packages/installers.scm +++ b/gnu/packages/installers.scm @@ -28,7 +28,10 @@ #:use-module (guix utils)) (define (make-nsis machine target-arch nsis-target-type) - (let ((triplet (string-append machine "-" "w64-mingw32"))) + (let* ((triplet (string-append machine "-" "w64-mingw32")) + (xbinutils (cross-binutils triplet)) + (xlibc (cross-libc triplet)) + (xgcc (cross-gcc triplet #:libc xlibc))) (package (name (string-append "nsis-" machine)) (version "3.04") @@ -41,13 +44,14 @@ "1xgllk2mk36ll2509hd31mfq6blgncmdzmwxj3ymrwshdh23d5b0")) (patches (search-patches "nsis-env-passthru.patch")))) (build-system scons-build-system) - (native-inputs `(("xgcc" ,(cross-gcc triplet #:libc (cross-libc triplet))) - ("xbinutils" ,(cross-binutils triplet)) - ("mingw-w64" ,(cross-libc triplet)))) + (native-inputs `(("xgcc" ,xgcc) + ("xbinutils" ,xbinutils) + ("mingw-w64" ,xlibc))) (inputs `(("zlib" ,zlib))) (arguments `(#:scons ,scons-python2 #:modules ((srfi srfi-1) + (srfi srfi-26) (guix build utils) (guix build scons-build-system)) #:tests? #f @@ -92,7 +96,20 @@ ;; 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-join + `(,@(map (cut string-append (assoc-ref %build-inputs "xgcc") <>) + `("/include/c++" + ,(string-append "/include/c++/" ,triplet) + "/include/c++/backward" + ,@(map (cut string-append "/lib/gcc/" ,triplet "/" ,(package-version xgcc) <>) + '("/include" + "/include-fixed")))) + ,(getenv "CROSS_CPATH")) + ":")))) (add-before 'build 'fix-target-detection (lambda _ ;; NSIS target detection is screwed up, manually