public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #10790 from mcmtroffaes/feature/openssl-mingw

Browse Source 
openssl: cross build improvement
This commit is contained in:
Peter Simons 2015-11-09 20:53:22 +01:00
commit 0435fe715c
2 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkgs/development/libraries/openssl/1.0.2.x.nix
View File

@ -66,11 +66,18 @@ stdenv.mkDerivation rec {
''; '';
crossAttrs = { crossAttrs = {
# upstream patch: https://rt.openssl.org/Ticket/Display.html?id=2558
postPatch = ''
sed -i -e 's/[$][(]CROSS_COMPILE[)]windres/$(WINDRES)/' Makefile.shared
'';
preConfigure='' preConfigure=''
# It's configure does not like --build or --host # It's configure does not like --build or --host
export configureFlags="${concatStringsSep " " (configureFlags ++ [ opensslCrossSystem ])}" export configureFlags="${concatStringsSep " " (configureFlags ++ [ opensslCrossSystem ])}"
# WINDRES and RANLIB need to be prefixed when cross compiling;
# the openssl configure script doesn't do that for us
export WINDRES=${stdenv.cross.config}-windres
export RANLIB=${stdenv.cross.config}-ranlib
''; '';
configureScript = "./Configure"; configureScript = "./Configure";
}; };

9
pkgs/development/libraries/openssl/default.nix
View File

@ -69,11 +69,18 @@ stdenv.mkDerivation rec {
''; '';
crossAttrs = { crossAttrs = {
# upstream patch: https://rt.openssl.org/Ticket/Display.html?id=2558
postPatch = ''
sed -i -e 's/[$][(]CROSS_COMPILE[)]windres/$(WINDRES)/' Makefile.shared
'';
preConfigure='' preConfigure=''
# It's configure does not like --build or --host # It's configure does not like --build or --host
export configureFlags="${concatStringsSep " " (configureFlags ++ [ opensslCrossSystem ])}" export configureFlags="${concatStringsSep " " (configureFlags ++ [ opensslCrossSystem ])}"
# WINDRES and RANLIB need to be prefixed when cross compiling;
# the openssl configure script doesn't do that for us
export WINDRES=${stdenv.cross.config}-windres
export RANLIB=${stdenv.cross.config}-ranlib
''; '';
configureScript = "./Configure"; configureScript = "./Configure";
}; };