Attachment 249738 Details for Bug 277869 – games-eduke32-patch-mimalloc-usage

[patch] games-eduke32-patch-mimalloc-usage

games-eduke32-patch-mimalloc-usage.patch (text/plain), 2.18 KB, created by Felix Palmen on 2024-04-05 12:10:53 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Felix Palmen

Created: 2024-04-05 12:10:53 UTC

Size: 2.18 KB

patch

obsolete

>From 5b3ece98bb5530129d3e32972d87a1da2676c3e4 Mon Sep 17 00:00:00 2001
>From: Felix Palmen <zirias@FreeBSD.org>
>Date: Wed, 3 Apr 2024 08:12:49 +0200
>Subject: [PATCH] games/eduke32: Fix build and datadir
>
>Fix building with clang17: mimalloc-override.h replaces malloc() and
>friends using macros which interfere with C++ standard headers -> patch
>to only include this when not compiling C++ code.
>
>Fix setting DATADIR, upstream source changed here.
>---
> games/eduke32/Makefile                               |  6 ++++--
> .../files/patch-source_build_include_compat.h        | 12 ++++++++++++
> 2 files changed, 16 insertions(+), 2 deletions(-)
> create mode 100644 games/eduke32/files/patch-source_build_include_compat.h
>
>diff --git a/games/eduke32/Makefile b/games/eduke32/Makefile
>index 192c5158814c..f092c9134bcd 100644
>--- a/games/eduke32/Makefile
>+++ b/games/eduke32/Makefile
>@@ -1,5 +1,6 @@
> PORTNAME=	eduke32
> PORTVERSION=	20240316
>+PORTREVISION=	1
> CATEGORIES=	games
> MASTER_SITES=	http://dukeworld.com/eduke32/synthesis/${PORTVERSION}-${GITREVISION}/:eduke32 \
> 		LOCAL/pkubaj/:erp \
>@@ -38,7 +39,7 @@ GITREVISION=	10564-0bc78c53d
> DATADIR=	${PREFIX}/share/duke3d
> SUB_FILES=	pkg-message
> MAKEFILE=	GNUmakefile
>-MAKE_ARGS=	CC=${CC} CXX=${CXX} CLANG=1
>+MAKE_ARGS=	CC=${CC} CXX=${CXX} CLANG=1 PRETTY_OUTPUT=0
> 
> PLIST_FILES=	bin/eduke32 bin/mapster32
> PORTEXAMPLES=	*
>@@ -92,7 +93,8 @@ post-extract-SHAREWARE-on:
> 	@cd ${WRKDIR} && ${UNZIP_NATIVE_CMD} -qo DN3DSW13.SHR
> 
> post-patch:
>-	@${REINPLACE_CMD} 's|/usr/share/games/eduke32|${DATADIR}|' \
>+	@${REINPLACE_CMD} \
>+		's|"/usr/local/share/games/" APPBASENAME|"${DATADIR}"|' \
> 		${WRKSRC}/source/duke3d/src/common.cpp
> 
> do-install:
>diff --git a/games/eduke32/files/patch-source_build_include_compat.h b/games/eduke32/files/patch-source_build_include_compat.h
>new file mode 100644
>index 000000000000..e0f205c9d235
>--- /dev/null
>+++ b/games/eduke32/files/patch-source_build_include_compat.h
>@@ -0,0 +1,12 @@
>+--- source/build/include/compat.h.orig	2024-04-05 10:58:57 UTC
>++++ source/build/include/compat.h
>+@@ -15,7 +15,9 @@
>+ 
>+ #ifdef USE_MIMALLOC
>+ # include "mimalloc.h"
>++# ifndef __clang__
>+ # include "mimalloc-override.h"
>++# endif
>+ #endif
>+ 
>+ #ifdef _WIN32
>-- 
>2.44.0
>

Actions: View | Diff

Attachments on bug 277869: 249683 | 249737 | 249738 | 249740