From: Carl Dong <contact@carldong.me>
To: "37870@debbugs.gnu.org" <37870@debbugs.gnu.org>
Subject: [bug#37870] [PATCH v3] gnu: make-nsis: Fix cross-compilation.
Date: Tue, 29 Oct 2019 20:11:22 +0000 [thread overview]
Message-ID: <EQNLmjJBBcJXGAF1D92CqQkWfqqQkZopkruRXOCXxhntb-csvlu86yS1euXz9CvWa47WdcK_SWVRJH7t5-FY3z4466749_jGiX6BXXHFwC0=@carldong.me> (raw)
In-Reply-To: <lI5DwU353RX8yByF2S7GQy2TR3ndGe6sca1dTT0Wj0b3qR6vQK1ncG7juxeQjNHaIEbycrt_6lC4kbG2urSWIADaqzPkHbh9KfCWHCCK0x0=@carldong.me>
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 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
--
2.23.0
next prev parent reply other threads:[~2019-10-29 20:12 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-10-22 16:14 [bug#37870] [PATCH] gnu: make-nsis: Fix cross-compilation Carl Dong
2019-10-29 16:02 ` [bug#37870] [PATCH v2] " Carl Dong
2019-10-29 19:22 ` Efraim Flashner
2019-11-04 22:11 ` Ludovic Courtès
2019-10-29 20:11 ` Carl Dong [this message]
2019-10-30 7:42 ` [bug#37870] [PATCH v3] " Efraim Flashner
2019-11-05 13:58 ` Ludovic Courtès
2019-11-16 16:25 ` bug#37870: " Ludovic Courtès
2019-11-16 16:25 ` [bug#37870] " Ludovic Courtès
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='EQNLmjJBBcJXGAF1D92CqQkWfqqQkZopkruRXOCXxhntb-csvlu86yS1euXz9CvWa47WdcK_SWVRJH7t5-FY3z4466749_jGiX6BXXHFwC0=@carldong.me' \
--to=contact@carldong.me \
--cc=37870@debbugs.gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).