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

curl: Remove static link support

Browse Source 
We only needed this for the stdenv bootstrap, but not anymore.
This commit is contained in:
Eelco Dolstra 2014-10-29 12:06:27 +01:00
parent d135422009
commit dc0d68ffc3
1 changed files with 2 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
pkgs/tools/networking/curl/default.nix
View File

@ -4,7 +4,6 @@
, scpSupport ? false, libssh2 ? null , scpSupport ? false, libssh2 ? null
, gssSupport ? false, gss ? null , gssSupport ? false, gss ? null
, c-aresSupport ? false, c-ares ? null , c-aresSupport ? false, c-ares ? null
, linkStatic ? false
}: }:
assert zlibSupport -> zlib != null; assert zlibSupport -> zlib != null;
@ -41,29 +40,18 @@ stdenv.mkDerivation rec {
( if scpSupport then "--with-libssh2=${libssh2}" else "--without-libssh2" ) ( if scpSupport then "--with-libssh2=${libssh2}" else "--without-libssh2" )
] ]
++ stdenv.lib.optional c-aresSupport "--enable-ares=${c-ares}" ++ stdenv.lib.optional c-aresSupport "--enable-ares=${c-ares}"
++ stdenv.lib.optional gssSupport "--with-gssapi=${gss}" ++ stdenv.lib.optional gssSupport "--with-gssapi=${gss}";
++ stdenv.lib.optionals linkStatic [ "--enable-static" "--disable-shared" ]
;
dontDisableStatic = linkStatic;
LDFLAGS = if linkStatic then "-static" else "";
CXX = "g++"; CXX = "g++";
CXXCPP = "g++ -E"; CXXCPP = "g++ -E";
# libtool hack to get a static binary. Notice that to 'configure' I passed
# other LDFLAGS, because it doesn't use libtool for linking in the tests.
makeFlags = if linkStatic then "LDFLAGS=-all-static" else "";
crossAttrs = { crossAttrs = {
# We should refer to the cross built openssl # We should refer to the cross built openssl
# For the 'urandom', maybe it should be a cross-system option # For the 'urandom', maybe it should be a cross-system option
configureFlags = [ configureFlags = [
( if sslSupport then "--with-ssl=${openssl.crossDrv}" else "--without-ssl" ) ( if sslSupport then "--with-ssl=${openssl.crossDrv}" else "--without-ssl" )
"--with-random /dev/urandom" "--with-random /dev/urandom"
] ];
++ stdenv.lib.optionals linkStatic [ "--enable-static" "--disable-shared" ]
;
}; };
passthru = { passthru = {