[nestopia] 10/11: Preserve CPPFLAGS in libretro

[Stephen Kitt]

This is an automated email from the git hooks/post-receive script.

skitt pushed a commit to branch master
in repository nestopia.

commit 990f7c6c2d29d63c36008bca6a98bf3cc5397da5
Author: Stephen Kitt <steve at sk2.org>
Date:   Sat Sep 9 11:50:08 2017 +0200

    Preserve CPPFLAGS in libretro
---
 debian/changelog                       |  2 ++
 debian/patches/libretro-cppflags.patch | 18 ++++++++++++++++++
 debian/patches/series                  |  1 +
 3 files changed, 21 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 9b44348..80da4f6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,8 @@ nestopia (1.48-1) UNRELEASED; urgency=medium
   * Enable PIE.
   * Switch to https URL in debian/copyright.
   * Standards-Version 4.1.0, no further change required.
+  * Preserve CPPFLAGS when building libretro (so the hardening options
+    are applied).
 
  -- Stephen Kitt <skitt at debian.org>  Fri, 08 Sep 2017 21:27:30 +0200
 
diff --git a/debian/patches/libretro-cppflags.patch b/debian/patches/libretro-cppflags.patch
new file mode 100644
index 0000000..cc917d0
--- /dev/null
+++ b/debian/patches/libretro-cppflags.patch
@@ -0,0 +1,18 @@
+Description: Apply CPPFLAGS when building libretro
+Author: Stephen Kitt <skitt at debian.org>
+
+--- a/libretro/Makefile
++++ b/libretro/Makefile
+@@ -300,10 +300,10 @@
+ endif
+ 
+ %.o: %.cpp
+-	$(CXX) -c -o $@ $< $(CXXFLAGS) $(INCDIRS)
++	$(CXX) $(CPPFLAGS) -c -o $@ $< $(CXXFLAGS) $(INCDIRS)
+ 
+ %.o: %.c
+-	$(CC) -c -o $@ $< $(CFLAGS) $(INCDIRS)
++	$(CC) $(CPPFLAGS) -c -o $@ $< $(CFLAGS) $(INCDIRS)
+ 
+ clean-objs:
+ 	rm -f $(OBJS)
diff --git a/debian/patches/series b/debian/patches/series
index ab1516f..2b267e7 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 libretro_version.patch
+libretro-cppflags.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/nestopia.git