Attachment 242262 Details for Bug 271500 – Patch

[patch] Patch

0001-games-openclonk-Fix-link-on-14-CURRENT-i386.patch (text/plain), 1.61 KB, created by Kevin Zheng on 2023-05-18 22:04:27 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Kevin Zheng

Created: 2023-05-18 22:04:27 UTC

Size: 1.61 KB

patch

obsolete

>From 3ba7b1e74a3633db9792346a152c6a067063f8e1 Mon Sep 17 00:00:00 2001
>From: Kevin Zheng <kevinz5000@gmail.com>
>Date: Thu, 18 May 2023 14:53:29 -0700
>Subject: [PATCH] games/openclonk: Fix link on 14-CURRENT i386
>
>Fix build on 14-CURRENT i386 by disabling dynamic relocation checks with
>lld 15.
>
>While here, since this port is BROKEN_powerpc64, remove the old powerpc
>build flags.
>---
> games/openclonk/Makefile | 13 +++++--------
> 1 file changed, 5 insertions(+), 8 deletions(-)
>
>diff --git a/games/openclonk/Makefile b/games/openclonk/Makefile
>index 46a6d9ba5675..dc565d626eb9 100644
>--- a/games/openclonk/Makefile
>+++ b/games/openclonk/Makefile
>@@ -27,7 +27,7 @@ LIB_DEPENDS=	libalut.so:audio/freealut \
> WRKSRC=		${WRKDIR}/openclonk-release-${PORTVERSION}-src
> 
> # make install has parallel issues with ninja
>-USES=		cmake:noninja desktop-file-utils gl gnome jpeg openal \
>+USES=		cmake:noninja compiler:c++14-lang desktop-file-utils gl gnome jpeg openal \
> 		pkgconfig sdl tar:bzip2 xorg
> USE_GL=		gl glew glu
> USE_SDL=	sdl2
>@@ -35,17 +35,14 @@ USE_XORG=	x11 xpm
> CMAKE_ARGS=	-DAudio_TK:STRING="OpenAL"
> LDFLAGS_i386=	-Wl,-znotext
> 
>-.include <bsd.port.options.mk>
>+.include <bsd.port.pre.mk>
> 
>-.if ${ARCH} == powerpc64le
>-CFLAGS+=	-DNO_WARN_X86_INTRINSICS
>-USES+=		compiler:gcc-c++11-lib
>-.else
>-USES+=		compiler:c++14-lang
>+.if ${COMPILER_TYPE} == "clang" && ${COMPILER_VERSION} >= 150
>+LDFLAGS_i386+=  -Wl,--no-check-dynamic-relocations
> .endif
> 
> post-patch:
> 	@${REINPLACE_CMD} -e 's|DESTINATION games|DESTINATION bin|' \
> 		-e 's|share/games|share|' ${WRKSRC}/CMakeLists.txt
> 
>-.include <bsd.port.mk>
>+.include <bsd.port.post.mk>
>-- 
>2.40.1
>

Actions: View | Diff

Attachments on bug 271500: 242262