Android and related cross fixes #56197

matthewbauer · 2019-02-22T15:53:05Z

Motivation for this change

Gets more android things to build correctly.

Ericson2314 · 2019-02-22T16:35:48Z

pkgs/development/androidndk-pkgs/androidndk-pkgs.nix

-      echo "-D__ANDROID_API__=${stdenv.targetPlatform.sdkVer}" >> $out/nix-support/cc-cflags
+      echo "-D__ANDROID_API__=${stdenv.targetPlatform.sdkVer} " >> $out/nix-support/cc-cflags
+      echo "-target ${stdenv.targetPlatform.config} " >> $out/nix-support/cc-cflags
+      echo "--gcc-toolchain=${androidndk}/libexec/android-sdk/ndk-bundle/toolchains/${targetInfo.triple}-${targetInfo.gccVer}/prebuilt/${hostInfo.double} " >> $out/nix-support/cc-cflags


This is stuff for LLVM?

Yeah androidndk 18+ is using clang + ld.bfd. Apparently they are planning to move lld eventually. Maybe this would be a good chance to get rid of their toolchain completely and just use gccCrossStageStatic?

On the nixpkgs side, gcc would be probably easier to support, since at the moment the defacto standard is: linux == gcc. Does the current cross-compiling port uses bionic or musl on android?

It uses bionic which would still make since. Right now we also use the NDKs c compiler which isn’t really necessary although it does save us building gcc for android. Since we have androidndk in hydra now i think it becomes easier to do thay.

It uses bionic which would still make since. Right now we also use the NDKs c compiler which isn’t really necessary although it does save us building gcc for android. Since we have androidndk in hydra now i think it becomes easier to do that.

matthewbauer · 2019-02-22T16:43:47Z

pkgs/build-support/cc-wrapper/default.nix

@@ -13,6 +13,7 @@
 , extraPackages ? [], extraBuildCommands ? ""
 , isGNU ? false, isClang ? cc.isClang or false, gnugrep ? null
 , buildPackages ? {}
+, passthru ? {}


This actually isn't needed anymore, although it might still be nice to get androidndk out of stdenv.

Mic92 · 2019-02-22T17:52:46Z

pkgs/top-level/static.nix

@@ -151,4 +148,7 @@ in {
    };
  };

