[mupen64plus-core] 162/310: Disable the disassembler of the recompiled code

[Sven Eckelmann]

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

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

commit 9ea73a5118af6f463bdc208b1d5b11dd3cf0b647
Author: Sven Eckelmann <sven at narfation.org>
Date:   Mon May 28 14:14:12 2012 +0200

    Disable the disassembler of the recompiled code
    
    The interface of libopcode.so and libbfd.so is not stable and therefore not
    allowed to use in Debian. The libopcode.a and libbfd.a don't provide PIC object
    files and therefore cannot be linked to the PIC shared object.
    
    This part of the debugging interface can be disabled because their is no known
    user interface that has support for it.
---
 debian/changelog                                   |  2 ++
 debian/control                                     |  1 -
 .../patches/disable_recompiler_disassembler.patch  | 36 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 4 files changed, 39 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index aa366d0..d91c702 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ mupen64plus-core (1.99.5-5) UNRELEASED; urgency=low
   * debian/patches:
     - Add debugger_api.patch, Move breakpoint typedef and BPT_* macros to api
       headers
+    - Add disable_recompiler_disassembler.patch, Disable the disassembler of the
+      recompiled code
   * Enable debugger interface of the core
 
  -- Sven Eckelmann <sven at narfation.org>  Sun, 20 May 2012 19:55:40 +0200
diff --git a/debian/control b/debian/control
index 1a2e1b7..91eaff6 100644
--- a/debian/control
+++ b/debian/control
@@ -9,7 +9,6 @@ Homepage: http://code.google.com/p/mupen64plus/
 Vcs-Git: git://anonscm.debian.org/collab-maint/mupen64plus-core.git
 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=collab-maint/mupen64plus-core.git
 Build-Depends:
- binutils-dev,
  debhelper (>= 9),
  dpkg-dev (>= 1.16.1.1),
  libfreetype6-dev,
diff --git a/debian/patches/disable_recompiler_disassembler.patch b/debian/patches/disable_recompiler_disassembler.patch
new file mode 100644
index 0000000..340410f
--- /dev/null
+++ b/debian/patches/disable_recompiler_disassembler.patch
@@ -0,0 +1,36 @@
+Description: Disable the disassembler of the recompiled code
+ The interface of libopcode.so and libbfd.so is not stable and therefore not
+ allowed to use in Debian. The libopcode.a and libbfd.a don't provide PIC
+ object files and therefore cannot be linked to the PIC shared object.
+ .
+ This part of the debugging interface can be disabled because their is no known
+ user interface that has support for it.
+Author: Sven Eckelmann <sven at narfation.org>
+
+---
+diff --git a/projects/unix/Makefile b/projects/unix/Makefile
+index 919355785628c10cdcf6ffc6787f882279db69af..3a5f5497280d92ab86f15706e2ae057da94d34a3 100644
+--- a/projects/unix/Makefile
++++ b/projects/unix/Makefile
+@@ -376,7 +376,7 @@ ifeq ($(DEBUGGER), 1)
+ 	$(SRCDIR)/debugger/dbg_decoder.c \
+ 	$(SRCDIR)/debugger/dbg_memory.c \
+ 	$(SRCDIR)/debugger/dbg_breakpoints.c
+-  LDLIBS += -lopcodes -lbfd
++#  LDLIBS += -lopcodes -lbfd
+ endif
+ 
+ # generate a list of object files to build, make a temporary directory for them
+diff --git a/src/debugger/dbg_memory.c b/src/debugger/dbg_memory.c
+index 5925daa78119c6b7892a238eb203d2517d140178..ef2f16375d735291370900cddec9549df4e01e8c 100644
+--- a/src/debugger/dbg_memory.c
++++ b/src/debugger/dbg_memory.c
+@@ -33,7 +33,7 @@
+ #include "r4300/ops.h"
+ #include "main/rom.h"
+ 
+-#if !defined(NO_ASM) && (defined(__i386__) || defined(__x86_64__))
++#if !defined(NO_ASM) && (defined(__i386__) || defined(__x86_64__)) && 0
+ 
+ #include <dis-asm.h>
+ #include <stdarg.h>
diff --git a/debian/patches/series b/debian/patches/series
index 345f607..6dc05b7 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,3 +4,4 @@ floatingpoint_config.patch
 debugger_memory_breakpoints.patch
 rjump_gcc47.patch
 debugger_api.patch
+disable_recompiler_disassembler.patch

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