The following commit has been merged in the master branch:
commit 72d9942dbb583cce78481fdc4675c1d97ff3cb41
Author: Stephen Kitt <st...@sk2.org>
Date: Mon Jun 18 01:01:03 2012 +0200
Fix configure.ac to ensure dpkg-buildflags' CPPFLAGS make it all the way
through the build.
diff --git a/debian/changelog b/debian/changelog
index 2420bc9..6cf65fe 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ mednafen (0.8.D.3-5) UNRELEASED; urgency=low
* Use ${source:Package} with dpkg-query to retrieve only the package
name in the Built-Using field (closes: #677867).
* Drop unused GPL-2 license paragraph from debian/copyright.
+ * Fix configure.ac to ensure dpkg-buildflags' CPPFLAGS make it all the
+ way through the build.
-- Stephen Kitt <st...@sk2.org> Sun, 17 Jun 2012 19:57:18 +0200
diff --git a/debian/patches/hardening-fixes.patch
b/debian/patches/hardening-fixes.patch
index cb0aa65..9fd4257 100644
--- a/debian/patches/hardening-fixes.patch
+++ b/debian/patches/hardening-fixes.patch
@@ -28,3 +28,32 @@ Author: Stephen Kitt <st...@sk2.org>
if(subcon_tb != subcon_wc)
{
+--- mednafen.orig/configure.ac
++++ mednafen/configure.ac
+@@ -58,7 +58,7 @@
+ else
+ AC_PATH_X
+ CFLAGS="-I${x_includes} ${CFLAGS}"
+- CPPFLAGS="-I${x_includes} ${CFLAGS}"
++ CPPFLAGS="-I${x_includes} ${CPPFLAGS}"
+
+ AC_CHECK_HEADER([GL/gl.h],HAVE_GL_GL_H=true, HAVE_GL_GL_H=false)
+
+@@ -359,7 +359,7 @@
+ CFLAGS_SDLNET_BACK="$CFLAGS"
+ CPPFLAGS_SDLNET_BACK="$CPPFLAGS"
+ CFLAGS="$CFLAGS $SDL_CFLAGS"
+-CPPFLAGS="$CFLAGS $SDL_CFLAGS"
++CPPFLAGS="$CPPFLAGS $SDL_CFLAGS"
+ AC_CHECK_HEADER([SDL_net.h],[], [HAS_SDL_NET=no])
+ if test x$HAS_SDL_NET = xno; then
+ AC_MSG_ERROR([*** SDL_net not found!])
+@@ -393,7 +393,7 @@
+ AX_CFLAGS_GCC_OPTION([-maltivec], ALTIVEC_FLAGS)
+ if test "x$ALTIVEC_FLAGS" != "x"; then
+ CFLAGS="$CFLAGS $ALTIVEC_FLAGS"
+- CPPFLAGS="$CFLAGS $ALTIVEC_FLAGS"
++ CPPFLAGS="$CPPFLAGS $ALTIVEC_FLAGS"
+ AC_DEFINE([ARCH_POWERPC_ALTIVEC], [1], [Define if we
are compiling with AltiVec usage.])
+ AM_CONDITIONAL(ARCH_POWERPC_ALTIVEC, true)
+ fi
--
multi-platform emulator, including NES, GB/A, Lynx, PC Engine
_______________________________________________
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
