misc cross fixes, batch 4 #34198

dtzWill · 2018-01-23T18:48:22Z

Tested on aarch64, all build except jwhois
which fails due to dependency not being fixed yet.

Included jwhois patch is relatively straightforward
and fixes cross-build on multiple musl-based platforms.

Coming Soon (tm).

Tested using sandboxing (nix.useSandbox on NixOS, or option build-use-sandbox in nix.conf on non-NixOS)
Built on platform(s)
- NixOS
- macOS
- other Linux distributions
Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
Tested compilation of all pkgs that depend on this change using nix-shell -p nox --run "nox-review wip"
Tested execution of all binary files (usually in ./result/bin/)
Fits CONTRIBUTING.md.

cc @Ericson2314

Ericson2314

Thanks again!

Ericson2314 · 2018-01-23T23:27:37Z

pkgs/development/libraries/glib/default.nix

@@ -75,8 +75,13 @@ stdenv.mkDerivation rec {
  # internal pcre would only add <200kB, but it's relatively common
  configureFlags = [ "--with-pcre=system" ]
    ++ optional stdenv.isDarwin "--disable-compile-warnings"
-    ++ optional (stdenv.isFreeBSD || stdenv.isSunOS) "--with-libiconv=gnu"
-    ++ optional stdenv.isSunOS "--disable-dtrace";
+    ++ optional (stdenv.isFreeBSD || stdenv.isSunOS || (stdenv.hostPlatform.libc != "glibc")) "--with-libiconv=gnu"


I think stdenv.hostPlatform.libc != "glibc" covers the rest

I thought so but didn't want to get that wrong... :).

Ericson2314 · 2018-01-23T23:30:03Z

pkgs/development/tools/misc/lsof/default.nix

@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {

  # Stop build scripts from searching global include paths
  LSOF_INCLUDE = "${stdenv.cc.libc}/include";
-  configurePhase = "./Configure -n ${dialect}";
+  configurePhase = "LINUX_CONF_CC=${buildPackages.stdenv.cc}/bin/cc LSOF_CC=$CC LSOF_AR=\"$AR cr\" LSOF_RANLIB=$RANLIB ./Configure -n ${dialect}";


Can use $CC_FOR_BUILD for the first one. Probably easier to read (if not identical semantics) with exports and a multi-line string?

d'oh, yes, much better.

Ericson2314 · 2018-01-23T23:31:22Z

pkgs/tools/misc/file/default.nix

@@ -12,6 +12,7 @@ stdenv.mkDerivation rec {
    sha256 = "0l1bfa0icng9vdwya00ff48fhvjazi5610ylbhl35qi13d6xqfc6";
  };

+  depsBuildBuild = stdenv.lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) file;


I don't think depsBuildBuild has a target platform so nativeBuildInputs should be fine? Can make unconditional too.

This is needed to avoid infinite recursion, or at least that's why it's present. Sounds like comment is needed, at least!

Oh oops. I meant to say file doesn't have a target platform. So yes it should be conditional bit it should also be in nativeBuildInputs.

Ericson2314 · 2018-01-23T23:31:43Z

pkgs/tools/networking/jwhois/default.nix

@@ -15,6 +15,8 @@ stdenv.mkDerivation {

  patches = [ ./connect.patch ./service-name.patch ];

+  makeFlags = [ "AR=${stdenv.cc.targetPrefix}ar" ];


stdenv.cc.bintools.targetPrefix

Ericson2314 · 2018-01-23T23:32:11Z

pkgs/tools/security/rhash/default.nix

@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
  # * .h files installed for static library target only
  # * .so.0 -> .so link only created in the static library install target
  buildPhase = ''
-    make lib-shared lib-static build-shared CC=cc PREFIX=$out
+    make lib-shared lib-static build-shared CC=${stdenv.cc.targetPrefix}cc AR=${stdenv.cc.bintools.targetPrefix}ar PREFIX=$out


CC=$CC AR=$AR

dtzWill · 2018-01-24T00:51:38Z

Feedback addressed, but haven't pushed yet, waiting on testing :).

Thanks for the review! Piece by piece the cross-compilation world shall be conquered!

dtzWill · 2018-01-24T02:39:50Z

Okay, believe all issues have been addressed!

Added depsBuildBuild to lsof since otherwise $CC_FOR_BUILD doesn't work :).

build fails otherwise, presumably not also needed as a buildInput for some reason.

(cherry picked from commit 07f1d9e)

For whatever reason "selfNativeBuildInput = true" doesn't seeem to do the trick here? (reasons may include "it's not intended to solve this problem" ;))

tweaked to handle non-glibc along with others

dtzWill · 2018-01-24T15:37:16Z

Fixed "file" per review, thank you! Things still looking good on native and cross-aarch64.

vcunat · 2018-01-28T16:35:45Z

The glib change caused a mass failure on Darwin: https://hydra.nixos.org/build/68330165 Anyone has an idea what configure parameter is best to pass if targeting Darwin? @LnL7 Not passing any seemed to be OK on Hydra (that was so before this PR).

LnL7 · 2018-01-28T17:14:27Z

On darwin libiconv is https://opensource.apple.com/source/libiconv, not the gnu version.

vcunat · 2018-01-28T17:18:12Z

That seems to be OK in build inputs (pkgs.libiconv).

Ericson2314 · 2018-01-28T18:58:22Z

https://developer.gnome.org/glib/stable/glib-building.html I guess there is an iconv function vehich is good enough on Darwin? Or we can just add a libiconv dep.

vcunat · 2018-01-28T19:34:17Z

The dep used to work OK on Darwin (apparently), up to this PR which added a configure flag for Darwin (--with-libiconv=gnu).

vcunat · 2018-01-28T20:04:59Z

Reading the gnome link, we'll go with this?

diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix
index 656cdffbb4c..2071eb935ae 100644
--- a/pkgs/development/libraries/glib/default.nix
+++ b/pkgs/development/libraries/glib/default.nix
@@ -75,7 +75,8 @@ stdenv.mkDerivation rec {
   # internal pcre would only add <200kB, but it's relatively common
   configureFlags = [ "--with-pcre=system" ]
     ++ optional stdenv.isDarwin "--disable-compile-warnings"
-    ++ optional (stdenv.hostPlatform.libc != "glibc") "--with-libiconv=gnu"
+    ++ optional (stdenv.hostPlatform.libc != "glibc" && !stdenv.hostPlatform.isDarwin)
+      "--with-libiconv=gnu"
     ++ optional stdenv.isSunOS "--disable-dtrace"
     # Can't run this test when cross-compiling
     ++ optionals (stdenv.hostPlatform != stdenv.buildPlatform)

dtzWill · 2018-01-29T00:11:16Z

Sounds good to me, sorry about the breakage!

@vcunat

Fix the failure caused in NixOS#34198 by a suggested change of mine. @vcunat reported in [1]. [1]: NixOS#34198 (comment)

hopefully

GrahamcOfBorg added 10.rebuild-darwin: 501+ 10.rebuild-linux: 501+ labels Jan 23, 2018

Ericson2314 requested changes Jan 23, 2018

View reviewed changes

dtzWill force-pushed the fix/cross-misc-4 branch from e66f907 to f57b8ce Compare January 24, 2018 01:13

dtzWill mentioned this pull request Jan 24, 2018

rhash: cleanup, 1.3.3 -> 1.3.5 #34214

Closed

8 tasks

bgamari and others added 12 commits January 24, 2018 09:33

e2fsprogs: Enable cross-compilation

b62864a

e2fsprogs: depsBuildBuild

3fe8e61

lsof: fix for cross

fffd72c

jwhois: set AR to fix cross build

10aa7a9

cron: fix for cross ($CC, no 'install -s')

11281bb

aspell: perl should be nativeBuildInput

0509695

build fails otherwise, presumably not also needed as a buildInput for some reason.

rhash: Enable cross-compilation

a0410d9

(cherry picked from commit 07f1d9e)

libomxil-bellagio: Enable cross-compilation

3655157

libgpg-error: Enable cross-compilation

4df330e

libgpg-error: fixup

162398f

file: fix for cross

2060f54

For whatever reason "selfNativeBuildInput = true" doesn't seeem to do the trick here? (reasons may include "it's not intended to solve this problem" ;))

glib: Allow cross compilation

c68aa53

tweaked to handle non-glibc along with others

dtzWill force-pushed the fix/cross-misc-4 branch from f57b8ce to c68aa53 Compare January 24, 2018 15:35

Ericson2314 merged commit 8696dbe into NixOS:staging Jan 24, 2018

dtzWill deleted the fix/cross-misc-4 branch January 24, 2018 17:40

Ericson2314 mentioned this pull request Jan 29, 2018

glib: Fix Darwin build #34373

Merged

8 tasks

Ericson2314 added a commit to obsidiansystems/nixpkgs that referenced this pull request Jan 29, 2018

glibc: Fix Darwin build

82ebace

Fix the failure caused in NixOS#34198 by a suggested change of mine. @vcunat reported in [1]. [1]: NixOS#34198 (comment)

vcunat added a commit that referenced this pull request Jan 29, 2018

glib: fixup build on Darwin after #34198

64ba681

hopefully

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

misc cross fixes, batch 4 #34198

misc cross fixes, batch 4 #34198

dtzWill commented Jan 23, 2018 •

edited

Ericson2314 left a comment

Ericson2314 Jan 23, 2018

dtzWill Jan 24, 2018

Ericson2314 Jan 23, 2018

dtzWill Jan 24, 2018

Ericson2314 Jan 23, 2018

dtzWill Jan 24, 2018

Ericson2314 Jan 24, 2018

Ericson2314 Jan 24, 2018

Ericson2314 Jan 23, 2018

Ericson2314 Jan 23, 2018

dtzWill commented Jan 24, 2018

dtzWill commented Jan 24, 2018

dtzWill commented Jan 24, 2018

vcunat commented Jan 28, 2018

LnL7 commented Jan 28, 2018

vcunat commented Jan 28, 2018

Ericson2314 commented Jan 28, 2018

vcunat commented Jan 28, 2018 •

edited

vcunat commented Jan 28, 2018

dtzWill commented Jan 29, 2018

		@@ -15,6 +15,8 @@ stdenv.mkDerivation {

		patches = [ ./connect.patch ./service-name.patch ];

		makeFlags = [ "AR=${stdenv.cc.targetPrefix}ar" ];

misc cross fixes, batch 4 #34198

misc cross fixes, batch 4 #34198

Conversation

dtzWill commented Jan 23, 2018 • edited

Ericson2314 left a 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

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

dtzWill commented Jan 24, 2018

dtzWill commented Jan 24, 2018

dtzWill commented Jan 24, 2018

vcunat commented Jan 28, 2018

LnL7 commented Jan 28, 2018

vcunat commented Jan 28, 2018

Ericson2314 commented Jan 28, 2018

vcunat commented Jan 28, 2018 • edited

vcunat commented Jan 28, 2018

dtzWill commented Jan 29, 2018

dtzWill commented Jan 23, 2018 •

edited

vcunat commented Jan 28, 2018 •

edited