Merge remote-tracking branch 'upstream/master' into hardened-stdenv

This commit is contained in:
Robin Gloster
2016-05-30 19:39:34 +00:00
711 changed files with 49079 additions and 11672 deletions
+2 -2
View File
@@ -13,9 +13,9 @@ stdenv.mkDerivation rec {
CPP = "${stdenv.cc}/bin/gcc -E";
configureFlags = "
--enable-shared --disable-all-vads --with-readline=${readline}
--enable-shared --disable-all-vads --with-readline=${readline.dev}
--disable-hslookup --disable-wbxml2 --without-iodbc
--enable-openssl=${openssl}
--enable-openssl=${openssl.dev}
";
postInstall=''
+2 -2
View File
@@ -13,9 +13,9 @@ stdenv.mkDerivation rec {
CPP = "${stdenv.cc}/bin/gcc -E";
configureFlags = "
--enable-shared --disable-all-vads --with-readline=${readline}
--enable-shared --disable-all-vads --with-readline=${readline.dev}
--disable-hslookup --disable-wbxml2 --without-iodbc
--enable-openssl=${openssl}
--enable-openssl=${openssl.dev}
";
postInstall=''