diff options
author | Peter Simons <simons@cryp.to> | 2009-07-02 17:06:01 +0000 |
---|---|---|
committer | Peter Simons <simons@cryp.to> | 2009-07-02 17:06:01 +0000 |
commit | 17d75b8168f7ec8a76e8992983d199cabfb18a6c (patch) | |
tree | 7ca14ab7bb54959428e7a6e998fecf46c952570f /pkgs/development/libraries/buddy | |
parent | aded9986c5b2c282c90e299dae8b403d54a20520 (diff) |
Fixed build of pkgs/development/libraries/buddy with gcc 4.3.3.
svn path=/nixpkgs/trunk/; revision=16150
Diffstat (limited to 'pkgs/development/libraries/buddy')
-rw-r--r-- | pkgs/development/libraries/buddy/default.nix | 21 | ||||
-rw-r--r-- | pkgs/development/libraries/buddy/gcc-4.3.3-fixes.patch | 22 |
2 files changed, 33 insertions, 10 deletions
diff --git a/pkgs/development/libraries/buddy/default.nix b/pkgs/development/libraries/buddy/default.nix index 16db4290ec0d..0b0a937bc182 100644 --- a/pkgs/development/libraries/buddy/default.nix +++ b/pkgs/development/libraries/buddy/default.nix @@ -1,20 +1,21 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchurl, bison }: stdenv.mkDerivation rec { name = "buddy-2.4"; - - meta = { - homepage = "http://sourceforge.net/projects/buddy/"; - description = "binary decision diagram package"; - license = "as-is"; - }; - + src = fetchurl { url = "mirror://sourceforge/buddy/${name}.tar.gz"; sha256 = "0dl86l9xkl33wnkz684xa9axhcxx2zzi4q5lii0axnb9lsk81pyk"; }; - + + buildInputs = [ bison ]; + patches = [ ./gcc-4.3.3-fixes.patch ]; configureFlags = "CFLAGS=-O3 CXXFLAGS=-O3"; - doCheck = true; + + meta = { + homepage = "http://sourceforge.net/projects/buddy/"; + description = "binary decision diagram package"; + license = "as-is"; + }; } diff --git a/pkgs/development/libraries/buddy/gcc-4.3.3-fixes.patch b/pkgs/development/libraries/buddy/gcc-4.3.3-fixes.patch new file mode 100644 index 000000000000..2e7efd1c4666 --- /dev/null +++ b/pkgs/development/libraries/buddy/gcc-4.3.3-fixes.patch @@ -0,0 +1,22 @@ +diff -uwr buddy-2.4.orig/examples/bddcalc/parser.yxx buddy-2.4/examples/bddcalc/parser.yxx +--- buddy-2.4.orig/examples/bddcalc/parser.yxx 2009-07-02 17:12:48.000000000 +0200 ++++ buddy-2.4/examples/bddcalc/parser.yxx 2009-07-02 17:18:36.000000000 +0200 +@@ -7,6 +7,7 @@ + + %{ + #include <string> ++#include <cstdlib> + #include <stdarg.h> + #include <fstream> + #include <getopt.h> +diff -uwr buddy-2.4.orig/src/bddtest.cxx buddy-2.4/src/bddtest.cxx +--- buddy-2.4.orig/src/bddtest.cxx 2009-07-02 17:12:48.000000000 +0200 ++++ buddy-2.4/src/bddtest.cxx 2009-07-02 17:14:05.000000000 +0200 +@@ -28,6 +28,7 @@ + ========================================================================*/ + + #include <string> ++#include <cstdlib> + #include "bdd.h" + #include "bvec.h" + |