- Build with GCC

- Remove extra patches
This commit is contained in:
Danilo Egea Gondolfo 2013-11-05 23:19:56 +00:00
parent 57dacc67dc
commit ef25aae5a4
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=332929
6 changed files with 32 additions and 90 deletions

View file

@ -29,9 +29,9 @@ STRIP= #none
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --enable-max-performance \
--disable-clpbn-bp
CONFIGURE_ARGS+= --enable-max-performance
USES= gmake
USE_GCC= any
EXTRACT_CMD= ${GZIP_CMD}
EXTRACT_BEFORE_ARGS= -dc

View file

@ -1,14 +0,0 @@
--- ./H/TermExt.h.orig 2012-06-30 16:53:59.000000000 -0300
+++ ./H/TermExt.h 2013-11-03 01:59:03.000000000 -0200
@@ -217,7 +217,11 @@
#if SIZEOF_DOUBLE == 2*SIZEOF_LONG_INT
+#ifdef __amd64__
INLINE_ONLY inline EXTERN void AlignGlobalForDouble( USES_REGS1 );
+#else
+inline EXTERN void AlignGlobalForDouble( USES_REGS1 );
+#endif
#define DOUBLE_ALIGNED(ADDR) ((CELL)(ADDR) & 0x4)

View file

@ -1,11 +0,0 @@
--- ./H/absmi.h.orig 2013-11-03 01:59:20.000000000 -0200
+++ ./H/absmi.h 2013-11-03 01:59:48.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

View file

