gnu: openscad: Update to 2021.01 [maybe fixes TALOS-2020-1222, TALOS-2020-1223].

[jackhill/guix/guix.git] / gnu / packages / patches / kiki-makefile.patch

Downloaded from https://anonscm.debian.org/viewvc/pkg-games/packages/trunk/kiki-the-nano-bot/debian/patches/Makefile.patch?revision=15681&view=co

Makefile fixes:
 - Make CXXFLAGS, CPPFLAGS, LDFLAGS available for user-specified flags.
 - run SWIG before compiling

Peter De Wachter (pdewacht@gmail.com)
placed in the public domain

--- a/kodilib/linux/Makefile
+++ b/kodilib/linux/Makefile
@@ -21,7 +21,7 @@
 \r
 INCLUDES = $(KODI_INCLUDES) $(X11_INCLUDES) $(SDL_INCLUDES)\r
 \r
-CXXFLAGS = $(INCLUDES) $(SDL_CFLAGS)\r
+CXXOPTS = -Wall $(INCLUDES) $(SDL_CFLAGS) $(CPPFLAGS) $(CXXFLAGS)\r
 \r
 src =  \\r
 	$(KODISRCDIR)/handler/KEventHandler.cpp \\r
@@ -95,4 +95,4 @@
 	$(RM) -f $(obj) libkodi.a\r
 \r
 %.o:    %.cpp\r
-	$(CXX) -c $(CXXFLAGS) -o $@ $<\r
+	$(CXX) -c $(CXXOPTS) -o $@ $<\r
--- a/linux/Makefile
+++ b/linux/Makefile
@@ -46,7 +46,7 @@
 \r
 INCLUDES = $(KIKI_INCLUDES) $(X11_INCLUDES) $(PYTHON_INCLUDES)\r
 \r
-CXXFLAGS = $(INCLUDES) $(SDLCFLAGS)\r
+CXXOPTS = -Wall $(INCLUDES) $(SDLCFLAGS) $(CPPFLAGS) $(CXXFLAGS)\r
 \r
 src =  \\r
 	$(KIKISRC)/base/KikiAction.cpp \\r
@@ -105,8 +105,10 @@
 obj = $(src:.cpp=.o)\r
 \r
 kiki: $(KIKISRC)/../SWIG/KikiPy_wrap.cpp $(obj)\r
-	-(cd ../SWIG; swig -c++ -python -globals kiki -o KikiPy_wrap.cpp KikiPy.i; cp kiki.py ../py)\r
-	$(CXX) $(obj) $(KODILIB) -o kiki $(GLLIBS) $(SDLLIBS) $(PYTHONLIBS)\r
+	$(CXX) $(LDFLAGS) $(obj) $(KODILIB) -o kiki $(GLLIBS) $(SDLLIBS) $(PYTHONLIBS)\r
+\r
+$(KIKISRC)/../SWIG/KikiPy_wrap.cpp: $(wildcard ../SWIG/*.i)\r
+	(cd ../SWIG && swig -c++ -python -globals kiki -DSWIG_PYTHON_LEGACY_BOOL -o KikiPy_wrap.cpp KikiPy.i && cp kiki.py ../py)\r
 \r
 obj-clean:\r
 	$(RM) -f $(obj)\r
@@ -115,5 +117,5 @@
 	$(RM) -f $(obj) kiki\r
 \r
 %.o:    %.cpp\r
-	$(CXX) -c $(CXXFLAGS) -o $@ $<\r
+	$(CXX) -c $(CXXOPTS) -o $@ $<\r
 \r