diff options
| author | jperkin <jperkin@pkgsrc.org> | 2014-01-09 14:38:33 +0000 |
|---|---|---|
| committer | jperkin <jperkin@pkgsrc.org> | 2014-01-09 14:38:33 +0000 |
| commit | 9842809ee9164978a421f87831f9981f759fa330 (patch) | |
| tree | 309ac359f7ce564e492b202b0f5a837eac51bb9d /math | |
| parent | 374ae5f351579e3bb328424166933687478924ef (diff) | |
| download | pkgsrc-9842809ee9164978a421f87831f9981f759fa330.tar.gz | |
Needs zlib. Provide dummy Minisat::memUsedPeak().
Diffstat (limited to 'math')
| -rw-r--r-- | math/minisat/Makefile | 3 | ||||
| -rw-r--r-- | math/minisat/distinfo | 4 | ||||
| -rw-r--r-- | math/minisat/patches/patch-utils_System.cc | 11 |
3 files changed, 13 insertions, 5 deletions
diff --git a/math/minisat/Makefile b/math/minisat/Makefile index 84f6632b714..527c73570cc 100644 --- a/math/minisat/Makefile +++ b/math/minisat/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.1.1 2013/10/28 04:15:11 asau Exp $ +# $NetBSD: Makefile,v 1.2 2014/01/09 14:38:33 jperkin Exp $ DISTNAME= minisat-2.2.0 CATEGORIES= math @@ -23,4 +23,5 @@ do-install: $(INSTALL_PROGRAM) $(WRKSRC)/simp/minisat \ $(DESTDIR)$(PREFIX)/bin/minisat +.include "../../devel/zlib/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/math/minisat/distinfo b/math/minisat/distinfo index 58dffae5869..06a2dadfb8a 100644 --- a/math/minisat/distinfo +++ b/math/minisat/distinfo @@ -1,7 +1,7 @@ -$NetBSD: distinfo,v 1.2 2013/11/08 21:15:02 joerg Exp $ +$NetBSD: distinfo,v 1.3 2014/01/09 14:38:33 jperkin Exp $ SHA1 (minisat-2.2.0.tar.gz) = dfc25898bf40e00cf04252a42176e0c0600fbc90 RMD160 (minisat-2.2.0.tar.gz) = 169ec9116befa9067db9076d26309f7e9ab408dd Size (minisat-2.2.0.tar.gz) = 43879 bytes SHA1 (patch-core_SolverTypes.h) = 969937eaaaac60b5e2b415ce3282797daacc4890 -SHA1 (patch-utils_System.cc) = 74c1af06a8a8c6f0ec85fc55cfb3d7060ee9a141 +SHA1 (patch-utils_System.cc) = b24990458c2abb9fca014ddccd27220a49ea7799 diff --git a/math/minisat/patches/patch-utils_System.cc b/math/minisat/patches/patch-utils_System.cc index 61385d45ef7..7d119e69c5d 100644 --- a/math/minisat/patches/patch-utils_System.cc +++ b/math/minisat/patches/patch-utils_System.cc @@ -1,10 +1,10 @@ -$NetBSD: patch-utils_System.cc,v 1.1.1.1 2013/10/28 04:15:11 asau Exp $ +$NetBSD: patch-utils_System.cc,v 1.2 2014/01/09 14:38:33 jperkin Exp $ Support NetBSD. --- utils/System.cc.orig 2010-07-10 16:07:36.000000000 +0000 +++ utils/System.cc -@@ -72,13 +72,13 @@ double Minisat::memUsedPeak() { +@@ -72,13 +72,13 @@ double Minisat::memUsedPeak() { double peak = memReadPeak() / 1024; return peak == 0 ? memUsed() : peak; } @@ -20,3 +20,10 @@ Support NetBSD. #elif defined(__APPLE__) +@@ -92,4 +92,6 @@ double Minisat::memUsed(void) { + #else + double Minisat::memUsed() { + return 0; } ++double Minisat::memUsedPeak() { ++ return 0; } + #endif |