This is an automated email from the git hooks/post-receive script. ecsv-guest pushed a commit to branch master in repository mupen64plus.
commit 45a541c74dcee88f5b5adf6b4bc6ce297c639926 Author: Sven Eckelmann <[email protected]> Date: Tue Sep 1 18:14:08 2009 +0200 Define CHECK_MEM for non-x86 systems to prevent FTBFS --- debian/changelog | 2 ++ debian/patches/118-ftbfs-debugger.patch | 30 ++++++++++++++++++++++++++++++ debian/patches/series | 1 + 3 files changed, 33 insertions(+) diff --git a/debian/changelog b/debian/changelog index 361ee60..dc78e6d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,6 +9,8 @@ mupen64plus (1.5+dfsg1-2) UNRELEASED; urgency=low without dynarec support (Closes: #544548) - Add 117-ftbfs-kfreebsd.patch, Don't stop compilation due to unknown OS kFreeBSD (Closes: #544550) + - Add 118-ftbfs-debugger.patch, Define CHECK_MEM for non-x86 systems to + prevent FTBFS on non-x86 systems (Closes: #544549) * debian/control: - Depend on libxdg-basedir-dev and pkg-config to support xdg-basedir specification diff --git a/debian/patches/118-ftbfs-debugger.patch b/debian/patches/118-ftbfs-debugger.patch new file mode 100644 index 0000000..ee68187 --- /dev/null +++ b/debian/patches/118-ftbfs-debugger.patch @@ -0,0 +1,30 @@ +From be17fe56f5f4b713c07daf577169640beef7da6a Mon Sep 17 00:00:00 2001 +From: Sven Eckelmann <[email protected]> +Date: Tue, 1 Sep 2009 18:05:02 +0200 +Subject: [PATCH] Define CHECK_MEM for non-x86 systems + +The debugger checks for valid memory for dynarec. In case of architectures +without dynarec support it should skip this check. The needed macro +is not defined, but can be replaced with an empty check. + +Signed-off-by: Sven Eckelmann <[email protected]> +--- + debugger/memory.c | 2 ++ + 1 files changed, 2 insertions(+), 0 deletions(-) + +diff --git a/debugger/memory.c b/debugger/memory.c +index d6c049d..b462766 100644 +--- a/debugger/memory.c ++++ b/debugger/memory.c +@@ -210,6 +210,8 @@ int get_has_recompiled(uint32 addr) + + #else + ++#define CHECK_MEM(address) ++ + char* get_recompiled(uint32 addr, int index) + { + return NULL; +-- +1.6.3.3 + diff --git a/debian/patches/series b/debian/patches/series index 80c7cfb..bd8c50e 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -16,3 +16,4 @@ 115-xdg-basedir.patch 116-ftbfs-dynarec.patch 117-ftbfs-kfreebsd.patch +118-ftbfs-debugger.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/mupen64plus.git _______________________________________________ Pkg-games-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
