diff options
| author | Gabriel Ebner <gebner@gebner.org> | 2016-06-13 13:22:44 +0200 |
|---|---|---|
| committer | Gabriel Ebner <gebner@gebner.org> | 2016-06-19 15:19:25 +0200 |
| commit | cc0b3bbcc2a834640df07c341ba7b0853d72592b (patch) | |
| tree | 5bae5304a519ba9abe5dd908a37a9af603aaea73 /pkgs | |
| parent | da253439ed6399f8315ee30a7b8dd32d68c7d088 (diff) | |
| download | nixlib-cc0b3bbcc2a834640df07c341ba7b0853d72592b.tar nixlib-cc0b3bbcc2a834640df07c341ba7b0853d72592b.tar.gz nixlib-cc0b3bbcc2a834640df07c341ba7b0853d72592b.tar.bz2 nixlib-cc0b3bbcc2a834640df07c341ba7b0853d72592b.tar.lz nixlib-cc0b3bbcc2a834640df07c341ba7b0853d72592b.tar.xz nixlib-cc0b3bbcc2a834640df07c341ba7b0853d72592b.tar.zst nixlib-cc0b3bbcc2a834640df07c341ba7b0853d72592b.zip | |
minisat: support clang
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/applications/science/logic/minisat/clang.diff | 45 | ||||
| -rw-r--r-- | pkgs/applications/science/logic/minisat/default.nix | 4 |
2 files changed, 48 insertions, 1 deletions
diff --git a/pkgs/applications/science/logic/minisat/clang.diff b/pkgs/applications/science/logic/minisat/clang.diff new file mode 100644 index 000000000000..5b5072c71f3f --- /dev/null +++ b/pkgs/applications/science/logic/minisat/clang.diff @@ -0,0 +1,45 @@ +diff -aur minisat/core/SolverTypes.h minisat.clang/core/SolverTypes.h +--- minisat/core/SolverTypes.h 2010-07-10 18:07:36.000000000 +0200 ++++ minisat.clang/core/SolverTypes.h 2016-05-13 12:14:50.759671959 +0200 +@@ -47,7 +47,7 @@ + int x; + + // Use this as a constructor: +- friend Lit mkLit(Var var, bool sign = false); ++ //friend Lit mkLit(Var var, bool sign = false); + + bool operator == (Lit p) const { return x == p.x; } + bool operator != (Lit p) const { return x != p.x; } +@@ -55,7 +55,7 @@ + }; + + +-inline Lit mkLit (Var var, bool sign) { Lit p; p.x = var + var + (int)sign; return p; } ++inline Lit mkLit (Var var, bool sign = false) { Lit p; p.x = var + var + (int)sign; return p; } + inline Lit operator ~(Lit p) { Lit q; q.x = p.x ^ 1; return q; } + inline Lit operator ^(Lit p, bool b) { Lit q; q.x = p.x ^ (unsigned int)b; return q; } + inline bool sign (Lit p) { return p.x & 1; } +diff -aur minisat/utils/Options.h minisat.clang/utils/Options.h +--- minisat/utils/Options.h 2010-07-10 18:07:36.000000000 +0200 ++++ minisat.clang/utils/Options.h 2016-05-13 12:14:50.759671959 +0200 +@@ -282,15 +282,15 @@ + if (range.begin == INT64_MIN) + fprintf(stderr, "imin"); + else +- fprintf(stderr, "%4"PRIi64, range.begin); ++ fprintf(stderr, "%4" PRIi64, range.begin); + + fprintf(stderr, " .. "); + if (range.end == INT64_MAX) + fprintf(stderr, "imax"); + else +- fprintf(stderr, "%4"PRIi64, range.end); ++ fprintf(stderr, "%4" PRIi64, range.end); + +- fprintf(stderr, "] (default: %"PRIi64")\n", value); ++ fprintf(stderr, "] (default: %" PRIi64 ")\n", value); + if (verbose){ + fprintf(stderr, "\n %s\n", description); + fprintf(stderr, "\n"); +Only in minisat.clang/utils: Options.o +Only in minisat.clang/utils: System.o diff --git a/pkgs/applications/science/logic/minisat/default.nix b/pkgs/applications/science/logic/minisat/default.nix index c821020b7381..3ed055cc0936 100644 --- a/pkgs/applications/science/logic/minisat/default.nix +++ b/pkgs/applications/science/logic/minisat/default.nix @@ -9,9 +9,11 @@ stdenv.mkDerivation rec { sha256 = "023qdnsb6i18yrrawlhckm47q8x0sl7chpvvw3gssfyw3j2pv5cj"; }; + patches = stdenv.lib.optionals stdenv.cc.isClang [ ./clang.diff ]; + buildInputs = [ zlib ]; - sourceRoot = "minisat/simp"; + preBuild = "cd simp"; makeFlags = [ "r" "MROOT=.." ]; installPhase = '' mkdir -p $out/bin |