bug#37870: closed ([PATCH] gnu: make-nsis: Fix cross-compilation.)

[GNU bug Tracking System]

Your message dated Sat, 16 Nov 2019 17:25:06 +0100
with message-id <address@hidden>
and subject line Re: [bug#37870] [PATCH v3] gnu: make-nsis: Fix 
cross-compilation.
has caused the debbugs.gnu.org bug report #37870,
regarding [PATCH] gnu: make-nsis: Fix cross-compilation.
to be marked as done.

(If you believe you have received this mail in error, please contact
address@hidden.)


-- 
37870: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=37870
GNU Bug Tracking System
Contact address@hidden with problems
> --- Begin Message ---
>
>
>
> Subject: 
>
> [PATCH] gnu: make-nsis: Fix cross-compilation.
>
>
>
>
> Date: 
>
> Tue, 22 Oct 2019 16:14:33 +0000
>
>
>
>
> 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(-)
>
> 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
> --
> 2.23.0
>
>
>
>
>
> --- End Message ---
> --- Begin Message ---
>
>
>
> Subject: 
>
> Re: [bug#37870] [PATCH v3] gnu: make-nsis: Fix cross-compilation.
>
>
>
>
> Date: 
>
> Sat, 16 Nov 2019 17:25:06 +0100
>
>
>
>
> User-agent: 
>
> Gnus/5.13 (Gnus v5.13) Emacs/26.3 (gnu/linux)
>
>
>
>
> Carl Dong <address@hidden> 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'.
>
>
> --- End Message ---