misc minor cross fixups from @bgamari #34173
Merged
+24
−10
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
dtzWill
force-pushed
the
fix/cross-misc-ben-1
branch
from
96391fe to
2900a49
Compare
GrahamcOfBorg
added
10.rebuild-darwin-stdenv
Ericson2314
changed the title
Ericson2314
added
the
6.topic: cross-compilation
Ericson2314
requested changes
Jan 23, 2018
| configureFlags = optional (!cryptoSupport) "--without-crypto" ++ [ | ||
| configureFlags = [] | ||
| ++ optional (buildPlatform != hostPlatform) "--with-libxml-prefix=${libxml2.dev}" | ||
| ++ optional (!cryptoSupport) "--without-crypto" |
There was a problem hiding this comment.
We might as well put these on the end for the nice = [ idiomatic line since we're mass rebuilding today anyways.
| @@ -41,7 +41,10 @@ stdenv.mkDerivation rec { | |||
| propagatedBuildInputs = [ findXMLCatalogs ]; | |||
|
|
|||
| # TODO move cryptoSupport as last flag, when upgrading libxslt | |||
| configureFlags = optional (!cryptoSupport) "--without-crypto" ++ [ | |||
| configureFlags = [] | |||
| ++ optional (buildPlatform != hostPlatform) "--with-libxml-prefix=${libxml2.dev}" | |||
There was a problem hiding this comment.
We can do this unconditionally
| postPatch = '' substituteInPlace Makefile --replace 'STRIP=-s' "STRIP=" ''; | ||
|
|
||
| # The build system is missing a -lz by default | ||
| makeFlags = "SHARED=yes PREFIX=\${out} CC=${stdenv.cc.targetPrefix}gcc"; |
There was a problem hiding this comment.
I don't think this worked before either? Let's use makeFlagsArray and CC=$CC.
|
(or we can drop it for now, whichever you'd prefer) |
|
@dtzWill Sure, will do. |
Otherwise configure seems not to find xml2-config while cross-compiling.
Ericson2314
force-pushed
the
fix/cross-misc-ben-1
branch
2 times, most recently
from
367232c to
16b6e5a
Compare
Ericson2314
approved these changes
Jan 23, 2018
dezgeg
reviewed
Jan 23, 2018
| @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { | |||
|
|
|||
| outputs = [ "out" "lib" ]; | |||
|
|
|||
| nativeBuildInputs = [ perl help2man ]; | |||
| nativeBuildInputs = [ perl help2man m4 ]; | |||
There was a problem hiding this comment.
Is it really both nativeBuildInput and propagatedBuildInput?
There was a problem hiding this comment.
It's certainly possible, and fairly harmless if it isn't. But we can always try without too.
8 tasks
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Another chunk of cross fixups from the big PR.
These are part of stack of patches I've used quite a bit.
Not sure if these are directly buildable from current 'staging',
but are mostly obvious fixes of input categorization.
build-use-sandboxinnix.confon non-NixOS)nix-shell -p nox --run "nox-review wip"./result/bin/)