diff options
| author | Danilo Egea Gondolfo <danilo@FreeBSD.org> | 2013-11-05 23:19:37 +0000 |
|---|---|---|
| committer | Danilo Egea Gondolfo <danilo@FreeBSD.org> | 2013-11-05 23:19:37 +0000 |
| commit | 57dacc67dc6425240a2eec6ec8d09600e5dcdbc9 (patch) | |
| tree | 8f387a5a539c466e630f8e076ef172e314102578 /lang/yap | |
| parent | - fix package installation with old pkg tools (create empty (diff) | |
- Build with GCC
- Remove extra patches
Notes
Notes:
svn path=/head/; revision=332928
Diffstat (limited to 'lang/yap')
| -rw-r--r-- | lang/yap/Makefile | 1 | ||||
| -rw-r--r-- | lang/yap/files/patch-H__absmi.h | 11 | ||||
| -rw-r--r-- | lang/yap/files/patch-packages__swi-minisat2__C__SolverTypes.h | 30 |
3 files changed, 1 insertions, 41 deletions
diff --git a/lang/yap/Makefile b/lang/yap/Makefile index 135398f6cc71..3890f6da6221 100644 --- a/lang/yap/Makefile +++ b/lang/yap/Makefile @@ -28,6 +28,7 @@ USE_LDCONFIG= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --enable-max-performance USES= gmake +USE_GCC= any DOCSDIR= ${PREFIX}/share/doc/Yap DATADIR= ${PREFIX}/share/Yap diff --git a/lang/yap/files/patch-H__absmi.h b/lang/yap/files/patch-H__absmi.h deleted file mode 100644 index c5dd89c67ba8..000000000000 --- a/lang/yap/files/patch-H__absmi.h +++ /dev/null @@ -1,11 +0,0 @@ ---- ./H/absmi.h.orig 2013-11-02 21:11:04.000000000 -0200 -+++ ./H/absmi.h 2013-11-02 21:11:12.000000000 -0200 -@@ -74,7 +74,7 @@ - * Use bp as PREG for X86 machines * - ***************************************************************/ - #if defined(IN_ABSMI_C) --register struct yami* P1REG asm ("bp"); /* can't use yamop before Yap.h */ -+struct yami* P1REG asm ("bp"); /* can't use yamop before Yap.h */ - #define PREG P1REG - #endif - #define NEEDS_TO_SET_PC 1 diff --git a/lang/yap/files/patch-packages__swi-minisat2__C__SolverTypes.h b/lang/yap/files/patch-packages__swi-minisat2__C__SolverTypes.h deleted file mode 100644 index bf084a24c9fe..000000000000 --- a/lang/yap/files/patch-packages__swi-minisat2__C__SolverTypes.h +++ /dev/null @@ -1,30 +0,0 @@ ---- ./packages/swi-minisat2/C/SolverTypes.h.orig 2010-10-18 06:48:21.000000000 -0200 -+++ ./packages/swi-minisat2/C/SolverTypes.h 2013-11-02 21:10:56.000000000 -0200 -@@ -119,11 +119,7 @@ - - // -- use this function instead: - template<class V> -- friend Clause* Clause_new(const V& ps, bool learnt = false) { -- assert(sizeof(Lit) == sizeof(uint32_t)); -- assert(sizeof(float) == sizeof(uint32_t)); -- void* mem = malloc(sizeof(Clause) + sizeof(uint32_t)*(ps.size())); -- return new (mem) Clause(ps, learnt); } -+ friend Clause* Clause_new(const V& ps, bool learnt = false); - - int size () const { return size_etc >> 3; } - void shrink (int i) { assert(i <= size()); size_etc = (((size_etc >> 3) - i) << 3) | (size_etc & 7); } -@@ -146,6 +142,14 @@ - void strengthen (Lit p); - }; - -+template<class V> -+Clause* Clause_new(const V& ps, bool learnt) { -+ assert(sizeof(Lit) == sizeof(uint32_t)); -+ assert(sizeof(float) == sizeof(uint32_t)); -+ void* mem = malloc(sizeof(Clause) + sizeof(uint32_t)*(ps.size())); -+ return new (mem) Clause(ps, learnt); -+} -+ - - /*_________________________________________________________________________________________________ - | |