summaryrefslogtreecommitdiff
path: root/lang/gprolog/patches
diff options
context:
space:
mode:
authorrillig <rillig@pkgsrc.org>2007-12-01 12:27:59 +0000
committerrillig <rillig@pkgsrc.org>2007-12-01 12:27:59 +0000
commitd34810da5ca643e84cb8ac0e5a584e0e5489968c (patch)
treed274c3c399ce3c2d166a8f60eeb91886b4f3e10d /lang/gprolog/patches
parent7cd32f9a7577b5f0e75f1b03cc1815d891b114d0 (diff)
downloadpkgsrc-d34810da5ca643e84cb8ac0e5a584e0e5489968c.tar.gz
Updated gprolog to 1.3.0.
Change in GNU Prolog version 1.3.0: * official release (Jan 4 2007) * change error messages emitted by the compiler to follow GNU standards * modify doc (mainly rename manual.xxx to gprolog.xxx) * add DESTDIR variable support in main Makefile for staged installs * fix a bug with Prolog floats in x86_64/linux (bad stack alignment) * port for ix86/darwin (Mac OS X) * add check target to main Makefile * improve Win32 ports (cygwin, MinGW, MSVC 6.0 and 2005 Express Edition) (MSVC port uses MinGW as.exe instead of nasm.exe - named mingw-as.exe provided in the setup.exe) * rename call/2 to call_det/2 * implement call/2-11 as will be defined in the next standard * fix various problems when compiling with gcc 4 (gcc 4.1.1) * emit .note.GNU-stack to mark the stack as no executable in x86_any.c, x86_64_any.c and powerpc_any.c * change the way objects are found (obj_chain.c) using gcc ctors * use Doug Lea malloc for OpenBSD (problem with malloc using mmap) * fix problems in various ports: alpha/linux, powerpc/darwin (Mac OS X), sparc/solaris, ix86/OpenBSD Change in GNU Prolog version 1.2.19: * fix 2 bugs in global variables Change in GNU Prolog version 1.2.18: * fix problem when compiling with gcc 3.4.0 * fix bug in term comparison involving negative integers * add consult, ... and fix minor bugs in the Win32 GUI console menu * fix the stack overflow detection under cygwin * port to ix86/MinGW - many thanks to: Cesar Rabak <csrabak@ig.com.br> * fix a problem in the port to x86/OpenBSD * port to sparc/NetBSD and powerpc/NetBSD - many thanks to: Jason Beegan <jtb@netbsd.org> * fix a bug in =../2 involving FD variables * fix a bug in arithmetics (in float_{integer/fractional}_part) * fix a bug in FD solver (wrong union with a singleton) Change in GNU Prolog version 1.2.17: * change configure.in: by default ebp is not used * fix a but with CTRL+C handler not reinstalled * fix a bug with _XXX (re)displayed under the top-level * port to x86_64/linux - many thanks to: Gwenole Beauchesne <gbeauchesne@mandrakesoft.com>
Diffstat (limited to 'lang/gprolog/patches')
-rw-r--r--lang/gprolog/patches/patch-aa13
-rw-r--r--lang/gprolog/patches/patch-ab20
-rw-r--r--lang/gprolog/patches/patch-ac26
-rw-r--r--lang/gprolog/patches/patch-ad76
-rw-r--r--lang/gprolog/patches/patch-ae35
-rw-r--r--lang/gprolog/patches/patch-af13
-rw-r--r--lang/gprolog/patches/patch-ag13
-rw-r--r--lang/gprolog/patches/patch-ah17
-rw-r--r--lang/gprolog/patches/patch-ai13
-rw-r--r--lang/gprolog/patches/patch-aj22
-rw-r--r--lang/gprolog/patches/patch-al21
-rw-r--r--lang/gprolog/patches/patch-am13
-rw-r--r--lang/gprolog/patches/patch-an23
-rw-r--r--lang/gprolog/patches/patch-ba25
14 files changed, 25 insertions, 305 deletions
diff --git a/lang/gprolog/patches/patch-aa b/lang/gprolog/patches/patch-aa
deleted file mode 100644
index 2eac1163418..00000000000
--- a/lang/gprolog/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.3 2002/11/13 20:15:11 jschauma Exp $
-
---- Ma2Asm/ix86_any.c.orig Wed Nov 13 14:12:33 2002
-+++ Ma2Asm/ix86_any.c Wed Nov 13 14:12:46 2002
-@@ -38,7 +38,7 @@
-
- #define MAX_C_ARGS_IN_C_CODE 32
-
--#if (defined(M_ix86_cygwin) || defined(M_ix86_bsd)) && !defined(__FreeBSD__)
-+#if (defined(M_ix86_cygwin) || defined(M_ix86_bsd)) && !defined(__FreeBSD__) && !defined(__NetBSD__)
-
- #define UN "_"
-
diff --git a/lang/gprolog/patches/patch-ab b/lang/gprolog/patches/patch-ab
deleted file mode 100644
index 03836089b96..00000000000
--- a/lang/gprolog/patches/patch-ab
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: patch-ab,v 1.4 2003/07/07 21:31:53 jtb Exp $
-
---- configure.in.orig
-+++ configure.in
-@@ -311,6 +311,7 @@
- mips*irix*) AC_DEFINE(M_mips_irix);;
- sparc*sunos*) AC_DEFINE(M_sparc_sunos);;
- sparc*solaris*) AC_DEFINE(M_sparc_solaris);;
-+ sparc*bsd*) AC_DEFINE(M_sparc_bsd);;
- alpha*osf*) AC_DEFINE(M_alpha_osf);;
- alpha*linux*) AC_DEFINE(M_alpha_linux);;
- i*86*linux*) AC_DEFINE(M_ix86_linux);;
-@@ -319,6 +320,7 @@
- i*86*bsd*) AC_DEFINE(M_ix86_bsd);;
- powerpc*linux*) AC_DEFINE(M_powerpc_linux);;
- powerpc*darwin*) AC_DEFINE(M_powerpc_darwin);;
-+ powerpc*bsd*) AC_DEFINE(M_powerpc_bsd);;
- *86*cygwin*) AC_DEFINE(M_ix86_cygwin);;
- *) AC_MSG_ERROR(unsupported architecture)
- esac
diff --git a/lang/gprolog/patches/patch-ac b/lang/gprolog/patches/patch-ac
deleted file mode 100644
index 577a92231d9..00000000000
--- a/lang/gprolog/patches/patch-ac
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD: patch-ac,v 1.4 2003/07/07 21:31:53 jtb Exp $
-
---- configure.orig
-+++ configure
-@@ -2327,6 +2327,10 @@
- #define M_sparc_solaris 1
- EOF
- ;;
-+ sparc*bsd*) cat >>confdefs.h <<\EOF
-+#define M_sparc_bsd 1
-+EOF
-+;;
- alpha*osf*) cat >>confdefs.h <<\EOF
- #define M_alpha_osf 1
- EOF
-@@ -2357,6 +2361,10 @@
- ;;
- powerpc*darwin*) cat >>confdefs.h <<\EOF
- #define M_powerpc_darwin 1
-+EOF
-+;;
-+ powerpc*bsd*) cat >>confdefs.h <<\EOF
-+#define M_powerpc_bsd 1
- EOF
- ;;
- *86*cygwin*) cat >>confdefs.h <<\EOF
diff --git a/lang/gprolog/patches/patch-ad b/lang/gprolog/patches/patch-ad
deleted file mode 100644
index d97772f9a50..00000000000
--- a/lang/gprolog/patches/patch-ad
+++ /dev/null
@@ -1,76 +0,0 @@
-$NetBSD: patch-ad,v 1.3 2003/06/23 19:48:22 jtb Exp $
-
---- Ma2Asm/powerpc_any.c.orig
-+++ Ma2Asm/powerpc_any.c
-@@ -42,7 +42,7 @@
- #define MAX_DOUBLES_IN_PRED 2048
-
-
--#ifdef M_powerpc_linux
-+#if defined(M_powerpc_linux) || defined(M_powerpc_bsd)
-
- #define UN
- #define R(reg) #reg
-@@ -186,7 +186,7 @@
-
- Label_Printf("");
- Inst_Printf(".align", "2");
--#ifdef M_powerpc_linux
-+#if defined(M_powerpc_linux) || defined(M_powerpc_bsd)
- Inst_Printf(".type", "%s,@function", label);
- #endif
-
-@@ -431,7 +431,7 @@
-
-
-
--#ifdef M_powerpc_linux
-+#if defined(M_powerpc_linux) || defined(M_powerpc_bsd)
-
- #define STACK_OFFSET(offset) offset * 4 - 24
- #define DBL_RET_WORDS 0
-@@ -462,7 +462,7 @@
- }
-
-
--#ifdef M_powerpc_linux
-+#if defined(M_powerpc_linux) || defined(M_powerpc_bsd)
-
- #define AFTER_ARG_DBL \
- }
-@@ -649,7 +649,7 @@
- BEFORE_ARG;
-
- Inst_Printf("addis", "%s,0," HI_UN(foreign_double+%d), r,
--#ifdef M_powerpc_linux
-+#if defined(M_powerpc_linux) || defined(M_powerpc_bsd)
- index * 4
- #else
- index * 8
-@@ -882,7 +882,7 @@
- void
- Dico_String_Start(int nb_consts)
- {
--#ifdef M_powerpc_linux
-+#if defined(M_powerpc_linux) || defined(M_powerpc_bsd)
- Label_Printf(".section\t.rodata");
- #else
- Label_Printf(".cstring");
-@@ -900,7 +900,7 @@
- Dico_String(int str_no, char *asciiz)
- {
- Label_Printf("%s%d:", STRING_PREFIX, str_no);
--#ifdef M_powerpc_linux
-+#if defined(M_powerpc_linux) || defined(M_powerpc_bsd)
- Inst_Printf(".string", "%s", asciiz);
- #else
- Inst_Printf(".asciz", "%s", asciiz);
-@@ -948,7 +948,7 @@
- case NONE:
- value = 1; /* then in case ARRAY_SIZE */
- case ARRAY_SIZE:
--#ifdef M_powerpc_linux
-+#if defined(M_powerpc_linux) || defined(M_powerpc_bsd)
- if (!global)
- Inst_Printf(".local", UN "%s", name);
- Inst_Printf(".comm", UN "%s,%ld,4", name, value * 4);
diff --git a/lang/gprolog/patches/patch-ae b/lang/gprolog/patches/patch-ae
deleted file mode 100644
index b26729b736b..00000000000
--- a/lang/gprolog/patches/patch-ae
+++ /dev/null
@@ -1,35 +0,0 @@
-$NetBSD: patch-ae,v 1.4 2003/07/07 21:31:53 jtb Exp $
-
---- EnginePl/gp_config.h.in.orig
-+++ EnginePl/gp_config.h.in
-@@ -31,7 +31,10 @@
- /* Define if you have termios.h */
- #undef HAVE_TERMIOS_H
-
--/* Define if you have termios.h */
-+/* Define if you have termio.h */
-+#undef HAVE_TERMIO_H
-+
-+/* Define if you have malloc.h */
- #undef HAVE_MALLOC_H
-
- /* Define if you have a working `mmap' system call */
-@@ -148,11 +151,17 @@
- /* Define if the system is a sparc/sunos */
- #undef M_sparc_sunos
-
-+/* Define if the system is a sparc/bsd */
-+#undef M_sparc_bsd
-+
- /* Define if the system is a powerpc/linux */
- #undef M_powerpc_linux
-
--/* Define if the system is a powerpc/bsd */
-+/* Define if the system is a powerpc/darwin */
- #undef M_powerpc_darwin
-+
-+/* Define if the system is a powerpc/bsd */
-+#undef M_powerpc_bsd
-
-
-
diff --git a/lang/gprolog/patches/patch-af b/lang/gprolog/patches/patch-af
deleted file mode 100644
index df174471606..00000000000
--- a/lang/gprolog/patches/patch-af
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-af,v 1.4 2003/07/07 21:31:53 jtb Exp $
-
---- EnginePl/engine1.c.orig
-+++ EnginePl/engine1.c
-@@ -97,7 +97,7 @@
-
- #endif
-
--#ifdef M_sparc
-+#if defined(M_sparc) && !defined(M_sparc_bsd)
- register long *rfl asm("%l2") = base_fl;
- register double *rfd asm("%l3") = base_fd;
- #endif
diff --git a/lang/gprolog/patches/patch-ag b/lang/gprolog/patches/patch-ag
deleted file mode 100644
index 05bd2fa99fd..00000000000
--- a/lang/gprolog/patches/patch-ag
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ag,v 1.4 2003/07/07 21:31:53 jtb Exp $
-
---- BipsPl/os_interf_c.c.orig
-+++ BipsPl/os_interf_c.c
-@@ -217,7 +217,7 @@
- tsig[nb_sig].atom = Create_Atom("SIGIO");
- tsig[nb_sig++].sig = SIGIO;
- #endif
--#if !defined( M_ix86_bsd ) && !defined( M_powerpc_darwin )
-+#if !defined( M_ix86_bsd ) && !defined( M_powerpc_darwin ) && !defined( M_powerpc_bsd ) && !defined( M_sparc_bsd )
- tsig[nb_sig].atom = Create_Atom("SIGPOLL");
- tsig[nb_sig++].sig = SIGPOLL;
- #endif
diff --git a/lang/gprolog/patches/patch-ah b/lang/gprolog/patches/patch-ah
deleted file mode 100644
index 57d920fde0b..00000000000
--- a/lang/gprolog/patches/patch-ah
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-ah,v 1.4 2003/07/07 21:31:54 jtb Exp $
-
---- EnginePl/machine.h.orig
-+++ EnginePl/machine.h
-@@ -125,11 +125,7 @@
- # define M_USED_REGS {"ebx", "ebp", 0}
- #endif
-
--#elif defined(M_powerpc_linux)
--
--# define M_USED_REGS {"15", "20", 0}
--
--#elif defined(M_powerpc_darwin)
-+#elif defined(M_powerpc_linux) || defined(M_powerpc_darwin) || defined(M_powerpc_bsd)
-
- # define M_USED_REGS {"15", "20", 0}
-
diff --git a/lang/gprolog/patches/patch-ai b/lang/gprolog/patches/patch-ai
deleted file mode 100644
index 72074f3c2b6..00000000000
--- a/lang/gprolog/patches/patch-ai
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ai,v 1.4 2003/07/07 21:31:54 jtb Exp $
-
---- EnginePl/machine.c.orig
-+++ EnginePl/machine.c
-@@ -480,7 +480,7 @@
-
- static void
- SIGSEGV_Handler(int sig, siginfo_t * si)
--#elif defined(M_ix86_bsd)
-+#elif defined(M_ix86_bsd) || defined(M_powerpc_bsd) || defined(M_sparc_bsd)
-
- static void
- SIGSEGV_Handler(int sig, int code, struct sigcontext *scp)
diff --git a/lang/gprolog/patches/patch-aj b/lang/gprolog/patches/patch-aj
deleted file mode 100644
index 099ed55bca3..00000000000
--- a/lang/gprolog/patches/patch-aj
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-aj,v 1.3 2003/07/07 21:31:54 jtb Exp $
-
---- Ma2Asm/sparc_any.c.orig
-+++ Ma2Asm/sparc_any.c
-@@ -171,7 +171,7 @@
- {
- Label_Printf("");
- Inst_Printf(".align", "4");
--#ifdef M_sparc_solaris
-+#if defined(M_sparc_solaris) || defined(M_sparc_bsd)
- Inst_Printf(".type", UN "%s,#function", label);
- #endif
- Inst_Printf(".proc", "020");
-@@ -915,7 +915,7 @@
- break;
-
- case INITIAL_VALUE:
--#ifdef M_sparc_solaris
-+#if defined(M_sparc_solaris) || defined(M_sparc_bsd)
- Inst_Printf(".type", UN "%s,#object", name);
- Inst_Printf(".size", UN "%s,4", name);
- #endif
diff --git a/lang/gprolog/patches/patch-al b/lang/gprolog/patches/patch-al
deleted file mode 100644
index 5595c1ed2a6..00000000000
--- a/lang/gprolog/patches/patch-al
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-al,v 1.2 2002/11/13 20:15:14 jschauma Exp $
-
---- Makefile.in.orig Wed Nov 13 14:11:45 2002
-+++ Makefile.in Wed Nov 13 14:12:06 2002
-@@ -1,6 +1,7 @@
- # MAIN MAKEFILE
- # -------------
-
-+PREFIX = @prefix@
- ROOT_DIR = @ROOT_DIR@
- PKG_NAME = @PKG_NAME@
-
-@@ -57,7 +58,7 @@
- install-system:
- ./mkinstalldirs $(INSTALL_DIR) $(INSTALL_DIR)/bin \
- $(INSTALL_DIR)/include $(INSTALL_DIR)/lib
-- for i in `echo "$(TXT_FILES)"`; do $(INSTALL_PROGRAM) ../$$i $(INSTALL_DIR);done
-+ for i in `echo "$(TXT_FILES)"`; do $(INSTALL_DATA) ../$$i $(INSTALL_DIR);done
- for i in $(BIN_FILES); do $(INSTALL_PROGRAM) */$$i $(INSTALL_DIR)/bin;done
- for i in $(OBJ_FILES); do $(INSTALL_DATA) */$$i $(INSTALL_DIR)/lib;done
- for i in $(LIB_FILES); do $(INSTALL_DATA) */$$i $(INSTALL_DIR)/lib;done
diff --git a/lang/gprolog/patches/patch-am b/lang/gprolog/patches/patch-am
deleted file mode 100644
index cbed97d9442..00000000000
--- a/lang/gprolog/patches/patch-am
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-am,v 1.3 2003/06/23 19:48:24 jtb Exp $
-
---- EnginePl/obj_chain.c.orig
-+++ EnginePl/obj_chain.c
-@@ -207,7 +207,7 @@
- #endif
- (*p->fct_init) ();
-
--#if defined(M_powerpc_linux) || defined(M_alpha_linux) || \
-+#if defined(M_powerpc_linux) || defined(M_alpha_linux) || defined(M_powerpc_bsd) ||\
- defined(M_mips_irix)
- p = (ObjChain *) ((long *) p + 1);
- #elif 0
diff --git a/lang/gprolog/patches/patch-an b/lang/gprolog/patches/patch-an
deleted file mode 100644
index aec7a6e9dbe..00000000000
--- a/lang/gprolog/patches/patch-an
+++ /dev/null
@@ -1,23 +0,0 @@
-$NetBSD: patch-an,v 1.4 2003/07/07 21:31:54 jtb Exp $
-
---- Ma2Asm/FromC/mach.h.orig
-+++ Ma2Asm/FromC/mach.h
-@@ -12,7 +12,8 @@
- *---------------------------------*/
-
- #if defined(M_sony_news) || defined(M_ultrix_dec) || defined(M_alpha_osf) ||\
-- defined(M_ix86_linux) || defined(M_ix86_sco) || defined(M_ix86_bsd)
-+ defined(M_ix86_linux) || defined(M_ix86_sco) || defined(M_ix86_bsd) ||\
-+ defined(M_powerpc_bsd) || defined(M_sparc_bsd) || defined(__ELF__)
-
- # define M_Asm_Symbol1(name) #name
- # define M_Asm_Symbol(name) M_Asm_Symbol1(name)
-@@ -66,7 +67,7 @@
-
- # define M_Direct_Goto(lab) {_asm {jmp M_Asm_Symbol(lab)}; return;}
-
--#elif defined(M_powerpc_linux)
-+#elif defined(M_powerpc_linux) || defined(M_powerpc_bsd)
-
- # define M_Direct_Goto(lab) {asm("b " M_Asm_Symbol(lab)); return;}
-
diff --git a/lang/gprolog/patches/patch-ba b/lang/gprolog/patches/patch-ba
new file mode 100644
index 00000000000..879eee5d3ab
--- /dev/null
+++ b/lang/gprolog/patches/patch-ba
@@ -0,0 +1,25 @@
+$NetBSD: patch-ba,v 1.1 2007/12/01 12:28:04 rillig Exp $
+
+On NetBSD, the sigcontext struct is so well-protected from userland that
+I didn't find a way to access it.
+
+--- src/EnginePl/machine.c.orig 2007-01-04 11:35:13.000000000 +0100
++++ src/EnginePl/machine.c 2007-12-01 13:18:32.000000000 +0100
+@@ -469,7 +469,7 @@ SIGSEGV_Handler(int sig, struct sigconte
+ static void
+ SIGSEGV_Handler(int sig, siginfo_t * si)
+
+-#elif defined(M_ix86_bsd) || defined(M_powerpc_bsd) || defined(M_sparc_bsd)
++#elif (defined(M_ix86_bsd) || defined(M_powerpc_bsd) || defined(M_sparc_bsd)) && !defined(__NetBSD__)
+ static void
+ SIGSEGV_Handler(int sig, int code, struct sigcontext *scp)
+
+@@ -517,7 +517,7 @@ SIGSEGV_Handler(int sig)
+
+ WamWord *addr = (WamWord *) si->si_addr;
+
+-#elif defined(M_ix86_bsd)
++#elif defined(M_ix86_bsd) && !defined(__NetBSD__)
+
+ WamWord *addr = (WamWord *) scp->sc_err;
+