Stuart Henderson writes:
> On 2018/04/26 12:00, Solene Rapenne wrote:
>> I added a pkg/README-main with following content
> I'm not sure if this is the cause, there are c++ files but I don't see them
> being compiled, and I'd expect libc++ as well in that case.
>
> It seems more likely that the embedded luajit is the reason, c++abi is
> needed for unwind on clang arches. I don't see how it's being pulled in
> here, but whatever the reason it should be in WANTLIB, but only on clang
> arches, so please make it conditional:
>
> .include <bsd.port.arch.mk>
> .if ${PROPERTIES:Mclang}
> WANTLIB += c++abi
> .endif
I'm not sure about where to add the conditional WANTLIB in the makefile,
I've taken inspiration from games/dunelegacy.
I added a comment before the conditional, don't know if needed but I
think it's a good idea to track why we have this condition.
full diff (thx for cvs add ; cvs diff -uN)
Index: Makefile
===================================================================
RCS file: /cvs/ports/games/tome4/Makefile,v
retrieving revision 1.13
diff -u -p -u -r1.13 Makefile
--- Makefile 27 Jan 2018 12:33:57 -0000 1.13
+++ Makefile 26 Apr 2018 13:45:54 -0000
@@ -10,7 +10,7 @@ ONLY_FOR_ARCHS = i386 amd64
COMMENT-main = graphical sdl rogue-like game
COMMENT-data = data for Tales of Maj'Eyal
-V = 1.5.5
+V = 1.5.7
PKGNAME-main = tome4-${V}
PKGNAME-data = tome4-data-${V}
CATEGORIES = games x11
@@ -47,6 +47,11 @@ WANTLIB-data =
COMPILER = base-clang ports-gcc
COMPILER_LANGS = c
+# c++abi certainly pulled out by luajit when using clang
+.include <bsd.port.arch.mk>
+.if ${PROPERTIES:Mclang}
+WANTLIB += c++abi
+.endif
NO_TEST = Yes
Index: distinfo
===================================================================
RCS file: /cvs/ports/games/tome4/distinfo,v
retrieving revision 1.3
diff -u -p -u -r1.3 distinfo
--- distinfo 27 Jan 2018 12:33:57 -0000 1.3
+++ distinfo 26 Apr 2018 13:45:54 -0000
@@ -1,2 +1,2 @@
-SHA256 (t-engine4-src-1.5.5.tar.bz2) =
A3zO5JMhPF4gdJ00gfVnbwUJlbtop7vYCu23fV17WGw=
-SIZE (t-engine4-src-1.5.5.tar.bz2) = 421330688
+SHA256 (t-engine4-src-1.5.7.tar.bz2) =
x3ZMsXwrX4ByfOwJwB4OCMWJgaIGH0bwTriEuub9Kgs=
+SIZE (t-engine4-src-1.5.7.tar.bz2) = 422494514
cvs server: Diffing patches
cvs server: Diffing pkg
Index: pkg/PLIST-main
===================================================================
RCS file: /cvs/ports/games/tome4/pkg/PLIST-main,v
retrieving revision 1.3
diff -u -p -u -r1.3 PLIST-main
--- pkg/PLIST-main 27 Mar 2017 18:28:29 -0000 1.3
+++ pkg/PLIST-main 26 Apr 2018 13:45:54 -0000
@@ -1,5 +1,6 @@
@comment $OpenBSD: PLIST-main,v 1.3 2017/03/27 18:28:29 jca Exp $
@bin bin/tome4
+share/doc/pkg-readmes/${FULLPKGNAME}
share/tome4/bootstrap/
share/tome4/bootstrap/boot.lua
share/tome4/game/addons/
@@ -134,6 +135,7 @@ share/tome4/game/thirdparty/moonscript/u
share/tome4/game/thirdparty/moonscript/version.lua
share/tome4/game/thirdparty/remdebug/
share/tome4/game/thirdparty/remdebug/engine.lua
+share/tome4/game/thirdparty/sha1.lua
share/tome4/game/thirdparty/slt2.lua
share/tome4/game/thirdparty/socket/
share/tome4/game/thirdparty/socket.lua
Index: pkg/README-main
===================================================================
RCS file: pkg/README-main
diff -N pkg/README-main
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ pkg/README-main 26 Apr 2018 13:45:54 -0000
@@ -0,0 +1,9 @@
+$OpenBSD$
+
++-----------------------------------------------------------------------
+| Running ${FULLPKGNAME} on OpenBSD
++-----------------------------------------------------------------------
+
+If you have troubles running the game, you can try --safe-mode
+parameter. The full list of available parameters can be found on the
+project's wiki : https://te4.org/wiki/Command_Line_Arguments
