diff --git Makefile Makefile
index ff38e16fe..fb6b30c2f 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
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
On Sun, 13 Oct 2024 14:50:06 -0500
izzy Meyer <izder456@disroot.org> wrote:
> On Sun, 13 Oct 2024 14:35:29 -0500
> izzy Meyer <izder456@disroot.org> wrote:
>
> > Hey ports@
> >
> > This is an update to 1.3.7, everything works, but for now needs to
> > be built with gcc as upstream changed some stuff with libunwind,
> > which breaks clang compat.
> >
> > I am working with upstream in their discord to get clang supported.
> > I am not a very good C dev so IDK where to start.
> >
> > Diff is attached. OK to merge for now until Clang compat patch comes
> > and I can send a new diff?
> >
> > Thanks-
> >
>
> For more information, heres the error when compiling outside the ports
> tree.
>
> /tmp/ClassiCube-1.3.7 gmake
> gmake ClassiCube PLAT=openbsd
> gmake[1]: Entering directory '/tmp/ClassiCube-1.3.7'
> mkdir -p build-openbsd
>
> ### See PLAT? its properly detecting OpenBSD
>
> ## rest of cc build logs...
>
> ## then the linker...
>
> 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
>
> It seems to be some sort of GLIBC dependance maybe?
>
> Unsure.
>
> Thanks-
>
From upstream on discord:
> there was a change made that tried to ensure that `backtrace` wasn't
> used in musl, because it wasn't implemented there and so confused
> users https://github.com/ClassiCube/ClassiCube/commit/c9b1c04924c48b42847a0405f7c8abe107c63e78#diff-88f9a62383d2804ee5331d8705e4388f4e150446e205f57955e3fcb8ae345aa0R375
>
> but that unintentionally broke OpenBSD too, since it _does_ provide
> libexecinfo with a `backtrace` function
>
> ...
>
> I fixed it in latest commit
This diff points to said commit, and reverts back to clang.
OK to merge now that Clang building is fixed?
--
iz (they/them)
> i like to say mundane things,
> there are too many uninteresting things
> that go unnoticed.
izder456 (dot) neocities (dot) org
No comments:
Post a Comment