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

* A function `useDietLibC' that returns a modified stdenv that uses

Browse Source 
dietlibc to produce small, statically linked binaries.  This stdenv
  also passes `-Os' to GCC automatically to optimise for size.  It
  also tries to prevent builders from linking against dynamic
  libraries (which dietlibc doesn't support).

* A function `addAttrsToDerivation' that returns a modified stdenv
  that always adds the specified attributes to the derivations that it
  produces.  Example (from curl):

    curlDiet =  import ../tools/networking/curl {
      inherit fetchurl zlib;
      stdenv = addAttrsToDerivation {
        CFLAGS = "-DHAVE_INET_NTOA_R_2_ARGS=1";
      } (useDietLibC stdenv);
    };

  (This is needed to get curl to build with dietlibc.  Also note the
  stacking of stdenv-modifying functions.)

* curl-diet: no longer necessary.

svn path=/nixpkgs/trunk/; revision=6761
This commit is contained in:
Eelco Dolstra
2006-10-18 12:50:04 +00:00
parent 20d42ae673
commit 501ceef268
7 changed files with 33 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/tools/networking/curl-diet/configure-cxxcpp.patch
-21
View File
@@ -1,21 +0,0 @@
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
pkgs/tools/networking/curl-diet/default.nix
-17
View File
@@ -1,17 +0,0 @@
{stdenv, fetchurl, zlib, sslSupport ? false, openssl ? null, dietgcc}:
assert sslSupport -> openssl != null;
stdenv.mkDerivation {
name = "curl-7.15.5";
src = fetchurl {
url = http://nix.cs.uu.nl/dist/tarballs/curl-7.15.5.tar.bz2;
md5 = "594142c7d53bbdd988e8cef6354eeeff";
};
buildInputs = [zlib (if sslSupport then openssl else null)];
patches = [./configure-cxxcpp.patch];
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";
}
pkgs/tools/networking/curl/builder.sh
-9
View File
@@ -1,9 +0,0 @@
source $stdenv/setup
if test "$sslSupport"; then
configureFlags="--with-ssl=$openssl"
else
configureFlags="--without-ssl"
fi
genericBuild
pkgs/tools/networking/curl/default.nix
+3 -1
View File
@@ -4,12 +4,14 @@ assert sslSupport -> openssl != null;
stdenv.mkDerivation {
name = "curl-7.15.5";
builder = ./builder.sh;
src = fetchurl {
url = http://nix.cs.uu.nl/dist/tarballs/curl-7.15.5.tar.bz2;
md5 = "594142c7d53bbdd988e8cef6354eeeff";
};
buildInputs = [zlib (if sslSupport then openssl else null)];
patches = [./configure-cxxcpp.patch];
configureFlags = "
${if sslSupport then "--with-ssl=${openssl}" else "--without-ssl"}
";
inherit sslSupport openssl;
}