mirror of
https://git.FreeBSD.org/ports.git
synced 2024-10-19 19:59:43 +00:00
- Build with GCC
- Remove extra patches
This commit is contained in:
parent
1ea29f04b1
commit
57dacc67dc
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=332928
@ -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
|
||||
|
@ -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
|
@ -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);
|
||||
+}
|
||||
+
|
||||
|
||||
/*_________________________________________________________________________________________________
|
||||
|
|
Loading…
Reference in New Issue
Block a user