[pkgsrc/trunk]: pkgsrc/lang/gprolog Make this configure for NetBSD amd64. Whi...

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/trunk]: pkgsrc/lang/gprolog Make this configure for NetBSD amd64. Whi...
From: dholland <dholland%pkgsrc.org@localhost>
Date: Thu, 14 Oct 2021 06:33:18 +0000
details:   https://anonhg.NetBSD.org/pkgsrc/rev/aa4dc7f86d37
branches:  trunk
changeset: 546722:aa4dc7f86d37
user:      dholland <dholland%pkgsrc.org@localhost>
date:      Sun Sep 07 04:35:41 2008 +0000

description:
Make this configure for NetBSD amd64. While here, add DESTDIR support.

diffstat:

 lang/gprolog/Makefile         |   4 +++-
 lang/gprolog/distinfo         |  10 ++++++++--
 lang/gprolog/patches/patch-aa |  12 ++++++++++++
 lang/gprolog/patches/patch-ab |  15 +++++++++++++++
 lang/gprolog/patches/patch-ac |  22 ++++++++++++++++++++++
 lang/gprolog/patches/patch-ad |  13 +++++++++++++
 lang/gprolog/patches/patch-ae |  22 ++++++++++++++++++++++
 lang/gprolog/patches/patch-af |  22 ++++++++++++++++++++++
 lang/gprolog/patches/patch-ba |  27 +++++++++++++++++++++------
 9 files changed, 138 insertions(+), 9 deletions(-)

diffs (208 lines):

diff -r 244a461abe29 -r aa4dc7f86d37 lang/gprolog/Makefile
--- a/lang/gprolog/Makefile     Sun Sep 07 03:23:16 2008 +0000
+++ b/lang/gprolog/Makefile     Sun Sep 07 04:35:41 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2007/12/01 12:27:59 rillig Exp $
+# $NetBSD: Makefile,v 1.12 2008/09/07 04:35:41 dholland Exp $
 
 DISTNAME=              gprolog-1.3.0
 CATEGORIES=            lang
@@ -8,6 +8,8 @@
 HOMEPAGE=              http://www.gprolog.org/
 COMMENT=               GNU prolog compiler and interpreter
 
+PKG_DESTDIR_SUPPORT=   user-destdir
+
 GNU_CONFIGURE=         yes
 CONFIGURE_DIRS=                src
 CONFIGURE_ARGS+=       --with-install-dir=${PREFIX}/lib/${PKGNAME_NOREV} \
diff -r 244a461abe29 -r aa4dc7f86d37 lang/gprolog/distinfo
--- a/lang/gprolog/distinfo     Sun Sep 07 03:23:16 2008 +0000
+++ b/lang/gprolog/distinfo     Sun Sep 07 04:35:41 2008 +0000
@@ -1,6 +1,12 @@
-$NetBSD: distinfo,v 1.7 2007/12/01 12:27:59 rillig Exp $
+$NetBSD: distinfo,v 1.8 2008/09/07 04:35:41 dholland Exp $
 
 SHA1 (gprolog-1.3.0.tar.gz) = 1ad7b7764c8e8d92f4f18619f29155001fe7d78f
 RMD160 (gprolog-1.3.0.tar.gz) = 56a7e6f0dab343d162620bccb177e67bca639797
 Size (gprolog-1.3.0.tar.gz) = 3016665 bytes
