alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

don't forget curl-diet itself, d'oh!

Browse source 
svn path=/nixpkgs/trunk/; revision=3776
This commit is contained in:
Armijn Hemel 2005-09-05 11:35:26 +00:00
parent beeda67fb6
commit 69b0f36458
2 changed files with 39 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
pkgs/tools/networking/curl-diet/configure-cxxcpp.patch Normal file
View file

@ -0,0 +1,21 @@
diff -ruN curl-7.12.2/configure curl-7.12.2-new/configure
--- curl-7.12.2/configure 2004-10-18 00:22:10.000000000 +0200
+++ curl-7.12.2-new/configure 2004-12-09 13:58:57.670095179 +0100
@@ -6835,11 +6835,12 @@
if $ac_preproc_ok; then
:
else
- { { echo "$as_me:$LINENO: error: C++ preprocessor \"$CXXCPP\" fails sanity check
-See \`config.log' for more details." >&5
-echo "$as_me: error: C++ preprocessor \"$CXXCPP\" fails sanity check
-See \`config.log' for more details." >&2;}
- { (exit 1); exit 1; }; }
+ #{ { echo "$as_me:$LINENO: error: C++ preprocessor \"$CXXCPP\" fails sanity check
+#See \`config.log' for more details." >&5
+#echo "$as_me: error: C++ preprocessor \"$CXXCPP\" fails sanity check
+#See \`config.log' for more details." >&2;}
+ #{ (exit 1); exit 1; }; }
+ :
fi
ac_ext=cc

18
pkgs/tools/networking/curl-diet/default.nix Normal file
View file

@ -0,0 +1,18 @@
{stdenv, fetchurl, zlib, sslSupport ? false, openssl ? null, dietgcc}:
assert sslSupport -> openssl != null;
stdenv.mkDerivation {
name = "curl-7.14.1";
src = fetchurl {
url = http://curl.haxx.se/download/curl-7.14.1.tar.bz2;
md5 = "8b8723f3c0e7acfb30c5215e6cffde32";
};
buildInputs = [zlib (if sslSupport then openssl else null)];
patches = [./configure-cxxcpp.patch];
#configureFlags = (if sslSupport then "--with-ssl" else "--without-ssl");
configureFlags = "--enable-shared=no" + (if sslSupport then "--with-ssl" else "--without-ssl");
NIX_GCC = dietgcc;
NIX_GLIBC_FLAGS_SET=1;
NIX_CFLAGS_COMPILE="-D_BSD_SOURCE=1 -DHAVE_INET_NTOA_R_2_ARGS=1";
}