pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

naev: fix alloca.h problem



Module Name:	pkgsrc-wip
Committed By:	Thomas Klausner <wiz%NetBSD.org@localhost>
Pushed By:	wiz
Date:		Fri May 17 17:07:13 2024 +0200
Changeset:	40e8dfadbbdb716b8d0da548abc30c436ad97462

Modified Files:
	naev/Makefile
	naev/TODO

Log Message:
naev: fix alloca.h problem

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=40e8dfadbbdb716b8d0da548abc30c436ad97462

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 naev/Makefile | 7 +++++++
 naev/TODO     | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

diffs:
diff --git a/naev/Makefile b/naev/Makefile
index a7ff14d41b..d0ce081cd4 100644
--- a/naev/Makefile
+++ b/naev/Makefile
@@ -21,6 +21,13 @@ INSTALL_TARGET=	install install-data-local
 
 MESON_ARGS+=		-Dndata_path="${INSTALL_GAME_DIR}"
 
+SUBST_CLASSES+=		alloca
+SUBST_FILES.alloca+=	meson.build
+SUBST_FILES.alloca+=	src/utf8.c
+SUBST_SED.alloca+=	-e "s,HAVE_ALLOCA_H,NAEV_HAVE_ALLOCA_H,"
+SUBST_STAGE.alloca=	post-extract
+SUBST_MESSAGE.alloca=	Avoid symbol conflict with SDL2.
+
 #CONFIGURE_ARGS+=	--enable-debug=no
 #CONFIGURE_ARGS+=	--enable-lua=shared
 #CONFIGURE_ARGS+=	--disable-sdltest
diff --git a/naev/TODO b/naev/TODO
index 6adedfe1d6..678a768cc5 100644
--- a/naev/TODO
+++ b/naev/TODO
@@ -1,4 +1,4 @@
-- figure out the artwork submodule
 - building
+  cholmod_solve2 symbol missing during linking
 - testing
 - conquering the galaxy


Home | Main Index | Thread Index | Old Index