-SHA1 (patch-ba) = 226ca02c9a70b49278237cebc66eda3439df2f88
+SHA1 (patch-aa) = 5a277c8653e6df10ef2fd6a7e0edc6a6a3b5e606
+SHA1 (patch-ab) = b4b2183c6054061ac68c2904527b63482174534c
+SHA1 (patch-ac) = edd1fbe7816fd07cf377dc513cd48c11aaf9470d
+SHA1 (patch-ad) = bf95eace095f8a0ce92f678b0401c86db4f89ffa
+SHA1 (patch-ae) = 10d1af60aed05009a08f95c90e7c8607d64c7b9b
+SHA1 (patch-af) = 228a7b4f5a3d1c30a8f8f00b83b19304c29e9ca9
+SHA1 (patch-ba) = ccf0dc3c57fcd611ac03ef16dc28b08348d620fd
diff -r 244a461abe29 -r aa4dc7f86d37 lang/gprolog/patches/patch-aa
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/lang/gprolog/patches/patch-aa     Sun Sep 07 04:35:41 2008 +0000
@@ -0,0 +1,12 @@
+$NetBSD: patch-aa,v 1.5 2008/09/07 04:35:41 dholland Exp $
+
+--- src/configure.in~  2007-01-04 05:21:52.000000000 -0500
++++ src/configure.in   2008-09-06 23:58:31.000000000 -0400
+@@ -328,6 +328,7 @@ else
+         alpha*osf*)      AC_DEFINE(M_alpha_osf);;
+         alpha*linux*)    AC_DEFINE(M_alpha_linux);;
+         x86_64*linux*)   AC_DEFINE(M_x86_64_linux);;
++        x86_64*bsd*)     AC_DEFINE(M_x86_64_bsd);;
+         i*86*linux*)     AC_DEFINE(M_ix86_linux);;
+         i*86*solaris*)   AC_DEFINE(M_ix86_solaris);;
+         i*86*sco*)       AC_DEFINE(M_ix86_sco);;
diff -r 244a461abe29 -r aa4dc7f86d37 lang/gprolog/patches/patch-ab
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/lang/gprolog/patches/patch-ab     Sun Sep 07 04:35:41 2008 +0000
@@ -0,0 +1,15 @@
+$NetBSD: patch-ab,v 1.6 2008/09/07 04:35:41 dholland Exp $
+
+--- src/configure~     2007-01-05 07:13:28.000000000 -0500
++++ src/configure      2008-09-06 23:58:51.000000000 -0400
+@@ -3554,6 +3554,10 @@ _ACEOF
+ #define M_x86_64_linux 1
+ _ACEOF
+ ;;
++        x86_64*bsd*)   cat >>confdefs.h <<\_ACEOF
++#define M_x86_64_bsd 1
++_ACEOF
++;;
+         i*86*linux*)     cat >>confdefs.h <<\_ACEOF
+ #define M_ix86_linux 1
+ _ACEOF
diff -r 244a461abe29 -r aa4dc7f86d37 lang/gprolog/patches/patch-ac
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/lang/gprolog/patches/patch-ac     Sun Sep 07 04:35:41 2008 +0000
@@ -0,0 +1,22 @@
+$NetBSD: patch-ac,v 1.6 2008/09/07 04:35:41 dholland Exp $
+
+--- src/Ma2Asm/FromC/mach.h~   2007-01-04 05:21:48.000000000 -0500
++++ src/Ma2Asm/FromC/mach.h    2008-09-07 00:03:37.000000000 -0400
+@@ -13,7 +13,7 @@
+ 
+ #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_x86_64_linux) || \
++    defined(M_x86_64_linux) || defined(m_x86_64_bsd) || \
+     defined(M_powerpc_bsd) || defined(M_sparc_bsd) || defined(__ELF__)
+ 
+ #   define M_Asm_Symbol1(name)     #name
+@@ -64,7 +64,7 @@
+ 
+ #    define M_Direct_Goto(lab)     {_asm {jmp M_Asm_Symbol(lab)}; return;}
+ 
+-#elif defined(M_x86_64_linux)
++#elif defined(M_x86_64)
+ 
+ #    define M_Direct_Goto(lab)     {asm("jmp " M_Asm_Symbol(lab)); return;}
+ 
diff -r 244a461abe29 -r aa4dc7f86d37 lang/gprolog/patches/patch-ad
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/lang/gprolog/patches/patch-ad     Sun Sep 07 04:35:41 2008 +0000
@@ -0,0 +1,13 @@
+$NetBSD: patch-ad,v 1.5 2008/09/07 04:35:41 dholland Exp $
+
+--- src/EnginePl/gp_config.h.in~       2007-01-04 05:21:49.000000000 -0500
++++ src/EnginePl/gp_config.h.in        2008-09-07 00:04:54.000000000 -0400
+@@ -177,6 +177,8 @@
+ /* Define if the system is a x86-64/linux */
+ #undef M_x86_64_linux
+ 
++/* Define if the system is a x86-64/bsd */
++#undef M_x86_64_bsd
+ 
+ 
+ /* Constant definitions */
diff -r 244a461abe29 -r aa4dc7f86d37 lang/gprolog/patches/patch-ae
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/lang/gprolog/patches/patch-ae     Sun Sep 07 04:35:41 2008 +0000
@@ -0,0 +1,22 @@
+$NetBSD: patch-ae,v 1.6 2008/09/07 04:35:41 dholland Exp $
+
+--- src/EnginePl/engine1.c~    2007-01-04 05:35:13.000000000 -0500
++++ src/EnginePl/engine1.c     2008-09-07 00:09:12.000000000 -0400
+@@ -100,7 +100,7 @@ Call_Compiled(CodePtr codep)
+   register WamWord *rb asm("%l0") = reg_bank;
+   ensure_reserved = (WamWord *) rb; /* to avoid gcc warning */
+ 
+-#elif defined(M_x86_64_linux)
++#elif defined(M_x86_64)
+ 
+   register WamWord *rb asm("%r12") = reg_bank;
+   ensure_reserved = (WamWord *) rb; /* to avoid gcc warning */
+@@ -113,7 +113,7 @@ Call_Compiled(CodePtr codep)
+ #if defined(M_ix86_darwin)            /* see comment in Ma2Asm/ix86_any.c */
+   asm("andl $0xfffffff0,%esp");
+   asm("addl $4,%esp");
+-#elif defined(M_x86_64_linux)         /* see comment in Ma2Asm/x86_64_any.c */
++#elif defined(M_x86_64)                       /* see comment in Ma2Asm/x86_64_any.c */
+   asm("andq $0xfffffffffffffff0,%rsp");
+   asm("addq $8,%rsp");
+ #endif
diff -r 244a461abe29 -r aa4dc7f86d37 lang/gprolog/patches/patch-af
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/lang/gprolog/patches/patch-af     Sun Sep 07 04:35:41 2008 +0000
@@ -0,0 +1,22 @@
+$NetBSD: patch-af,v 1.6 2008/09/07 04:35:41 dholland Exp $
+
+--- src/EnginePl/engine.c~     2007-01-04 05:35:13.000000000 -0500
++++ src/EnginePl/engine.c      2008-09-07 00:10:33.000000000 -0400
+@@ -455,7 +455,7 @@ Call_Prolog_Fail(void)
+ {
+ #ifdef M_ix86_darwin          /* see comment in Ma2Asm/ix86_any.c */
+   asm("subl $4,%esp");
+-#elif defined(M_x86_64_linux)         /* see comment in Ma2Asm/x86_64_any.c */
++#elif defined(M_x86_64)       /* see comment in Ma2Asm/x86_64_any.c */
+   asm("subq $8,%rsp");
+ #endif
+   Save_Machine_Regs(p_buff_save);
+@@ -475,7 +475,7 @@ Call_Prolog_Success(void)
+ {
+ #ifdef M_ix86_darwin          /* see comment in Ma2Asm/ix86_any.c */
+   asm("subl $4,%esp");
+-#elif defined(M_x86_64_linux)         /* see comment in Ma2Asm/x86_64_any.c */
++#elif defined(M_x86_64)       /* see comment in Ma2Asm/x86_64_any.c */
+   asm("subq $8,%rsp");
+ #endif
+   Save_Machine_Regs(p_buff_save);
diff -r 244a461abe29 -r aa4dc7f86d37 lang/gprolog/patches/patch-ba
--- a/lang/gprolog/patches/patch-ba     Sun Sep 07 03:23:16 2008 +0000
+++ b/lang/gprolog/patches/patch-ba     Sun Sep 07 04:35:41 2008 +0000
@@ -1,10 +1,7 @@
-$NetBSD: patch-ba,v 1.1 2007/12/01 12:28:04 rillig Exp $
+$NetBSD: patch-ba,v 1.2 2008/09/07 04:35:41 dholland 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
+--- src/EnginePl/machine.c.orig        2007-01-04 05:35:13.000000000 -0500
++++ src/EnginePl/machine.c     2008-09-07 00:07:29.000000000 -0400
 @@ -469,7 +469,7 @@ SIGSEGV_Handler(int sig, struct sigconte
  static void
  SIGSEGV_Handler(int sig, siginfo_t * si)
@@ -14,6 +11,24 @@
  static void
  SIGSEGV_Handler(int sig, int code, struct sigcontext *scp)
  
+@@ -482,7 +482,7 @@ SIGSEGV_Handler(WamWord *addr)
+ void
+ SIGSEGV_Handler(int sig, int code, struct sigcontext *scp)
+ 
+-#elif defined(M_x86_64_linux)
++#elif defined(M_x86_64_linux) || defined(M_x86_64_bsd)
+ void
+ SIGSEGV_Handler(int sig, siginfo_t *sip, void *scp)
+ 
+@@ -509,7 +509,7 @@ SIGSEGV_Handler(int sig)
+ 
+   WamWord *addr = (WamWord *) scp.cr2;
+ 
+-#elif defined(M_x86_64_linux)
++#elif defined(M_x86_64_linux) || defined(M_x86_64_bsd)
+ 
+   WamWord *addr = (WamWord *) sip->si_addr;
+ 
 @@ -517,7 +517,7 @@ SIGSEGV_Handler(int sig)
  
    WamWord *addr = (WamWord *) si->si_addr;
Prev by Date: [pkgsrc/trunk]: pkgsrc/lang/gcc3-java And now, add some logic so if gcc decli...
Next by Date: [pkgsrc/trunk]: pkgsrc/audio/easytag-current Update to 2.1.6:
Previous by Thread: [pkgsrc/trunk]: pkgsrc/lang/gcc3-java And now, add some logic so if gcc decli...
Next by Thread: [pkgsrc/trunk]: pkgsrc/audio/easytag-current Update to 2.1.6:
Indexes:
Home | Main Index | Thread Index | Old Index