Attachment 240897 Details for Bug 270265 – fixup for the linker error

[patch] fixup for the linker error

0001-games-megaglest-fix-build-with-lld-15-on-i386.patch (text/plain), 1.43 KB, created by Thibault Payet on 2023-03-16 10:47:18 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Thibault Payet

Created: 2023-03-16 10:47:18 UTC

Size: 1.43 KB

patch

obsolete

>From f47f7bd4e7b51af559b1f403520fe001ffed81be Mon Sep 17 00:00:00 2001
>From: Thibault Payet <monwarez@gmail.com>
>Date: Thu, 16 Mar 2023 11:40:56 +0100
>Subject: [PATCH] games/megaglest: fix build with lld 15 on i386
>
>---
> games/megaglest/Makefile | 12 +++++++++++-
> 1 file changed, 11 insertions(+), 1 deletion(-)
>
>diff --git a/games/megaglest/Makefile b/games/megaglest/Makefile
>index 7452be6ff2f6..5dd2f1fe3c36 100644
>--- a/games/megaglest/Makefile
>+++ b/games/megaglest/Makefile
>@@ -49,6 +49,16 @@ VIEWER_CMAKE_BOOL=	BUILD_MEGAGLEST_MODEL_IMPORT_EXPORT_TOOLS \
> 			BUILD_MEGAGLEST_MODEL_VIEWER
> VIEWER_USE=		WX=3.0
> 
>+.include <bsd.port.pre.mk>
>+
>+# The following is actually meant for lld 15.0 and later, but the ports
>+# framework does not support LINKER_TYPE and LINKER_VERSION yet.
>+.if ${COMPILER_TYPE} == "clang" && ${COMPILER_VERSION} >= 150
>+# Turn off checking of dynamic relocations, to avoid lld diagnostics about
>+# possibly incorrect addend values.
>+LDFLAGS_i386+=	-Wl,--no-check-dynamic-relocations
>+.endif
>+
> post-patch:
> 	@${REINPLACE_CMD} -e 's,/usr/local/include/lua51,${LUA_INCDIR},g ; \
> 		s,/usr/local/lib/lua51,${LUA_LIBDIR},g ; \
>@@ -78,4 +88,4 @@ do-install-VIEWER-on:
> 	${INSTALL_PROGRAM} ${WRKSRC}/source/g3d_viewer/megaglest_g3dviewer ${STAGEDIR}${PREFIX}/bin/megaglest_g3dviewer
> 	${INSTALL_DATA} ${WRKSRC}/mk/shared/g3dviewer.ico ${STAGEDIR}${PREFIX}/share/pixmaps/
> 
>-.include <bsd.port.mk>
>+.include <bsd.port.post.mk>
>-- 
>2.39.2
>

Flags:

monwarez: maintainer-approval+

Actions: View | Diff

Attachments on bug 270265: 240897