synchronize with trunk

svn path=/nixpkgs/branches/stdenv-updates/; revision=30316
2011-11-08 10:18:35 +00:00
parent 91ab98ce09 d5a21a68e5
commit 368ac01473
70 changed files with 829 additions and 2299 deletions
@@ -9,7 +9,6 @@ stdenv.mkDerivation rec {
  };

  buildNativeInputs = [m4];
-  propagatedBuildInputs = [m4];

  doCheck = true;

@@ -11,7 +11,14 @@ stdenv.mkDerivation {
    sha256 = "0ysff249mwhq0053bw3hxh58djc0gy7vjan2z1krrf9n5d5vvv0b";
  };
  buildInputs = [yacc];
-  propagatedBuildInputs = [m4];
+  propagatedBuildNativeInputs = [m4];
+
+  crossAttrs = {
+    preConfigure = ''
+      export ac_cv_func_malloc_0_nonnull=yes
+      export ac_cv_func_realloc_0_nonnull=yes
+    '';
+  };

  meta = {
    description = "A fast lexical analyser generator";