Tom Murphy wrote:
> Hi again,
>
> Here is a reworked diff. This time it keeps the patch for the
> Makefile that takes execinfo out of the flags. (Though I think
> it will compile with execinfo anyway, I'm not 100% sure if we
> should be compiling it or shouldn't?)
>
> This makes the least amount of changes to the port.
> Is this preferable?
>
> Thanks,
> Tom
Hi Tom,
This update works for me. The execinfo problem has been discussed
before. I'm quoting sthen:
> Can it be disabled instead? The backtrace functions are a perennial
> problem with ports and bulk builds.
>
> Software often checks for the headers and functions separately but
> don't check with -lexecinfo (because they're often in libc), and uses
> #ifdef HAVE_EXECINFO_H or similar around the #include, and
> #ifdef HAVE_BACKTRACE or similar around function calls.
> (yes this is not very sensible, but we do run into it quite often).
So I think we should leave it disabled.
Regarding the libraries. Make lib-depends-check now reports:
Extra: curl.26 openal.4
But the headers are needed at compile time. I first thought was to add
them as BUILD_DEPENDS and RUN_DEPENDS. But this then doesn't package
with errors:
Create /home/dpb/data/packages/amd64/all/yquake2-8.00.tgz
Missing library for curl>=0.0
Missing library for openal>=0.0
Therefore I think LIB_DEPENDS is still the correct place, but add a
comment about these libs being dlopened' and the expected Extra lines.
Best Regards,
Stefan
> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/games/yquake2/Makefile,v
> retrieving revision 1.23
> diff -u -p -r1.23 Makefile
> --- Makefile 7 Jan 2021 22:20:25 -0000 1.23
> +++ Makefile 11 Dec 2021 18:37:05 -0000
> @@ -4,7 +4,7 @@ ONLY_FOR_ARCHS= i386 amd64 sparc64
>
> COMMENT= Yamagi Quake II
> N= yquake2
> -V= 7.45
> +V= 8.00
> PKGNAME= ${N}-${V}
> DISTNAME= quake2-${V}
> CATEGORIES= games
> @@ -17,7 +17,7 @@ EXTRACT_SUFX= .tar.xz
> # GPLv2
> PERMIT_PACKAGE= Yes
>
> -WANTLIB += GL SDL2 c curl m openal pthread
> +WANTLIB += GL SDL2 c curl m openal
>
> LIB_DEPENDS= audio/openal \
> devel/sdl2 \
> Index: distinfo
> ===================================================================
> RCS file: /cvs/ports/games/yquake2/distinfo,v
> retrieving revision 1.10
> diff -u -p -r1.10 distinfo
> --- distinfo 7 Jan 2021 22:20:25 -0000 1.10
> +++ distinfo 11 Dec 2021 18:37:05 -0000
> @@ -1,2 +1,2 @@
> -SHA256 (quake2-7.45.tar.xz) = x1JFZ78apgRfJWGb6m5P2QZihLP7gYY7WB+0T09H/2U=
> -SIZE (quake2-7.45.tar.xz) = 1997816
> +SHA256 (quake2-8.00.tar.xz) = YNjRD8K011uWElGZDk2QM1cZSnMhC8HkKSTt74h9DrI=
> +SIZE (quake2-8.00.tar.xz) = 2086776
> Index: patches/patch-Makefile
> ===================================================================
> RCS file: /cvs/ports/games/yquake2/patches/patch-Makefile,v
> retrieving revision 1.3
> diff -u -p -r1.3 patch-Makefile
> --- patches/patch-Makefile 7 Jan 2021 22:20:26 -0000 1.3
> +++ patches/patch-Makefile 11 Dec 2021 18:37:05 -0000
> @@ -3,7 +3,7 @@ $OpenBSD: patch-Makefile,v 1.3 2021/01/0
> Index: Makefile
> --- Makefile.orig
> +++ Makefile
> -@@ -452,11 +452,6 @@ release/quake2 : CFLAGS += -DHAVE_EXECINFO
> +@@ -505,11 +505,6 @@ release/quake2 : CFLAGS += -DHAVE_EXECINFO
> release/quake2 : LDFLAGS += -lexecinfo
> endif
>
