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 @@
 
 INCLUDES = $(KODI_INCLUDES) $(X11_INCLUDES) $(SDL_INCLUDES)
 
-CXXFLAGS = $(INCLUDES) $(SDL_CFLAGS)
+CXXOPTS = -Wall $(INCLUDES) $(SDL_CFLAGS) $(CPPFLAGS) $(CXXFLAGS)
 
 src =  \
 	$(KODISRCDIR)/handler/KEventHandler.cpp \
@@ -95,4 +95,4 @@
 	$(RM) -f $(obj) libkodi.a
 
 %.o:    %.cpp
-	$(CXX) -c $(CXXFLAGS) -o $@ $<
+	$(CXX) -c $(CXXOPTS) -o $@ $<
--- a/linux/Makefile
+++ b/linux/Makefile
@@ -46,7 +46,7 @@
 
 INCLUDES = $(KIKI_INCLUDES) $(X11_INCLUDES) $(PYTHON_INCLUDES)
 
-CXXFLAGS = $(INCLUDES) $(SDLCFLAGS)
+CXXOPTS = -Wall $(INCLUDES) $(SDLCFLAGS) $(CPPFLAGS) $(CXXFLAGS)
 
 src =  \
 	$(KIKISRC)/base/KikiAction.cpp \
@@ -105,8 +105,10 @@
 obj = $(src:.cpp=.o)
 
 kiki: $(KIKISRC)/../SWIG/KikiPy_wrap.cpp $(obj)
-	-(cd ../SWIG; swig -c++ -python -globals kiki -o KikiPy_wrap.cpp KikiPy.i; cp kiki.py ../py)
-	$(CXX) $(obj) $(KODILIB) -o kiki $(GLLIBS) $(SDLLIBS) $(PYTHONLIBS)
+	$(CXX) $(LDFLAGS) $(obj) $(KODILIB) -o kiki $(GLLIBS) $(SDLLIBS) $(PYTHONLIBS)
+
+$(KIKISRC)/../SWIG/KikiPy_wrap.cpp: $(wildcard ../SWIG/*.i)
+	(cd ../SWIG && swig -c++ -python -globals kiki -DSWIG_PYTHON_LEGACY_BOOL -o KikiPy_wrap.cpp KikiPy.i && cp kiki.py ../py)
 
 obj-clean:
 	$(RM) -f $(obj)
@@ -115,5 +117,5 @@
 	$(RM) -f $(obj) kiki
 
 %.o:    %.cpp
-	$(CXX) -c $(CXXFLAGS) -o $@ $<
+	$(CXX) -c $(CXXOPTS) -o $@ $<
 
>
<option value='grep'>log msg</option>
<option value='author'>author</option>
<option value='committer'>committer</option>
<option value='range'>range</option>
</select>
<input class='txt' type='search' size='10' name='q' value=''/>
<input type='submit' value='search'/>
</form>
</td></tr></table>
<div class='path'>path: <a href='/guix/log/?id=6c700d8b3aba4c7c4a5b98e6b4cc802e5b51bcfb'>root</a>/<a href='/guix/log/gnu?id=6c700d8b3aba4c7c4a5b98e6b4cc802e5b51bcfb'>gnu</a>/<a href='/guix/log/gnu/build?id=6c700d8b3aba4c7c4a5b98e6b4cc802e5b51bcfb'>build</a>/<a href='/guix/log/gnu/build/linux-modules.scm?id=6c700d8b3aba4c7c4a5b98e6b4cc802e5b51bcfb'>linux-modules.scm</a></div><div class='content'><table class='list nowrap'><tr class='nohover'><th class='left'>Age</th><th class='left'>Commit message (<a href='/guix/log/gnu/build/linux-modules.scm?id=6c700d8b3aba4c7c4a5b98e6b4cc802e5b51bcfb&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2022-11-15 12:16:43 +0100'>2022-11-15</span></td><td><a href='/guix/commit/gnu/build/linux-modules.scm?id=afbd4d8470ad2e0b3bd5dd84b983bb343b4451f9'>linux-modules: Add 'load-pci-device-database'.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/build/linux-modules.scm (read-pci-device-database)
(load-pci-device-database): New procedures.
</span></span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2022-11-15 12:16:42 +0100'>2022-11-15</span></td><td><a href='/guix/commit/gnu/build/linux-modules.scm?id=655fb8feacfcb16da784ad88201663bb6fb566e4'>linux-modules: Add support for listing PCI devices.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/build/linux-modules.scm (&lt;pci-device&gt;): New record type.
(pci-device-class-predicate, storage-pci-device?, network-pci-device?)
(display-pci-device?, pci-devices?): New procedures.
</span></span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2021-12-16 12:53:52 -0500'>2021-12-16</span></td><td><a href='/guix/commit/gnu/build/linux-modules.scm?id=13f13554433c9dd47503131107dfbdd8a8031832'>linux-modules: Ignore EINVAL in ‘modprobe’ mode.</a><span class='msg-avail'>...<span class='msg-tooltip'>Loading the framebuffer-coreboot module simply fails with EINVAL on a
non-Corebooted system.  Crashing the system with a kernel panic is not
a reasonable reaction to loading valid modules on unsupported hardware.
The kernel should log an error, which the user is expected to see.

Bogus module names will still be fatally reported by linux-modules.drv.

* gnu/build/linux-modules.scm (load-linux-module*):
Ignore EINVAL errors when operating recursively.
</span></span></td><td>Tobias Geerinckx-Rice via Guix-patches via</td></tr>
<tr><td><span title='2020-08-25 11:53:20 +0200'>2020-08-25</span></td><td><a href='/guix/commit/gnu/build/linux-modules.scm?id=755f365b02b42a5d1e8ef3000dadef069553a478'>linux-libre: Support module compression.</a><span class='msg-avail'>...<span class='msg-tooltip'>This commit adds support for GZIP compression for linux-libre kernel
modules. The initrd modules are kept uncompressed as the initrd is already
compressed as a whole.

The linux-libre kernel also supports XZ compression, but as Guix does not have
any available bindings for now, and the compression time is far more
significant, GZIP seems to be a better option.

* gnu/build/linux-modules.scm (modinfo-section-contents): Use
'call-with-gzip-input-port' to read from a module file using '.gz' extension,
(strip-extension): new procedure,
(dot-ko): adapt to support compression,
(ensure-dot-ko): ditto,
(file-name-&gt;module-name): ditto,
(find-module-file): ditto,
(load-linux-module*): ditto,
(module-name-&gt;file-name/guess): ditto,
(module-name-lookup): ditto,
(write-module-name-database): ditto,
(write-module-alias-database): ditto,
(write-module-device-database): ditto.
* gnu/installer.scm (installer-program): Add "guile-zlib" to the extensions.
* gnu/machine/ssh.scm (machine-check-initrd-modules): Ditto.
* gnu/services.scm (activation-script): Ditto.
* gnu/services/base.scm (default-serial-port): Ditto,
(agetty-shepherd-service): ditto,
(udev-service-type): ditto.
* gnu/system/image.scm (gcrypt-sqlite3&amp;co): Ditto.
* gnu/system/linux-initrd.scm (flat-linux-module-directory): Add "guile-zlib"
to the extensions and make sure that the initrd only contains
uncompressed module files.
* gnu/system/shadow.scm (account-shepherd-service): Add "guile-zlib" to the
extensions.
* guix/profiles.scm (linux-module-database): Ditto.
</span></span></td><td>Mathieu Othacehe</td></tr>