@ -1,21 +0,0 @@
--- ./H/amiops.h.orig 2012-06-30 16:53:59.000000000 -0300
+++ ./H/amiops.h 2013-11-03 01:59:03.000000000 -0200
@@ -102,10 +102,18 @@
#if SIZEOF_DOUBLE == 2*SIZEOF_LONG_INT
+#ifdef __amd64__
INLINE_ONLY EXTERN inline void
+#else
+EXTERN inline void
+#endif
AlignGlobalForDouble( USES_REGS1 );
+#ifdef __amd64__
INLINE_ONLY EXTERN inline void
+#else
+EXTERN inline void
+#endif
AlignGlobalForDouble( USES_REGS1 )
{
/* Force Alignment for floats. Note that garbage collector may

View file

@ -1,21 +0,0 @@
--- ./packages/swi-minisat2/C/SolverTypes.h.orig 2012-06-29 18:30:38.000000000 -0300
+++ ./packages/swi-minisat2/C/SolverTypes.h 2013-11-03 01:59:03.000000000 -0200
@@ -97,6 +97,9 @@
//=================================================================================================
// Clause -- a simple class for representing a clause:
+class Clause;
+template<class V>
+Clause* Clause_new(const V&, bool = false);
class Clause {
uint32_t size_etc;
@@ -119,7 +122,7 @@
// -- use this function instead:
template<class V>
- friend Clause* Clause_new(const V& ps, bool learnt = false);
+ friend Clause* Clause_new(const V&, bool);
int size () const { return size_etc >> 3; }
void shrink (int i) { assert(i <= size()); size_etc = (((size_etc >> 3) - i) << 3) | (size_etc & 7); }

View file

@ -116,6 +116,7 @@ lib/Yap/json.so
lib/Yap/matrix.so
lib/Yap/memfile.so
lib/Yap/mime.so
lib/Yap/odbc4pl.so
lib/Yap/pl-minisat.so
lib/Yap/prism.so
lib/Yap/process.so
@ -341,6 +342,14 @@ lib/libYap.a
%%DATADIR%%/menu.pl
%%DATADIR%%/mime.pl
%%DATADIR%%/minisat.pl
%%DATADIR%%/myddas.yap
%%DATADIR%%/myddas_assert_predicates.yap
%%DATADIR%%/myddas_errors.yap
%%DATADIR%%/myddas_mysql.yap
%%DATADIR%%/myddas_prolog2sql.yap
%%DATADIR%%/myddas_prolog2sql_optimizer.yap
%%DATADIR%%/myddas_top_level.yap
%%DATADIR%%/myddas_util_predicates.yap
%%DATADIR%%/nb.yap
%%DATADIR%%/nb_set.pl
%%DATADIR%%/occurs.yap
@ -716,27 +725,27 @@ lib/libYap.a
%%PORTDOCS%%%%DOCSDIR%%/packages/problog/LICENSE
%%PORTDOCS%%%%DOCSDIR%%/yap.html
%%PORTDOCS%%%%DOCSDIR%%/yap.pdf
%%PORTDOCS%%@dirrmtry %%DOCSDIR%%/packages/problog
%%PORTDOCS%%@dirrmtry %%DOCSDIR%%/packages/examples/xml
%%PORTDOCS%%@dirrmtry %%DOCSDIR%%/packages/examples/problog
%%PORTDOCS%%@dirrmtry %%DOCSDIR%%/packages/examples/prism/noisy_or
%%PORTDOCS%%@dirrmtry %%DOCSDIR%%/packages/examples/prism/jtree
%%PORTDOCS%%@dirrmtry %%DOCSDIR%%/packages/examples/prism
%%PORTDOCS%%@dirrmtry %%DOCSDIR%%/packages/examples/plunit
%%PORTDOCS%%@dirrmtry %%DOCSDIR%%/packages/examples/pldoc
%%PORTDOCS%%@dirrmtry %%DOCSDIR%%/packages/examples/minisat
%%PORTDOCS%%@dirrmtry %%DOCSDIR%%/packages/examples/meld
%%PORTDOCS%%@dirrmtry %%DOCSDIR%%/packages/examples/http/pwp
%%PORTDOCS%%@dirrmtry %%DOCSDIR%%/packages/examples/http
%%PORTDOCS%%@dirrmtry %%DOCSDIR%%/packages/examples/chr
%%PORTDOCS%%@dirrmtry %%DOCSDIR%%/packages/examples/R
%%PORTDOCS%%@dirrmtry %%DOCSDIR%%/packages/examples/CLPBN/learning
%%PORTDOCS%%@dirrmtry %%DOCSDIR%%/packages/examples/CLPBN/School
%%PORTDOCS%%@dirrmtry %%DOCSDIR%%/packages/examples/CLPBN/HMMer
%%PORTDOCS%%@dirrmtry %%DOCSDIR%%/packages/examples/CLPBN
%%PORTDOCS%%@dirrmtry %%DOCSDIR%%/packages/examples
%%PORTDOCS%%@dirrmtry %%DOCSDIR%%/packages
%%PORTDOCS%%@dirrmtry %%DOCSDIR%%
@dirrmtry %%PORTDOCS%%%%DOCSDIR%%/packages/problog
@dirrmtry %%PORTDOCS%%%%DOCSDIR%%/packages/examples/xml
@dirrmtry %%PORTDOCS%%%%DOCSDIR%%/packages/examples/problog
@dirrmtry %%PORTDOCS%%%%DOCSDIR%%/packages/examples/prism/noisy_or
@dirrmtry %%PORTDOCS%%%%DOCSDIR%%/packages/examples/prism/jtree
@dirrmtry %%PORTDOCS%%%%DOCSDIR%%/packages/examples/prism
@dirrmtry %%PORTDOCS%%%%DOCSDIR%%/packages/examples/plunit
@dirrmtry %%PORTDOCS%%%%DOCSDIR%%/packages/examples/pldoc
@dirrmtry %%PORTDOCS%%%%DOCSDIR%%/packages/examples/minisat
@dirrmtry %%PORTDOCS%%%%DOCSDIR%%/packages/examples/meld
@dirrmtry %%PORTDOCS%%%%DOCSDIR%%/packages/examples/http/pwp
@dirrmtry %%PORTDOCS%%%%DOCSDIR%%/packages/examples/http
@dirrmtry %%PORTDOCS%%%%DOCSDIR%%/packages/examples/chr
@dirrmtry %%PORTDOCS%%%%DOCSDIR%%/packages/examples/R
@dirrmtry %%PORTDOCS%%%%DOCSDIR%%/packages/examples/CLPBN/learning
@dirrmtry %%PORTDOCS%%%%DOCSDIR%%/packages/examples/CLPBN/School
@dirrmtry %%PORTDOCS%%%%DOCSDIR%%/packages/examples/CLPBN/HMMer
@dirrmtry %%PORTDOCS%%%%DOCSDIR%%/packages/examples/CLPBN
@dirrmtry %%PORTDOCS%%%%DOCSDIR%%/packages/examples
@dirrmtry %%PORTDOCS%%%%DOCSDIR%%/packages
@dirrmtry %%PORTDOCS%%%%DOCSDIR%%
@dirrmtry %%DATADIR%%/xml
@dirrmtry %%DATADIR%%/semweb
@dirrmtry %%DATADIR%%/problog