diff options
Diffstat (limited to 'lang/yap/files')
-rw-r--r-- | lang/yap/files/patch-Makefile.in | 20 | ||||
-rw-r--r-- | lang/yap/files/patch-configure | 31 | ||||
-rw-r--r-- | lang/yap/files/patch-library__dialect__swi__fli__blobs.c | 10 | ||||
-rw-r--r-- | lang/yap/files/patch-packages_swi-minisat2_C_SolverTypes.h | 31 |
4 files changed, 0 insertions, 92 deletions
diff --git a/lang/yap/files/patch-Makefile.in b/lang/yap/files/patch-Makefile.in deleted file mode 100644 index 8fdd7dfb7ac4..000000000000 --- a/lang/yap/files/patch-Makefile.in +++ /dev/null @@ -1,20 +0,0 @@ ---- Makefile.in.orig 2015-07-23 15:33:43 UTC -+++ Makefile.in -@@ -94,7 +94,7 @@ SO=@SO@ - MAKEINFO=makeinfo - TEXI2DVI=texi2dvi - TEXI2HTML=texi2html --TEXI2PDF=texi2pdf -+TEXI2PDF=texi2pdf -b - YAPLIB=@YAPLIB@ - SONAMEFLAG=@SONAMEFLAG@ - -@@ -776,7 +776,7 @@ yap.ps: $(YAPDOCS) - pdf: yap.pdf - - yap.pdf: $(YAPDOCS) -- $(TEXI2PDF) $(srcdir)/docs/yap.tex -+ -$(TEXI2PDF) $(srcdir)/docs/yap.tex - - clean_docs: - rm -f *.aux *.ca *.cas *.cn *.cns *.cp *.cps *.cy *.cys *.dvi *.fn *.fns *.ky *.log *.sa *.sas *.sn *.sns *.sy *.sys *~ *.tp *.vr *.toc *.pg diff --git a/lang/yap/files/patch-configure b/lang/yap/files/patch-configure deleted file mode 100644 index 8eb01ee400ed..000000000000 --- a/lang/yap/files/patch-configure +++ /dev/null @@ -1,31 +0,0 @@ -https://sourceforge.net/p/yap/yap-6.3/ci/139f64a45900 -https://sourceforge.net/p/yap/yap-6.3/ci/da61f1c31fed - ---- configure.orig 2011-10-23 22:11:24 UTC -+++ configure -@@ -4397,13 +4397,9 @@ then - C_PARSER_FLAGS="-O3 -Wall -Wstrict-prototypes -Wmissing-prototypes $CFLAGS" - CFLAGS="-O3 -fomit-frame-pointer -Wall -Wstrict-prototypes -Wmissing-prototypes $CFLAGS" - case "`$CC --version < /dev/null`" in -- *3.4*) CFLAGS="-fno-gcse -fno-crossjumping $CFLAGS" ;; -+ gcc-3.4*) CFLAGS="-fno-gcse -fno-crossjumping $CFLAGS" ;; - esac - case "$target_cpu" in -- i*86*) -- CFLAGS="-DBP_FREE $CFLAGS" -- CXXFLAGS="-DBP_FREE $CXXFLAGS" -- ;; - sparc*) - case "$target_os" in - *solaris2-9*) CFLAGS="-mno-app-regs -DOPTIMISE_ALL_REGS_FOR_SPARC=1 $CFLAGS" -@@ -4433,10 +4429,6 @@ then - i486*) - CFLAGS="-march=i486 $CFLAGS" - CXXFLAGS="-march=i486 $CXXFLAGS" -- ;; -- i386*) -- CFLAGS="-march=i386 $CFLAGS" -- CXXFLAGS="-march=i386 $CXXFLAGS" - ;; - esac - fi diff --git a/lang/yap/files/patch-library__dialect__swi__fli__blobs.c b/lang/yap/files/patch-library__dialect__swi__fli__blobs.c deleted file mode 100644 index b00f15a2f728..000000000000 --- a/lang/yap/files/patch-library__dialect__swi__fli__blobs.c +++ /dev/null @@ -1,10 +0,0 @@ ---- ./library/dialect/swi/fli/blobs.c.orig 2010-12-02 09:47:28.000000000 -0200 -+++ ./library/dialect/swi/fli/blobs.c 2013-11-02 21:10:56.000000000 -0200 -@@ -18,6 +18,7 @@ - #include <Yap.h> - #include <Yatom.h> - -+#include <stdio.h> - #include <string.h> - - #include <SWI-Prolog.h> 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 1d6f5f1f79fc..000000000000 --- a/lang/yap/files/patch-packages_swi-minisat2_C_SolverTypes.h +++ /dev/null @@ -1,31 +0,0 @@ -https://sourceforge.net/p/yap/yap-6.3/ci/e938c1774890 -https://sourceforge.net/p/yap/yap-6.3/ci/6d2e2597b183 - ---- packages/swi-minisat2/C/SolverTypes.h.orig 2010-10-18 08:48:21 UTC -+++ packages/swi-minisat2/C/SolverTypes.h -@@ -119,11 +119,7 @@ public: - - // -- 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); - - int size () const { return size_etc >> 3; } - void shrink (int i) { assert(i <= size()); size_etc = (((size_etc >> 3) - i) << 3) | (size_etc & 7); } -@@ -147,6 +143,12 @@ public: - }; - - -+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); } - /*_________________________________________________________________________________________________ - | - | subsumes : (other : const Clause&) -> Lit |