bug#37801: Possible insight into issue #30756 #include_next bug

2019-10-19 Thread Danny Milosavljevic
Hi,

On Fri, 18 Oct 2019 14:02:33 +
Carl Dong  wrote:

> Perhaps Ludovic can confirm this, but I believe the reason why Guix is not
> setting up CROSS_CPATH is because it doesn't _know_ it's cross-compiling. 

Ah, that makes a lot of sense!  But the "cross-gcc" returns a cross compiler
that should know that we're cross-compiling (but it sets up SEARCH-PATHS
with CROSS_LIBRARY_PATH and CROSS_CPATH, but not NATIVE-SEARCH-PATHS.  Hmm).

But the fundamental problem remains that guix host-side can't know whether
we are cross compiling from this.  It has its own cross-compiling support
at the toplevel, at the guix command line.

The following is only tangentially related to your issue, so maybe not so
useful to you:

I've also tried

(define (xcross base-package)
  (package
(inherit base-package)
(search-paths '())
(native-search-paths (list
   (search-path-specification
 (variable "CROSS_LIBRARY_PATH")
 (files '("lib" "lib64")))
   (search-path-specification
 (variable "CROSS_CPATH")
 (files '("lib" "lib64")))

and 

(native-inputs
 `(("pkg-config" ,pkg-config)
   ("cross-gcc" , (xcross (cross-gcc "arm-linux-gnueabihf"
#:xbinutils (cross-binutils 
"arm-linux-gnueabihf")
#:libc (xcross (cross-libc 
"arm-linux-gnueabihf")))
  ;("cross-libc" ,(xcross (cross-libc "arm-linux-gnueabihf"))) ; header 
files
   ("cross-libc-static" ,(xcross (cross-libc "arm-linux-gnueabihf")) 
"static")
   ("libusb" ,libusb)))

for sunxi-tools.

But that didn't work correctly either.

What I'm trying to do is a little different from what you are trying to do.

sunxi-tools has some parts that are supposed to be run on the embedded system in
question and some that are supposed to run on the host (both are GNU systems).
For convenience, I'm (and upstream are) trying to provide both in the
derivation--I think because the tools can send a program via USB to the embedded
system.

So if you compile sunxi-tools on x86_64, you get host tools for x86_64 and 
target
tools for ARM.

If you compile sunxi-tools on x86_64 for RISC-V, you get host tools for
RISC-V and target tools for ARM.

So it basically has to override the "which cross compiler" setting later in
the compilation process.

The more I think about it the more I'm getting the feeling that I should stop
trying to fit a square peg into a round hole and just add an extra package
for the target tools.

So I did the latter.
See guix-patches patch# 37823 which is now very nice.

Thanks for bringing the cross compilation topic up :)


pgpGiXS461P7g.pgp
Description: OpenPGP digital signature


bug#37801: Possible insight into issue #30756 #include_next bug

2019-10-18 Thread Carl Dong
Hi Danny,

Thank you so much for the links and quotes, I'm definitely going to refer back
to them in the future and you probably saved me dozens of hours :-)

> I think so. I can't figure out why Guix is not just setting up CROSS_CPATH
> on its own in the first place.
> gnu/packages/cross-base.scm DOES have a search-path specification for
> CROSS_CPATH.

Perhaps Ludovic can confirm this, but I believe the reason why Guix is not
setting up CROSS_CPATH is because it doesn't _know_ it's cross-compiling. Guix
only sets up CROSS_CPATH when we invoke on the command line with
--target=x86_64-w64-mingw32 or something like that. I'm not exactly sure what a
clean solution to this is, but I'd hope we can find one in the future.

I'm thinking that the reason why my final solution involved explicitly setting
the exact ordering in my CROSS_CPLUS_INCLUDE_PATH was because mingw-w64 is
considered to be libc and that makes it special somehow. Not 100% sure though.

Cheers,
Carl Dong
cont...@carldong.me
"I fight for the users"





bug#37801: Possible insight into issue #30756 #include_next bug

2019-10-17 Thread Danny Milosavljevic
Hi Carl,

On Thu, 17 Oct 2019 21:56:44 +
Carl Dong  wrote:

> Note that the reason mingw-w64-x86_64-6.0.0/include is in this list at all is
> because of the 'fix-env phase I added, which plucked it from CPATH and plopped
> it into CROSS_CPATH.

Yeah, I did the same in sunxi-tools--which was also broken after the 
core-updates
merge, but had been working fine before.
It's using an x86_64->ARM cross compiler.
But just changing it to CROSS_CPATH works, there.

> 3. Does this reveal something more fundamentally wrong with how we build our
> search paths in the first place that should be addressed

I think so.  I can't figure out why Guix is not just setting up CROSS_CPATH
on its own in the first place.
gnu/packages/cross-base.scm DOES have a search-path specification for 
CROSS_CPATH.

Notes:

* CPATH is something like "-I", but CPATH applies after all command-line "-I"s.
* C_INCLUDE_PATH, CPLUS_INCLUDE_PATH and OBJC_INCLUDE_PATH are something like
"-isystem", but they apply after all command-line "-isystem"s.

Note that an empty (colon-separated) element in those environment variables
means "current working directory".

https://gcc.gnu.org/onlinedocs/gcc-6.2.0/gcc/Directory-Options.html :

>If a standard system include directory, or a directory specified with
>-isystem, is also specified with -I, the -I option is ignored. The
>directory is still searched but as a system directory at its normal
>position in the system include chain. This is to ensure that GCC's
>procedure to fix buggy system headers and the ordering for the
>include_next directive are not inadvertently changed. If you really
>need to change the search order for system directories, use the
>-nostdinc and/or -isystem options. 

https://gcc.gnu.org/onlinedocs/cpp/Invocation.html#Invocation :

>The lookup order is as follows:
> For the quote form of the include directive, the directory of the current 
> file is searched first.
> For the quote form of the include directive, the directories specified by 
> -iquote options are searched in LTR order.
> Directories specified with -I options are scanned in left-to-right order.
> Directories specified with -isystem options are scanned in left-to-right 
> order.
> Standard system directories are scanned[, except if -nostdinc[++] is 
> specified].
> Directories specified with -idirafter options are scanned in left-to-right 
> order. 


pgp8FWjvQUuj2.pgp
Description: OpenPGP digital signature


bug#37801: Possible insight into issue #30756 #include_next bug

2019-10-17 Thread Carl Dong
Hi all!

TLDR if you just want to know what's the final patch that worked, grep for
"final patch which works is the following"

This is a long email, but it is only long because I want to be very clear and I
include a lot of snippets of code and logs.

I originally wrote my NSIS package (introduced in e214a22007) on top of
7150743522, which was before the GREAT CORE-UPDATES MERGE. However, after
rebasing it over the GREAT CORE-UPDATES MERGE, the package stopped working. My
investigations into this failure has revealed some insights which might be
useful for other cross-compiling packages and for resolving the long-standing
"important" issue #30756.

For some context, the NSIS package is somewhat special. It requires that both
native compilers and mingw-w64 cross-compilers be available, as NSIS is a
program used to create installers meant to be run on Windows.

My original method of achieving this in pre-GREAT CORE-UPDATES MERGE Guix can be
see in e214a22007, whereby I added a 'fix-env phase. In that 'fix-env phase, I
would remove mingw-w64 paths from CPLUS_INCLUDE_PATH, C_INCLUDE_PATH, and
LIBRARY_PATH, and put them in CROSS_CPLUS_INCLUDE_PATH, CROSS_C_INCLUDE_PATH,
and CROSS_LIBRARY_PATH respectively. This way, the native compilers won't think
that the mingw-w64 paths were something they were supposed to use and get
confused.

As part of the GREAT CORE-UPDATES MERGE, it would seem that CPLUS_INCLUDE_PATH
and C_INCLUDE_PATH are no longer set in the build environment. Rather, only
CPATH is set.

Now, you would think that the solution here is just to replace
CPLUS_INCLUDE_PATH and C_INCLUDE_PATH in my 'fix-env phase with CPATH like so:

diff --git a/gnu/packages/installers.scm b/gnu/packages/installers.scm
index c987254d61..9d29e32485 100644
--- a/gnu/packages/installers.scm
+++ b/gnu/packages/installers.scm
@@ -92,7 +92,7 @@
  ;; 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"
+ '("LIBRARY_PATH" "CPATH"
 (add-before 'build 'fix-target-detection
   (lambda _
 ;; NSIS target detection is screwed up, manually


However, that does not work. Trying to build this fix results in the curious
error that we encounter in the long-standing "important" issue #30756 (to be
clear, this is an error while in the `build' phase of the nsis-x86_64 package,
not mingw-w64):

In file included from 
/gnu/store/4ahrjqb268ip0j0ic0l1phmixic8zfzj-gcc-cross-x86_64-w64-mingw32-7.4.0/include/c++/bits/stl_algo.h:59:0,
 from 
/gnu/store/4ahrjqb268ip0j0ic0l1phmixic8zfzj-gcc-cross-x86_64-w64-mingw32-7.4.0/include/c++/algorithm:62,
 from Contrib/InstallOptions/InstallerOptions.cpp:23:
/gnu/store/4ahrjqb268ip0j0ic0l1phmixic8zfzj-gcc-cross-x86_64-w64-mingw32-7.4.0/include/c++/cstdlib:75:15:
 fatal error: stdlib.h: No such file or directory
 #include_next 
   ^~
compilation terminated.

For some context, here is the full environment-variables file for that failed
build:

export 
CPATH="/gnu/store/4ahrjqb268ip0j0ic0l1phmixic8zfzj-gcc-cross-x86_64-w64-mingw32-7.4.0/include:/gnu/store/qx7p7hiq90mi7r78hcr9cyskccy2j4bg-zlib-1.2.11/include:/gnu/store/l86azr7r3p5631wj3kk329jl1y1mpjgy-bzip2-1.0.6/include:/gnu/store/lbip9isk25isymvnb159l115xnacb5j8-xz-5.2.4/include:/gnu/store/6jdshxwdrad9mlhcqc9k0g24yw45rqf1-file-5.33/include:/gnu/store/2z9hsww76aag37p40671l9niq5pvvasx-gawk-5.0.1/include:/gnu/store/b5vpfzkr59bpgcsg1k9vvad9h5rwvpgk-make-4.2.1/include:/gnu/store/3hkdiscs4910r75njbrql10znxxn7chk-binutils-2.32/include:/gnu/store/x3jx25cd3q363mr7nbgzrhrv1vza6cf7-gcc-7.4.0/include:/gnu/store/ahqgl4h89xqj695lgqvsaf6zh2nhy4pj-glibc-2.29/include:/gnu/store/7czrqpi0kwazras6pgyx0bhdn89pg0jl-linux-libre-headers-4.19.56/include"
export 
CROSS_CPATH="/gnu/store/rabx878fijwgg0yl2bfsx0wvw7d7isnj-mingw-w64-x86_64-6.0.0/include"
export 
CROSS_LIBRARY_PATH="/gnu/store/rabx878fijwgg0yl2bfsx0wvw7d7isnj-mingw-w64-x86_64-6.0.0/lib"
export GUIX_LD_WRAPPER_ALLOW_IMPURITIES="no"
export 
GUIX_LOCPATH="/gnu/store/mmqp1xqffn6qw6v88i627c2bpbq36fcy-glibc-utf8-locales-2.29/lib/locale"
export HOME="/homeless-shelter"
export LC_ALL="en_US.utf8"
export 
LIBRARY_PATH="/gnu/store/xiiafbq3c78kxkgv5zr54zpb8r4jz5ii-scons-python2-3.0.4/lib:/gnu/store/4ahrjqb268ip0j0ic0l1phmixic8zfzj-gcc-cross-x86_64-w64-mingw32-7.4.0/lib:/gnu/store/qx7p7hiq90mi7r78hcr9cyskccy2j4bg-zlib-1.2.11/lib:/gnu/store/l86azr7r3p5631wj3kk329jl1y1mpjgy-bzip2-1.0.6/lib:/gnu/store/lbip9isk25isymvnb159l115xnacb5j8-xz-5.2.4/lib:/gnu/store/6jdshxwdrad9mlhcqc9k0g24yw45rqf1-file-5.33/lib:/gnu/store/2z9hsww76aag37p40671l9niq5pvvasx-gawk-5.0.1/lib:/gnu/store/3hkdiscs4910r75njbrql10znxxn7chk-binutils-2.32/lib:/gnu/store/ahqgl4h89xqj695