From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:470:142:3::10]:46258) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iPX56-00012o-QJ for guix-patches@gnu.org; Tue, 29 Oct 2019 15:23:05 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iPX55-0007Nm-Nw for guix-patches@gnu.org; Tue, 29 Oct 2019 15:23:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:39802) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iPX55-0007NX-JH for guix-patches@gnu.org; Tue, 29 Oct 2019 15:23:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1iPX53-0003pE-VZ for guix-patches@gnu.org; Tue, 29 Oct 2019 15:23:03 -0400 Subject: [bug#37870] [PATCH v2] gnu: make-nsis: Fix cross-compilation. Resent-Message-ID: Date: Tue, 29 Oct 2019 21:22:14 +0200 From: Efraim Flashner 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: List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: Carl Dong Cc: "37870@debbugs.gnu.org" <37870@debbugs.gnu.org> --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+--