[mupen64plus] 102/262: Don't try to compile dynarec on architectures without dynarec support

[Sven Eckelmann]

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

ecsv-guest pushed a commit to branch master
in repository mupen64plus.

commit ea1751716f5e74e4511023222d2330db0b8bd898
Author: Sven Eckelmann <sven.eckelmann at gmx.de>
Date:   Tue Sep 1 14:19:33 2009 +0200

    Don't try to compile dynarec on architectures without dynarec support
---
 debian/changelog                       |  3 ++
 debian/patches/117-ftbfs-dynarec.patch | 60 ++++++++++++++++++++++++++++++++++
 debian/patches/series                  |  1 +
 3 files changed, 64 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index fa7f1ba..42c5d3a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,12 +7,15 @@ mupen64plus (1.5+dfsg1-2) UNRELEASED; urgency=low
       archive with subfolders
     - Add 116-xdg-basedir.patch, Use "XDG Base Directory" compliant directories
       for files for each user (Closes: #544428)
+    - Add 117-ftbfs-dynarec.patch, Don't try to compile dynarec on architectures
+      without dynarec support (Closes: #544548)
   * debian/control:
     - Depend on liblzma-dev and pkg-config for lzma and xz support
     - Depend on libxdg-basedir-dev to support xdg-basedir standard
   * Add README.source with informations about patch management
   * Add NEWS.Debian with information about migration of old data and
     configuration to new xdg compliant directories
+  * 
 
  -- Sven Eckelmann <sven.eckelmann at gmx.de>  Tue, 25 Aug 2009 15:21:33 +0200
 
diff --git a/debian/patches/117-ftbfs-dynarec.patch b/debian/patches/117-ftbfs-dynarec.patch
new file mode 100644
index 0000000..cd2d0cd
--- /dev/null
+++ b/debian/patches/117-ftbfs-dynarec.patch
@@ -0,0 +1,60 @@
+From 640af01e873cab03a811c37bc3b2a247bb5f12b4 Mon Sep 17 00:00:00 2001
+From: Sven Eckelmann <sven.eckelmann at gmx.de>
+Date: Tue, 1 Sep 2009 14:14:53 +0200
+Subject: [PATCH] Don't try to compile dynarec with not unknown dynarec architecture
+
+If we cannot find a valid architecture for dynarec we shouldn't try
+to build the needed object files which are architecture dependend.
+
+Signed-off-by: Sven Eckelmann <sven.eckelmann at gmx.de>
+---
+ Makefile |   32 +++++++++++++++++---------------
+ 1 files changed, 17 insertions(+), 15 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 76c6489..cdf6380 100644
+--- a/Makefile
++++ b/Makefile
+@@ -154,22 +154,24 @@ ifneq ($(NO_ASM), 1)
+       DYNAREC = x86
+     endif
+   endif
++endif
++ifneq ($(DYNAREC), )
+   OBJ_DYNAREC = \
+-      r4300/$(DYNAREC)/assemble.o \
+-      r4300/$(DYNAREC)/debug.o \
+-      r4300/$(DYNAREC)/gbc.o \
+-      r4300/$(DYNAREC)/gcop0.o \
+-      r4300/$(DYNAREC)/gcop1.o \
+-      r4300/$(DYNAREC)/gcop1_d.o \
+-      r4300/$(DYNAREC)/gcop1_l.o \
+-      r4300/$(DYNAREC)/gcop1_s.o \
+-      r4300/$(DYNAREC)/gcop1_w.o \
+-      r4300/$(DYNAREC)/gr4300.o \
+-      r4300/$(DYNAREC)/gregimm.o \
+-      r4300/$(DYNAREC)/gspecial.o \
+-      r4300/$(DYNAREC)/gtlb.o \
+-      r4300/$(DYNAREC)/regcache.o \
+-      r4300/$(DYNAREC)/rjump.o
++    r4300/$(DYNAREC)/assemble.o \
++    r4300/$(DYNAREC)/debug.o \
++    r4300/$(DYNAREC)/gbc.o \
++    r4300/$(DYNAREC)/gcop0.o \
++    r4300/$(DYNAREC)/gcop1.o \
++    r4300/$(DYNAREC)/gcop1_d.o \
++    r4300/$(DYNAREC)/gcop1_l.o \
++    r4300/$(DYNAREC)/gcop1_s.o \
++    r4300/$(DYNAREC)/gcop1_w.o \
++    r4300/$(DYNAREC)/gr4300.o \
++    r4300/$(DYNAREC)/gregimm.o \
++    r4300/$(DYNAREC)/gspecial.o \
++    r4300/$(DYNAREC)/gtlb.o \
++    r4300/$(DYNAREC)/regcache.o \
++    r4300/$(DYNAREC)/rjump.o
+ else
+   OBJ_DYNAREC = r4300/empty_dynarec.o
+ endif
+-- 
+1.6.3.3
+
diff --git a/debian/patches/series b/debian/patches/series
index db8cf3d..6de220e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -15,3 +15,4 @@
 114-system-liblzma.patch
 115-fix-7z-subfolder.patch
 116-xdg-basedir.patch
+117-ftbfs-dynarec.patch

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