On Sun, 13 Oct 2024 17:59:29 -0500 izzy Meyer <izder...@disroot.org> wrote:
> On Sun, 13 Oct 2024 23:56:55 +0200 > Kirill A. Korinsky <kir...@korins.ky> wrote: > > > On Sun, 13 Oct 2024 21:50:06 +0200, > > izzy Meyer <izder...@disroot.org> wrote: > > > > > > ld: error: undefined symbol: _Unwind_Backtrace > > > >>> referenced by Logger.c:1363 (src/Logger.c:1363) > > > >>> build-openbsd/Logger.o:(Logger_Backtrace) > > > > > > ld: error: undefined symbol: _Unwind_GetIP > > > >>> referenced by Logger.c:1355 (src/Logger.c:1355) > > > >>> build-openbsd/Logger.o:(UnwindFrame) > > > cc: error: linker command failed with exit code 1 (use -v to see > > > invocation) gmake[1]: *** [Makefile:247: ClassiCube] Error 1 > > > gmake[1]: Leaving directory '/tmp/ClassiCube-1.3.7' > > > gmake: *** [Makefile:175: openbsd] Error 2 > > > > > > > You should use CXX and not CC. Here an updated diff which builds on > > -current/amd64 but I haven't tested it. > > > > Thus, I've noticed that Makefile had hardcoded /usr/local which I > > also replaced to actual value inside pre-configure stage. > > > > I'll send that makefile patch upstream. Did you see my recent reply > that upstream fixed things? > > https://marc.info/?l=openbsd-ports&m=172885472931514&w=2 > > Why, exactly do we need CXX and not CC here? and most-importantly, why > does it fix things? > > Thanks- > Here's an updated diff that combines the Makefile patch as well as the commit hash that fixes -lexecinfo I also upstreamed the Makefile patch: https://github.com/ClassiCube/ClassiCube/pull/1281 Thanks. -- iz (they/them) > i like to say mundane things, > there are too many uninteresting things > that go unnoticed. izder456 (dot) neocities (dot) org
diff --git Makefile Makefile
index ff38e16fe..c0460ece9 100644
--- Makefile
+++ Makefile
@@ -3,10 +3,14 @@ BROKEN-sparc64 = ...error "Unknown CPU architecture"
COMMENT = classic Minecraft client written in C
-V = 1.3.6
+V = 1.3.7
PKGNAME = classicube-${V}
-DIST_TUPLE += github ClassiCube ClassiCube 1.3.6 .
+# -lexecinfo was broken in 1.3.7 with commit
+# c9b1c04924c48b42847a0405f7c8abe107c63e78,
+# this hash reverts the regression
+COMMIT += a4c2c2f88aba73ae5c49faa1ef2c104f6ba09b88
+DIST_TUPLE += github ClassiCube ClassiCube ${COMMIT} .
CATEGORIES = games
@@ -27,6 +31,9 @@ USE_GMAKE = Yes
ALL_TARGET = ClassiCube
+pre-configure:
+ @sed -i 's,/usr/local,${PREFIX},' ${WRKSRC}/Makefile
+
do-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/classicube
${INSTALL_PROGRAM} ${WRKSRC}/ClassiCube ${PREFIX}/share/classicube/classicube_run
diff --git distinfo distinfo
index 4134473be..63f29be1b 100644
--- distinfo
+++ distinfo
@@ -1,2 +1,2 @@
-SHA256 (ClassiCube-ClassiCube-1.3.6.tar.gz) = +reA9NzwZpoPlGg8m2WW9Ay4PglyejuRqq5ek0qXQLA=
-SIZE (ClassiCube-ClassiCube-1.3.6.tar.gz) = 2490780
+SHA256 (ClassiCube-ClassiCube-a4c2c2f88aba73ae5c49faa1ef2c104f6ba09b88.tar.gz) = 66yRwZcgsUJ347QoqI5YTQkCkGZ9UqQg6rqoKJx28T4=
+SIZE (ClassiCube-ClassiCube-a4c2c2f88aba73ae5c49faa1ef2c104f6ba09b88.tar.gz) = 3720252
pgpL5gFtICFH5.pgp
Description: OpenPGP digital signature
