From debbugs-submit-bounces@debbugs.gnu.org Tue Oct 22 12:14:49 2019 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 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=0.1 required=5.0 tests=BAYES_50,RCVD_IN_DNSWL_LOW, URIBL_BLOCKED autolearn=disabled version=3.3.2 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= To: "guix-patches@gnu.org" From: Carl Dong Subject: [PATCH] gnu: make-nsis: Fix cross-compilation. Message-ID: Feedback-ID: a8j8tDUaJ4AYuDVBywMTwsJebN4w8TVXadJLsJb8td3t3dZi9RdXFlPaQvoFKnI9KgXySsPXcRkajVyY0cGTcA==:Ext:ProtonMail MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 185.70.40.22 X-Spam-Score: -1.3 (-) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: Carl Dong Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.3 (--) Hi all, here's the somewhat hacky patch from #37801, I will follow up on #3= 0756 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(-) 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 ming= w-path?)))) - '("CPLUS_INCLUDE_PATH" "LIBRARY_PATH" "C_INCLUDE_= PATH")))) + '("CPATH" "LIBRARY_PATH")) + ;; Hack to place mingw-w64 path at the end of sear= ch + ;; paths. Could probably use a specfile and diraf= ter + (setenv "CROSS_CPLUS_INCLUDE_PATH" + (string-append + (string-join + (map (lambda (x) (string-append (assoc-r= ef %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 -- 2.23.0 From debbugs-submit-bounces@debbugs.gnu.org Tue Oct 29 12:02:18 2019 Received: (at 37870) by debbugs.gnu.org; 29 Oct 2019 16:02:18 +0000 Received: from localhost ([127.0.0.1]:48540 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iPTwo-0004xC-EE for submit@debbugs.gnu.org; Tue, 29 Oct 2019 12:02:18 -0400 Received: from mail-40132.protonmail.ch ([185.70.40.132]:17521) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iPTwi-0004wv-SJ for 37870@debbugs.gnu.org; Tue, 29 Oct 2019 12:02:16 -0400 Date: Tue, 29 Oct 2019 16:02:01 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=carldong.me; s=protonmail; t=1572364924; bh=KnVOWJfxD9fpiLQVDdNkZcCIiQhesYNDiTDlqtsnVks=; h=Date:To:From:Reply-To:Subject:Feedback-ID:From; b=BZlhQ/DsxqPEGUV3gz22LBr95KRbp9RfrTHjPdyMY20Ao1qlgBZjXCcEfm9lLM9CL Nq0VFf+O9/2iWSiSnOxyIV4Kak34L82WD6sRtC3m/nbv8ikWOUc3RjA4WxwZHg2XX0 D160QNVkotk+1yWi5qotX40NxotlwWWyaik/D8xc= To: "37870@debbugs.gnu.org" <37870@debbugs.gnu.org> From: Carl Dong Subject: [PATCH v2] gnu: make-nsis: Fix cross-compilation. Message-ID: Feedback-ID: a8j8tDUaJ4AYuDVBywMTwsJebN4w8TVXadJLsJb8td3t3dZi9RdXFlPaQvoFKnI9KgXySsPXcRkajVyY0cGTcA==:Ext:ProtonMail MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable X-Spam-Status: No, score=-1.2 required=7.0 tests=ALL_TRUSTED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mail.protonmail.ch X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 37870 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: Carl Dong Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) Updated the patch to make it look a little better :-) Will push to master tomorrow if no objections. ----- * gnu/packages/installers.scm (make-nsis)[arguments]: Enforce correct ordering of search paths (mingw-w64 last). --- gnu/packages/installers.scm | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/gnu/packages/installers.scm b/gnu/packages/installers.scm index c987254d61..035d38ac5a 100644 --- a/gnu/packages/installers.scm +++ b/gnu/packages/installers.scm @@ -48,6 +48,7 @@ (arguments `(#:scons ,scons-python2 #:modules ((srfi srfi-1) + (srfi srfi-26) (guix build utils) (guix build scons-build-system)) #:tests? #f @@ -92,7 +93,19 @@ ;; CROSS_-prefixed version of env vars (setenv (string-append "CROSS_" env-name) (filter-delimited-string env-val ming= w-path?)))) - '("CPLUS_INCLUDE_PATH" "LIBRARY_PATH" "C_INCLUDE_= PATH")))) + '("CPATH" "LIBRARY_PATH")) + ;; Hack to place mingw-w64 path at the end of sear= ch + ;; paths. Could probably use a specfile and diraf= ter + (setenv "CROSS_CPLUS_INCLUDE_PATH" + (string-join + `(,@(map (cut string-append (assoc-ref %b= uild-inputs "xgcc") <>) + `("/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 -- 2.23.0 From debbugs-submit-bounces@debbugs.gnu.org Tue Oct 29 15:22:26 2019 Received: (at 37870) by debbugs.gnu.org; 29 Oct 2019 19:22:26 +0000 Received: from localhost ([127.0.0.1]:48623 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iPX4R-0003o4-LS for submit@debbugs.gnu.org; Tue, 29 Oct 2019 15:22:23 -0400 Received: from flashner.co.il ([178.62.234.194]:54558) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iPX4Q-0003nq-60 for 37870@debbugs.gnu.org; Tue, 29 Oct 2019 15:22:22 -0400 Received: from localhost (unknown [141.226.13.108]) by flashner.co.il (Postfix) with ESMTPSA id 13B76402C3; Tue, 29 Oct 2019 19:22:15 +0000 (UTC) Date: Tue, 29 Oct 2019 21:22:14 +0200 From: Efraim Flashner To: Carl Dong Subject: Re: [bug#37870] [PATCH v2] gnu: make-nsis: Fix cross-compilation. Message-ID: <20191029192214.GE20762@E5400> References: MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="KuLpqunXa7jZSBt+" Content-Disposition: inline In-Reply-To: X-PGP-Key-ID: 0x41AAE7DCCA3D8351 X-PGP-Key: https://flashner.co.il/~efraim/efraim_flashner.asc X-PGP-Fingerprint: A28B F40C 3E55 1372 662D 14F7 41AA E7DC CA3D 8351 User-Agent: Mutt/1.12.2 (2019-09-21) X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 37870 Cc: "37870@debbugs.gnu.org" <37870@debbugs.gnu.org> X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) --KuLpqunXa7jZSBt+ Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Tue, Oct 29, 2019 at 04:02:01PM +0000, Carl Dong wrote: > Updated the patch to make it look a little better :-) > Will push to master tomorrow if no objections. >=20 > ----- >=20 > * gnu/packages/installers.scm (make-nsis)[arguments]: Enforce correct > ordering of search paths (mingw-w64 last). > --- > gnu/packages/installers.scm | 15 ++++++++++++++- > 1 file changed, 14 insertions(+), 1 deletion(-) >=20 > diff --git a/gnu/packages/installers.scm b/gnu/packages/installers.scm > index c987254d61..035d38ac5a 100644 > --- a/gnu/packages/installers.scm > +++ b/gnu/packages/installers.scm > @@ -48,6 +48,7 @@ > (arguments > `(#:scons ,scons-python2 > #:modules ((srfi srfi-1) > + (srfi srfi-26) > (guix build utils) > (guix build scons-build-system)) > #:tests? #f > @@ -92,7 +93,19 @@ > ;; CROSS_-prefixed version of env vars > (setenv (string-append "CROSS_" env-name) > (filter-delimited-string env-val mi= ngw-path?)))) > - '("CPLUS_INCLUDE_PATH" "LIBRARY_PATH" "C_INCLUD= E_PATH")))) > + '("CPATH" "LIBRARY_PATH")) > + ;; Hack to place mingw-w64 path at the end of se= arch > + ;; paths. Could probably use a specfile and dir= after > + (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" > + "/lib/gcc/x86_64-w64-mingw32= /7.4.0/include" > + "/lib/gcc/x86_64-w64-mingw32= /7.4.0/include-fixed")) I'm going to suggest not hardcoding 7.4.0 here > + ,(getenv "CROSS_CPATH")) > + ":")))) > (add-before 'build 'fix-target-detection > (lambda _ > ;; NSIS target detection is screwed up, manually > -- > 2.23.0 >=20 >=20 >=20 --=20 Efraim Flashner =D7=90=D7=A4=D7=A8=D7=99=D7=9D = =D7=A4=D7=9C=D7=A9=D7=A0=D7=A8 GPG key =3D A28B F40C 3E55 1372 662D 14F7 41AA E7DC CA3D 8351 Confidentiality cannot be guaranteed on emails sent or received unencrypted --KuLpqunXa7jZSBt+ Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAABCgAdFiEEoov0DD5VE3JmLRT3Qarn3Mo9g1EFAl24kWQACgkQQarn3Mo9 g1FXdBAAg0e0dxSDRpLi4TOcAYmbqayZ/OnjqZ8dpHzLvVX4sQRiOuzp7FlUM47o Mmw19mXGconx/3t12aq+PJoUy+rLT6YKt9jT7YGhQllQTKXlMF2aOxjO1wSN96A5 5G9A5+wZsmZQhCZJ/I7piyBhQLgBKR3iX/mTE0KhEL434b1nG7VLYT587ehJyr13 svi2WsXXU8LXH59YC4snLD6t6vYr49bQ0DLPH0VPMeXL2AZewWg9+BcG+kLYsF5W DvVLONadImTgyPFnsG5RJ++E4W8p0Ic4bDfreg9fWmdpW+Y7LQqKUBYdf2WO+8Nf 6FKARQwtHQC9xM0/Sbfy6FPDGzG0vxOeS6geqIv61Ni+3S3pWRZ+L6QBiwFSpIfa k29hZirBzGAce4U0kp6XwTOq4nt6xxDs8yQLOILkyK6xbpQC0JbjZbbpB8ZCfLro oJkYDzDpFUg8sd/BY92o86vi1pyJGPHNOxqnzJ+MwCPzyVog+mVFwz2dZ1mhqckG APZRocXKR2uBXrtfOYY1nINo5uz9OYn6hepB9G0QPTr520GlVlJIBwN8YVHNXWkO xsXWWfYQEkVFH2VOveCOd3Ann96EXJonXM4GKeV9o5IkKDW8n82SgPkTPj8xF32y LUVuRHE+FYdTvZi5KiECqq46FKBr19v48locXsh56icvjUjiJ4c= =wvbB -----END PGP SIGNATURE----- --KuLpqunXa7jZSBt+-- From debbugs-submit-bounces@debbugs.gnu.org Tue Oct 29 16:11:39 2019 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= To: "37870@debbugs.gnu.org" <37870@debbugs.gnu.org> From: Carl Dong Subject: [PATCH v3] gnu: make-nsis: Fix cross-compilation. Message-ID: Feedback-ID: a8j8tDUaJ4AYuDVBywMTwsJebN4w8TVXadJLsJb8td3t3dZi9RdXFlPaQvoFKnI9KgXySsPXcRkajVyY0cGTcA==:Ext:ProtonMail MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable X-Spam-Status: No, score=-1.2 required=7.0 tests=ALL_TRUSTED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mail.protonmail.ch X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 37870 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: Carl Dong Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) 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(-) 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 trip= let))) - ("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 ming= w-path?)))) - '("CPLUS_INCLUDE_PATH" "LIBRARY_PATH" "C_INCLUDE_= PATH")))) + '("CPATH" "LIBRARY_PATH")) + ;; Hack to place mingw-w64 path at the end of sear= ch + ;; paths. Could probably use a specfile and diraf= ter + (setenv "CROSS_CPLUS_INCLUDE_PATH" + (string-join + `(,@(map (cut string-append (assoc-ref %b= uild-inputs "xgcc") <>) + `("/include/c++" + ,(string-append "/include/c++/= " ,triplet) + "/include/c++/backward" + ,@(map (cut string-append "/li= b/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 -- 2.23.0 From debbugs-submit-bounces@debbugs.gnu.org Wed Oct 30 03:43:10 2019 Received: (at 37870) by debbugs.gnu.org; 30 Oct 2019 07:43:10 +0000 Received: from localhost ([127.0.0.1]:49189 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iPidK-0001Qg-EJ for submit@debbugs.gnu.org; Wed, 30 Oct 2019 03:43:10 -0400 Received: from flashner.co.il ([178.62.234.194]:55962) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iPidG-0001Q7-Df for 37870@debbugs.gnu.org; Wed, 30 Oct 2019 03:43:06 -0400 Received: from localhost (unknown [141.226.13.108]) by flashner.co.il (Postfix) with ESMTPSA id 5B2F240279; Wed, 30 Oct 2019 07:42:58 +0000 (UTC) Date: Wed, 30 Oct 2019 09:42:57 +0200 From: Efraim Flashner To: Carl Dong Subject: Re: [bug#37870] [PATCH v3] gnu: make-nsis: Fix cross-compilation. Message-ID: <20191030074257.GF20762@E5400> References: MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="NGIwU0kFl1Z1A3An" Content-Disposition: inline In-Reply-To: X-PGP-Key-ID: 0x41AAE7DCCA3D8351 X-PGP-Key: https://flashner.co.il/~efraim/efraim_flashner.asc X-PGP-Fingerprint: A28B F40C 3E55 1372 662D 14F7 41AA E7DC CA3D 8351 User-Agent: Mutt/1.12.2 (2019-09-21) X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 37870 Cc: "37870@debbugs.gnu.org" <37870@debbugs.gnu.org> X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) --NGIwU0kFl1Z1A3An Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Tue, Oct 29, 2019 at 08:11:22PM +0000, Carl Dong wrote: > Updated the patch to address Efraim's suggestion. >=20 > ----- >=20 > * 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(-) >=20 > 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)) >=20 > (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 tr= iplet))) > - ("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 mi= ngw-path?)))) > - '("CPLUS_INCLUDE_PATH" "LIBRARY_PATH" "C_INCLUD= E_PATH")))) > + '("CPATH" "LIBRARY_PATH")) > + ;; Hack to place mingw-w64 path at the end of se= arch > + ;; paths. Could probably use a specfile and dir= after > + (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 I haven't tested it, but it looks good to me --=20 Efraim Flashner =D7=90=D7=A4=D7=A8=D7=99=D7=9D = =D7=A4=D7=9C=D7=A9=D7=A0=D7=A8 GPG key =3D A28B F40C 3E55 1372 662D 14F7 41AA E7DC CA3D 8351 Confidentiality cannot be guaranteed on emails sent or received unencrypted --NGIwU0kFl1Z1A3An Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAABCgAdFiEEoov0DD5VE3JmLRT3Qarn3Mo9g1EFAl25Pv4ACgkQQarn3Mo9 g1Gg2RAAhasFRqmMffU7QxWEoo0usdTDW0iIu0lCIcGInphF/crR03iEnm2KneU2 kPSWyEhpm/eg17yANZ3i3ToIlct84LjhuA+21wDXwKdQmVJMVpftmvco+g3GVMXE ladD4AXHTeiU+CFlTKDvwZ8/blH8p9bNEvvRhQYlrBATYfxJXQ04tydeRhGcfLIi gJ4FZAT8hclap+yYY9qWxRLIBzWTXhOwEuUQ/oP3iWrq0Jfkoo3+h54FkeobjZ2x YiYptGgmp3sqVluWjby0Q+jSaINM6Mj2lsTmXG0KJZOv+n33tZyvGllQVeUmlZYl MF+wBlGOibAwPvvwHI+yXVz7tbZx0fbcpD+wrEzlO3kntX6mkw6RItP1aGf5A/qi JbZZRwGNpoHxS1P9fs9Li04d/UvO4ISKJ2cRQAwZaMa3JloueqcN+elmlWvKMPh2 4YOsz4EdjPpVzk2aSiPoW/Q23/fOSsqcM1RMEUJIcyQj6LH2WZzYr/XQzhnwsmOl /2ep0HtbvIpVuRa5rgOPTTTywtEp2hKlBz9kioHJrLWGEHasp20tOvbP1wM33r8e QhA1G5XcKX2/hPx5nwVDyrwJ+DYlKN34upM0xcFai/ozTBeNkYFYno/SdI9KXf5b j4DQI4ihVo817ep1Ji+RURHr8yG1rAPIBE1piKuknAKxB8U65/o= =E2iR -----END PGP SIGNATURE----- --NGIwU0kFl1Z1A3An-- From debbugs-submit-bounces@debbugs.gnu.org Mon Nov 04 17:11:31 2019 Received: (at 37870) by debbugs.gnu.org; 4 Nov 2019 22:11:31 +0000 Received: from localhost ([127.0.0.1]:37658 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iRkZP-0006bH-Hb for submit@debbugs.gnu.org; Mon, 04 Nov 2019 17:11:31 -0500 Received: from eggs.gnu.org ([209.51.188.92]:39264) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iRkZN-0006b1-6y for 37870@debbugs.gnu.org; Mon, 04 Nov 2019 17:11:29 -0500 Received: from fencepost.gnu.org ([2001:470:142:3::e]:38984) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1iRkZH-0003g6-Uo; Mon, 04 Nov 2019 17:11:23 -0500 Received: from [2a01:e0a:1d:7270:af76:b9b:ca24:c465] (port=36162 helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1iRkZH-0007bl-H5; Mon, 04 Nov 2019 17:11:23 -0500 From: =?utf-8?Q?Ludovic_Court=C3=A8s?= To: Efraim Flashner Subject: Re: [bug#37870] [PATCH v2] gnu: make-nsis: Fix cross-compilation. References: <20191029192214.GE20762@E5400> Date: Mon, 04 Nov 2019 23:11:22 +0100 In-Reply-To: <20191029192214.GE20762@E5400> (Efraim Flashner's message of "Tue, 29 Oct 2019 21:22:14 +0200") Message-ID: <87a79b5m2d.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.3 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 37870 Cc: "37870@debbugs.gnu.org" <37870@debbugs.gnu.org>, Carl Dong X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Hi, Efraim Flashner skribis: > On Tue, Oct 29, 2019 at 04:02:01PM +0000, Carl Dong wrote: >> Updated the patch to make it look a little better :-) >> Will push to master tomorrow if no objections. [...] >> + (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" >> + "/lib/gcc/x86_64-w64-mingw3= 2/7.4.0/include" >> + "/lib/gcc/x86_64-w64-mingw3= 2/7.4.0/include-fixed")) > I'm going to suggest not hardcoding 7.4.0 here Agreed. I guess you could extract the version number by calling =E2=80=98package-version=E2=80=99 on the dependency or something like that = (on the =E2=80=9Chost side=E2=80=9D). Thanks, Ludo=E2=80=99. From debbugs-submit-bounces@debbugs.gnu.org Tue Nov 05 08:59:02 2019 Received: (at 37870) by debbugs.gnu.org; 5 Nov 2019 13:59:03 +0000 Received: from localhost ([127.0.0.1]:37991 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iRzMM-0006Sd-GF for submit@debbugs.gnu.org; Tue, 05 Nov 2019 08:59:02 -0500 Received: from eggs.gnu.org ([209.51.188.92]:36032) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iRzMF-0006S6-ED for 37870@debbugs.gnu.org; Tue, 05 Nov 2019 08:58:55 -0500 Received: from fencepost.gnu.org ([2001:470:142:3::e]:50748) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1iRzM9-0006IW-QS; Tue, 05 Nov 2019 08:58:49 -0500 Received: from [2001:660:6102:320:e120:2c8f:8909:cdfe] (port=52884 helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1iRzM9-0007io-Ci; Tue, 05 Nov 2019 08:58:49 -0500 From: =?utf-8?Q?Ludovic_Court=C3=A8s?= To: Carl Dong Subject: Re: [bug#37870] [PATCH v3] gnu: make-nsis: Fix cross-compilation. References: Date: Tue, 05 Nov 2019 14:58:47 +0100 In-Reply-To: (Carl Dong's message of "Tue, 29 Oct 2019 20:11:22 +0000") Message-ID: <87r22m1l2g.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.3 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 37870 Cc: "37870@debbugs.gnu.org" <37870@debbugs.gnu.org> X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Hi, Carl Dong skribis: > Updated the patch to address Efraim's suggestion. > > ----- > > * gnu/packages/installers.scm (make-nsis)[arguments]: Enforce correct > ordering of search paths (mingw-w64 last). LGTM as well! (I replied yesterday and hadn=E2=80=99t seen you had already posted an upda= ted patch=E2=80=94sorry about that!) Ludo=E2=80=99. From debbugs-submit-bounces@debbugs.gnu.org Sat Nov 16 11:25:38 2019 Received: (at 37870-done) by debbugs.gnu.org; 16 Nov 2019 16:25:39 +0000 Received: from localhost ([127.0.0.1]:39617 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iW0tG-0007OE-E2 for submit@debbugs.gnu.org; Sat, 16 Nov 2019 11:25:38 -0500 Received: from eggs.gnu.org ([209.51.188.92]:48746) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iW0tD-0007Ny-Ce for 37870-done@debbugs.gnu.org; Sat, 16 Nov 2019 11:25:36 -0500 Received: from fencepost.gnu.org ([2001:470:142:3::e]:50904) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1iW0t8-0001cq-8N; Sat, 16 Nov 2019 11:25:30 -0500 Received: from [2a01:e0a:1d:7270:af76:b9b:ca24:c465] (port=47128 helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1iW0sn-0005pO-GR; Sat, 16 Nov 2019 11:25:15 -0500 From: =?utf-8?Q?Ludovic_Court=C3=A8s?= To: Carl Dong Subject: Re: [bug#37870] [PATCH v3] gnu: make-nsis: Fix cross-compilation. References: Date: Sat, 16 Nov 2019 17:25:06 +0100 In-Reply-To: (Carl Dong's message of "Tue, 29 Oct 2019 20:11:22 +0000") Message-ID: <87tv73wzz1.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.3 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 37870-done Cc: "37870@debbugs.gnu.org" <37870-done@debbugs.gnu.org> X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Carl Dong skribis: > 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(-) That was pushed as 2148674372cacc58fbb9d9914010cf0bd9376f1b, closing! Ludo'. From debbugs-submit-bounces@debbugs.gnu.org Sat Nov 16 11:25:42 2019 Received: (at 37870-done) by debbugs.gnu.org; 16 Nov 2019 16:25:42 +0000 Received: from localhost ([127.0.0.1]:39620 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iW0tJ-0007OW-S1 for submit@debbugs.gnu.org; Sat, 16 Nov 2019 11:25:42 -0500 Received: from eggs.gnu.org ([209.51.188.92]:48751) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iW0tH-0007O5-1d for 37870-done@debbugs.gnu.org; Sat, 16 Nov 2019 11:25:39 -0500 Received: from fencepost.gnu.org ([2001:470:142:3::e]:50905) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1iW0tB-0001gz-UK; Sat, 16 Nov 2019 11:25:33 -0500 Received: from [2a01:e0a:1d:7270:af76:b9b:ca24:c465] (port=47130 helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1iW0tB-0005z4-DK; Sat, 16 Nov 2019 11:25:33 -0500 From: =?utf-8?Q?Ludovic_Court=C3=A8s?= To: Carl Dong Subject: Re: [bug#37870] [PATCH v3] gnu: make-nsis: Fix cross-compilation. In-Reply-To: (Carl Dong's message of "Tue, 29 Oct 2019 20:11:22 +0000") References: User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.3 (gnu/linux) Date: Sat, 16 Nov 2019 17:25:32 +0100 Message-ID: <87sgmnwzyb.fsf@gnu.org> MIME-Version: 1.0 Content-Type: text/plain X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 37870-done Cc: "37870@debbugs.gnu.org" <37870-done@debbugs.gnu.org> X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Carl Dong skribis: > 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(-) That was pushed as 2148674372cacc58fbb9d9914010cf0bd9376f1b, closing! Ludo'. From unknown Sat Jun 21 12:22:51 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Sun, 15 Dec 2019 12:24:07 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator