[mame] 01/01: Add x32.patch: fix builds on x32.

[Jordi Mallach]

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

jordi pushed a commit to branch master
in repository mame.

commit 16b000d8a19a1b42540238b0f647758dec872c52
Author: Jordi Mallach <jordi at debian.org>
Date:   Thu Jul 28 12:55:39 2016 +0200

    Add x32.patch: fix builds on x32.
    
    Fix incorrect detection of 64 bit architecture in rapidjson, adding
    a check for __x86_64__ && __ILP32__, to fix a build error on x32.
---
 debian/changelog         |  3 +++
 debian/patches/series    |  1 +
 debian/patches/x32.patch | 13 +++++++++++++
 3 files changed, 17 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 927bd91..c9a71ea 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,9 @@ mame (0.176-3) UNRELEASED; urgency=medium
 
   * Drop Build-Depends on subversion, nothing uses it these days, and it
     was actually only necessary for get-orig-source target.
+  * Add x32.patch: fix incorrect detection of 64 bit architecture in
+    rapidjson, adding a check for __x86_64__ && __ILP32__, to fix a
+    build error on x32.
 
  -- Jordi Mallach <jordi at debian.org>  Thu, 28 Jul 2016 09:59:03 +0200
 
diff --git a/debian/patches/series b/debian/patches/series
index a465bdc..5a59ce8 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 genie_freebsd_target.patch
 hurd.patch
+x32.patch
diff --git a/debian/patches/x32.patch b/debian/patches/x32.patch
new file mode 100644
index 0000000..ed9567b
--- /dev/null
+++ b/debian/patches/x32.patch
@@ -0,0 +1,13 @@
+Index: mame-0.176/3rdparty/rapidjson/include/rapidjson/rapidjson.h
+===================================================================
+--- mame-0.176.orig/3rdparty/rapidjson/include/rapidjson/rapidjson.h
++++ mame-0.176/3rdparty/rapidjson/include/rapidjson/rapidjson.h
+@@ -250,7 +250,7 @@
+ 
+ //! Whether using 64-bit architecture
+ #ifndef RAPIDJSON_64BIT
+-#if defined(__LP64__) || defined(_WIN64) || defined(__EMSCRIPTEN__)
++#if defined(__LP64__) || (defined(__x86_64__) && defined(__ILP32__)) || defined(_WIN64) || defined(__EMSCRIPTEN__)
+ #define RAPIDJSON_64BIT 1
+ #else
+ #define RAPIDJSON_64BIT 0

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