cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update to gprolog-1.5.0, from Bastian [bw-openbsd at gmx], small tweaks by me

Browse Source
This commit is contained in:
sthen 2022-02-12 14:13:08 +00:00
parent a5b2982ec2
commit 96fdc45c8d
8 changed files with 37 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
lang/gprolog/Makefile
View File

@ -1,14 +1,17 @@
# $OpenBSD: Makefile,v 1.29 2020/06/13 12:07:22 cwen Exp $
# $OpenBSD: Makefile,v 1.30 2022/02/12 14:13:08 sthen Exp $
BROKEN-i386= various errors from gplc during build (segv, "fatal error", etc at various different points)
BROKEN-powerpc= ld.so: pl2wam: relocation failed
BROKEN-i386= linking problems
# - with USE_LLD=No or LDFLAGS=--Wl,-z,notext, build fails with
# Fatal Error: if_no_fd.c: FD Solver not linked
#
# - without the above, build fails with
# ld: error: can't create dynamic relocation R_386_32 against local symbol in readonly segment; recompile object files with -fPIC or pass '-Wl,-z,notext' to allow text relocations in the output
ONLY_FOR_ARCHS= amd64 i386 powerpc sparc64
ONLY_FOR_ARCHS= amd64 i386 sparc64
COMMENT= Prolog compiler
DISTNAME= gprolog-1.4.5
REVISION= 3
DISTNAME= gprolog-1.5.0
CATEGORIES= lang
@ -23,8 +26,6 @@ MASTER_SITES= http://www.gprolog.org/ \
http://www.gprolog.org/old_versions/ \
${MASTER_SITE_GNU:=gprolog/}
COMPILER = base-gcc ports-gcc
COMPILER_LANGS = c
CONFIGURE_STYLE= gnu dest no-autoheader
CONFIGURE_ARGS+= --with-install-dir='${PREFIX}/libdata/gprolog' \
@ -36,12 +37,6 @@ CONFIGURE_ARGS+= --with-install-dir='${PREFIX}/libdata/gprolog' \
--with-html-dir='${PREFIX}/share/doc/gprolog/html' \
--with-doc-dir='${PREFIX}/share/doc/gprolog' \
--with-c-flags="${CFLAGS}"
CONFIGURE_ENV= LDFLAGS="${LDFLAGS}"
.include <bsd.port.arch.mk>
.if ${MACHINE_ARCH:Mi386}
LDFLAGS+= -Wl,-znotext
.endif
WRKDIST= ${WRKDIR}/${DISTNAME}/src

4
lang/gprolog/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (gprolog-1.4.5.tar.gz) = v9zwDgUeBii0+a+dZjjU/eateTQB5YpWGdHMYQVhjHw=
SIZE (gprolog-1.4.5.tar.gz) = 3587361
SHA256 (gprolog-1.5.0.tar.gz) = ZwZCtDwPqifr1olh77F+vnB2iPkbaAlWbd1gYTlRLAE=
SIZE (gprolog-1.5.0.tar.gz) = 3813899

4
lang/gprolog/patches/patch-EnginePl_machine_h
View File

@ -1,4 +1,4 @@
$OpenBSD: patch-EnginePl_machine_h,v 1.3 2018/11/23 09:11:15 jca Exp $
$OpenBSD: patch-EnginePl_machine_h,v 1.4 2022/02/12 14:13:08 sthen Exp $
Hunk 1:
XXX not quite sure why this is needed as it's built without PIE anyway, but
@ -29,7 +29,7 @@ Index: EnginePl/machine.h
#ifdef NO_USE_EBP
# define M_USED_REGS {"ebx", 0}
@@ -196,7 +196,7 @@ void M_Check_Magic_Words(void); /* not compiled if not
@@ -224,7 +224,7 @@ void M_Check_Magic_Words(void); /* not compiled if not
*---------------------------------*/
#if defined(__OpenBSD__) || defined(M_bsd)

5
lang/gprolog/patches/patch-Ma2Asm_Makefile_in
View File

@ -1,8 +1,9 @@
$OpenBSD: patch-Ma2Asm_Makefile_in,v 1.3 2018/11/12 19:15:40 daniel Exp $
$OpenBSD: patch-Ma2Asm_Makefile_in,v 1.4 2022/02/12 14:13:08 sthen Exp $
Index: Ma2Asm/Makefile.in
--- Ma2Asm/Makefile.in.orig
+++ Ma2Asm/Makefile.in
@@ -53,14 +53,14 @@ CHKMA_OBJS=chkma@OBJ_SUFFIX@ chkma_ma@OBJ_SUFFIX@ ../E
@@ -59,14 +59,14 @@ CHKMA_OBJS=chkma@OBJ_SUFFIX@ chkma_ma@OBJ_SUFFIX@ ../E
chkma@OBJ_SUFFIX@: chkma.c ../EnginePl/engine.c
if [ "$$FC" = "Y" ]; then FCFLAGS='-DFAST'; fi; \

16
lang/gprolog/patches/patch-Ma2Asm_powerpc_any_c
View File