+  unbound = super.unbound.override {
+    static = true;


Maybe enableStatic for consistency?

Oh, there does not seem to be a standard on naming things like this.

Yeah it’s inconsistent… enableStatic usually implies that you should build static libraries. In this case the static is needed for building the binaries statically. That’s the distinction i’ve arrived at between the two.

Now that i think about it, these aren’t really needed for this pr so i could leave them out.

matthewbauer · 2019-02-22T22:42:36Z

It probably would work, but I think the stuff we do with -march flags (which was made generic) is still good, as I'm not sure the triple can control all that.

Could we do that for all gcc toolchains then? I think making it consistent is best for things like this.

nomeata · 2019-02-24T00:39:46Z

Not sure if this is a regression, but on this branch I cannot build libiconv:

/tmp/nix-build-libiconv-1.15-aarch64-unknown-linux-android.drv-0/libiconv-1.15/src/./iconv.c:713: undefined reference to `__errno_location'
/tmp/nix-build-libiconv-1.15-aarch64-unknown-linux-android.drv-0/libiconv-1.15/src/./iconv.c:721: undefined reference to `__errno_location'
/tmp/nix-build-libiconv-1.15-aarch64-unknown-linux-android.drv-0/libiconv-1.15/src/./iconv.c:693: undefined reference to `__errno_location'
/tmp/nix-build-libiconv-1.15-aarch64-unknown-linux-android.drv-0/libiconv-1.15/src/./iconv.c:775: undefined reference to `__errno_location'
/tmp/nix-build-libiconv-1.15-aarch64-unknown-linux-android.drv-0/libiconv-1.15/src/./iconv.c:783: undefined reference to `__errno_location'
../srclib/libicrt.a(progname.o): In function `set_program_name':
/tmp/nix-build-libiconv-1.15-aarch64-unknown-linux-android.drv-0/libiconv-1.15/srclib/progname.c:70: undefined reference to `program_invocation_short_name'
/tmp/nix-build-libiconv-1.15-aarch64-unknown-linux-android.drv-0/libiconv-1.15/srclib/progname.c:70: undefined reference to `program_invocation_short_name'
/tmp/nix-build-libiconv-1.15-aarch64-unknown-linux-android.drv-0/libiconv-1.15/srclib/progname.c:90: undefined reference to `program_invocation_name'
/tmp/nix-build-libiconv-1.15-aarch64-unknown-linux-android.drv-0/libiconv-1.15/srclib/progname.c:90: undefined reference to `program_invocation_name'
../srclib/libicrt.a(safe-read.o): In function `safe_read':
/tmp/nix-build-libiconv-1.15-aarch64-unknown-linux-android.drv-0/libiconv-1.15/srclib/safe-read.c:70: undefined reference to `__errno_location'
../srclib/libicrt.a(strerror.o): In function `rpl_strerror':
/tmp/nix-build-libiconv-1.15-aarch64-unknown-linux-android.drv-0/libiconv-1.15/srclib/strerror.c:60: undefined reference to `__errno_location'
../lib/.libs/libiconv.a(iconv.o): In function `libiconv_open':
/tmp/nix-build-libiconv-1.15-aarch64-unknown-linux-android.drv-0/libiconv-1.15/lib/./iconv.c:238: undefined reference to `__errno_location'
/tmp/nix-build-libiconv-1.15-aarch64-unknown-linux-android.drv-0/libiconv-1.15/lib/./iconv.c:246: undefined reference to `__errno_location'
../lib/.libs/libiconv.a(iconv.o): In function `unicode_loop_convert':
/tmp/nix-build-libiconv-1.15-aarch64-unknown-linux-android.drv-0/libiconv-1.15/lib/./loop_unicode.h:(.text+0x81c): undefined reference to `__errno_location'
../lib/.libs/libiconv.a(iconv.o):/tmp/nix-build-libiconv-1.15-aarch64-unknown-linux-android.drv-0/libiconv-1.15/lib/./loop_unicode.h:347: more undefined references to `__errno_location' follow
../lib/.libs/libiconv.a(localcharset.o): In function `get_charset_aliases':
/tmp/nix-build-libiconv-1.15-aarch64-unknown-linux-android.drv-0/libiconv-1.15/lib/./../libcharset/lib/localcharset.c:217: undefined reference to `__isoc99_fscanf'
clang: error: linker command failed with exit code 1 (use -v to see invocation)
make[1]: *** [Makefile:78: iconv_no_i18n] Error 1
make[1]: Leaving directory '/tmp/nix-build-libiconv-1.15-aarch64-unknown-linux-android.drv-0/libiconv-1.15/src'
make: *** [Makefile:35: all] Error 2
builder for '/nix/store/86bvrw315q6s7hsp9fd3lgq4gzfzfs05-libiconv-1.15-aarch64-unknown-linux-android.drv' failed with exit code 2
cannot build derivation '/nix/store/74g33cc8px3galkxggx0w6a9wcd059jb-SDL-1.2.15-aarch64-unknown-linux-android.drv': 1 dependencies couldn't be built
cannot build derivation '/nix/store/0nykzav51d0cb9lxqx2k7r81npa5g5lz-aarch64-unknown-linux-android-ghc-8.6.3.drv': 1 dependencies couldn't be built
cannot build derivation '/nix/store/j66xgjdpv3ldka7n93ic3lpy8jpq28zj-SDL-0.6.7.0-aarch64-unknown-linux-android.drv': 1 dependencies couldn't be built
error: build of '/nix/store/j66xgjdpv3ldka7n93ic3lpy8jpq28zj-SDL-0.6.7.0-aarch64-unknown-linux-android.drv' failed

(via nix-build -A pkgsCross.aarch64-android-prebuilt.haskellPackages.SDL)

matthewbauer · 2019-02-24T01:58:48Z

~~Yeah im getting that now too. Should have a fix soon.~~ Should be fixed.

These are no longer used. We build all targets now.

LLVM should be target independent because it will work with all machine types. This is different from GCC where it needs to know what target to build ahead of time.

(cherry picked from commit 08f5b419b9efc77db044f8c1d725632552617966)

This should be picking up the OpenGL ES headers provided by the NDK. More testing is needed.

nomeata · 2019-03-02T16:34:12Z

In the hope of not just producing noise: It seems that even with these changes, SDL (the C-library, independent of Haskell) does not cross-build, unless I am invoking it in a wrong way:

$ nix-build -A pkgsCross.aarch64-android-prebuilt.SDL
…
libtool: compile:  aarch64-unknown-linux-android-gcc -g -O2 -I./include -D_GNU_SOURCE=1 -fvisibility=hidden -DHAVE_LINUX_VERSION_H -Wall -c ./src/video/fbcon/SDL_fbelo.c  -fPIC -DPIC -o build/.libs/SDL_fbelo.o
In file included from ./src/video/fbcon/SDL_fb3dfx.c:26:
In file included from ./src/video/fbcon/SDL_fb3dfx.h:26:
In file included from ./src/video/fbcon/SDL_fbvideo.h:33:
In file included from ./src/video/fbcon/../SDL_sysvideo.h:37:
./include/SDL_opengl.h:116:9: warning: 'GL_GLEXT_VERSION' macro redefined [-Wmacro-redefined]
#define GL_GLEXT_VERSION 29
        ^
/usr/include/GL/glext.h:54:9: note: previous definition is here
#define GL_GLEXT_VERSION 20180725
        ^
In file included from ./src/video/fbcon/SDL_fbelo.c:29:
In file included from ./src/video/fbcon/SDL_fbvideo.h:33:
In file included from ./src/video/fbcon/../SDL_sysvideo.h:37:
./include/SDL_opengl.h:116:9: warning: 'GL_GLEXT_VERSION' macro redefined [-Wmacro-redefined]
#define GL_GLEXT_VERSION 29
        ^
/usr/include/GL/glext.h:54:9: note: previous definition is here
#define GL_GLEXT_VERSION 20180725
        ^
./src/video/fbcon/SDL_fbelo.c:221:2: error: invalid output constraint '=c' in asm
        FD_ZERO(&readfds);
        ^
/usr/include/sys/select.h:88:26: note: expanded from macro 'FD_ZERO'
#define FD_ZERO(fdsetp)         __FD_ZERO (fdsetp)
                                ^
/usr/include/bits/select.h:37:8: note: expanded from macro '__FD_ZERO'
                          : "=c" (__d0), "=D" (__d1)                          \
                            ^
1 warning and 1 error generated.
make: *** [build-deps:1070: build/SDL_fbelo.lo] Error 1
make: *** Waiting for unfinished jobs....
1 warning generated.
builder for '/nix/store/s92r33vfbpva297wq5aiawnl8f5g676b-SDL-1.2.15-aarch64-unknown-linux-android.drv' failed with exit code 2
error: build of '/nix/store/s92r33vfbpva297wq5aiawnl8f5g676b-SDL-1.2.15-aarch64-unknown-linux-android.drv' failed

matthewbauer requested review from Ericson2314, LnL7, Mic92 and nbp as code owners February 22, 2019 15:53

matthewbauer mentioned this pull request Feb 22, 2019

Cannot cross-build Haskell-SDL for Android #56120

Open

GrahamcOfBorg added 6.topic: rust 2.status: merge conflict labels Feb 22, 2019

Ericson2314 reviewed Feb 22, 2019

View reviewed changes

matthewbauer commented Feb 22, 2019

View reviewed changes

GrahamcOfBorg removed the 2.status: merge conflict label Feb 22, 2019

GrahamcOfBorg requested review from lovek323 and cpages February 22, 2019 17:17

GrahamcOfBorg added 10.rebuild-darwin: 101-500 10.rebuild-linux: 501+ 10.rebuild-linux: 501-1000 labels Feb 22, 2019

Mic92 reviewed Feb 22, 2019

View reviewed changes

matthewbauer added 6 commits February 24, 2019 17:00

apparmor: use stdenv.lib.getDev for headers

498ad3e

mesa: armv7a-linux supports mesa

bfb45e9

llvm6: remove enableTargets

be6d030

These are no longer used. We build all targets now.

llvm: don’t use targetPlatform

e36cd48

LLVM should be target independent because it will work with all machine types. This is different from GCC where it needs to know what target to build ahead of time.

libpfm: use hostPlatform

76474b2

(cherry picked from commit 08f5b419b9efc77db044f8c1d725632552617966)

SDL{,2}: support building for android

d665b8c

This should be picking up the OpenGL ES headers provided by the NDK. More testing is needed.

matthewbauer force-pushed the cross-fixes3 branch from d1d054b to d665b8c Compare February 24, 2019 22:42

GrahamcOfBorg removed the 6.topic: rust label Feb 24, 2019

matthewbauer changed the base branch from master to staging February 24, 2019 23:39

matthewbauer changed the base branch from staging to master February 24, 2019 23:55

matthewbauer changed the base branch from master to staging February 24, 2019 23:55

matthewbauer merged commit 5c46f77 into NixOS:staging Feb 27, 2019

nomeata mentioned this pull request Feb 27, 2019

Cross-compiling haskell executables for Android #56493

Open

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Android and related cross fixes #56197

Android and related cross fixes #56197

matthewbauer commented Feb 22, 2019

Ericson2314 Feb 22, 2019

matthewbauer Feb 22, 2019

Mic92 Feb 22, 2019 •

edited

matthewbauer Feb 22, 2019

matthewbauer Feb 22, 2019

matthewbauer Feb 22, 2019

Mic92 Feb 22, 2019

Mic92 Feb 22, 2019

matthewbauer Feb 24, 2019

matthewbauer commented Feb 22, 2019

nomeata commented Feb 24, 2019

matthewbauer commented Feb 24, 2019 •

edited

nomeata commented Mar 2, 2019

Android and related cross fixes #56197

Android and related cross fixes #56197

Conversation

matthewbauer commented Feb 22, 2019

Motivation for this change

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Mic92 Feb 22, 2019 • edited

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

matthewbauer commented Feb 22, 2019

nomeata commented Feb 24, 2019

matthewbauer commented Feb 24, 2019 • edited

nomeata commented Mar 2, 2019

Mic92 Feb 22, 2019 •

edited

matthewbauer commented Feb 24, 2019 •

edited