@ -1,16 +0,0 @@
$OpenBSD: patch-Ma2Asm_powerpc_any_c,v 1.1 2018/08/19 23:45:00 daniel Exp $
Fix build on macppc
Index: Ma2Asm/powerpc_any.c
--- Ma2Asm/powerpc_any.c.orig
+++ Ma2Asm/powerpc_any.c
@@ -1011,7 +1011,7 @@ Data_Start(char *initializer_fct)
if (initializer_fct == NULL)
return;
-#ifdef M_powerpc_linux
+#if defined(M_powerpc_linux) || defined(M_powerpc_bsd)
Inst_Printf(".section", ".ctors,\"aw\",@progbits");
Inst_Printf(".align", "2");
Inst_Printf(".long", UN "%s", initializer_fct);

5
lang/gprolog/patches/patch-Makefile_in
View File

@ -1,8 +1,9 @@
$OpenBSD: patch-Makefile_in,v 1.2 2017/06/08 15:25:57 espie Exp $
$OpenBSD: patch-Makefile_in,v 1.3 2022/02/12 14:13:08 sthen Exp $
Index: Makefile.in
--- Makefile.in.orig
+++ Makefile.in
@@ -82,13 +82,13 @@ uninstall: uninstall-links uninstall-html uninstall-do
@@ -85,13 +85,13 @@ uninstall: uninstall-links uninstall-html uninstall-do
# --- Links --- #
install-links: uninstall-links

10
lang/gprolog/patches/patch-SETVARS
View File

@ -1,8 +1,10 @@
$OpenBSD: patch-SETVARS,v 1.1 2009/12/27 19:30:21 jasper Exp $
--- SETVARS.orig Wed May 9 03:32:07 2007
+++ SETVARS Wed May 9 03:32:12 2007
$OpenBSD: patch-SETVARS,v 1.2 2022/02/12 14:13:08 sthen Exp $
Index: SETVARS
--- SETVARS.orig
+++ SETVARS
@@ -1,4 +1,3 @@
a=`pwd`
PATH=$a/TopComp:$a/EnginePl:$a/Pl2Wam:$a/Wam2Ma:$a/Ma2Asm:$a/Fd2C:$a/DevUtils:$a/W32GUICons:$PATH:/usr/ucb/:/usr/ccs/bin/
PATH=$a/TopComp:$a/EnginePl:$a/Pl2Wam:$a/Wam2Ma:$a/Ma2Asm:$a/Fd2C:$a/DevUtils:$a/W32GUICons:$PATH
-export PATH

22
lang/gprolog/pkg/PLIST
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.5 2018/11/12 19:15:40 daniel Exp $
@comment $OpenBSD: PLIST,v 1.6 2022/02/12 14:13:08 sthen Exp $
bin/fd2c
bin/gplc
bin/gprolog
@ -28,26 +28,27 @@ libdata/gprolog/lib/
libdata/gprolog/lib/all_fd_bips.o
libdata/gprolog/lib/all_pl_bips.o
libdata/gprolog/lib/debugger.o
libdata/gprolog/lib/libbips_fd.a
libdata/gprolog/lib/libbips_pl.a
libdata/gprolog/lib/libengine_fd.a
libdata/gprolog/lib/libengine_pl.a
libdata/gprolog/lib/liblinedit.a
@static-lib libdata/gprolog/lib/libbips_fd.a
@static-lib libdata/gprolog/lib/libbips_pl.a
@static-lib libdata/gprolog/lib/libengine_fd.a
@static-lib libdata/gprolog/lib/libengine_pl.a
@static-lib libdata/gprolog/lib/liblinedit.a
libdata/gprolog/lib/top_level.o
libdata/gprolog/lib/top_level_main.o
share/doc/gprolog/
share/doc/gprolog/compil-scheme.eps
share/doc/gprolog/compil-scheme.pdf
share/doc/gprolog/contents_motif.gif
share/doc/gprolog/compil-scheme.png
share/doc/gprolog/debug-box.eps
share/doc/gprolog/debug-box.pdf
share/doc/gprolog/debug-box.png
share/doc/gprolog/gprolog.chm
share/doc/gprolog/gprolog.dvi
share/doc/gprolog/gprolog.html
share/doc/gprolog/gprolog.pdf
share/doc/gprolog/gprolog.ps
share/doc/gprolog/html/
share/doc/gprolog/html/contents_motif.gif
share/doc/gprolog/html/contents_motif.svg
share/doc/gprolog/html/gprolog-idx.html
share/doc/gprolog/html/gprolog.css
share/doc/gprolog/html/gprolog001.html
@ -124,10 +125,11 @@ share/doc/gprolog/html/gprolog071.html
share/doc/gprolog/html/gprolog072.html
share/doc/gprolog/html/gprolog073.html
share/doc/gprolog/html/index.html
share/doc/gprolog/html/next_motif.gif
share/doc/gprolog/html/previous_motif.gif
share/doc/gprolog/html/next_motif.svg
share/doc/gprolog/html/previous_motif.svg
share/doc/gprolog/logo.eps
share/doc/gprolog/logo.pdf
share/doc/gprolog/logo.png
share/examples/gprolog/
share/examples/gprolog/ExamplesC/
share/examples/gprolog/ExamplesC/Makefile