[mupen64plus] 93/262: Link static against binutils libraries with unstable abi

[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 0ebf23381e32eb66649b437753b9b6b7a03ba2d7
Author: Sven Eckelmann <sven.eckelmann at gmx.de>
Date:   Sat Aug 15 13:03:46 2009 +0200

    Link static against binutils libraries with unstable abi
---
 debian/changelog                              |  4 ++-
 debian/patches/113-static-binutils-libs.patch | 41 +++++++++++++++++++++++++++
 debian/patches/series                         |  1 +
 3 files changed, 45 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 54c93e6..05b2c73 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -20,5 +20,7 @@ mupen64plus (1.5+dfsg1-1) unstable; urgency=low
       from texturepacks with rice_video
     - Add 112-rice-screenflickering.patch, Reduce screenflickering in some games
       when using rice_video
+    - Add 113-static-binutils-libs.patch, Link static against binutils libraries
+      with unstable abi
 
- -- Sven Eckelmann <sven.eckelmann at gmx.de>  Tue, 11 Aug 2009 16:08:32 +0200
+ -- Sven Eckelmann <sven.eckelmann at gmx.de>  Sat, 15 Aug 2009 13:02:55 +0200
diff --git a/debian/patches/113-static-binutils-libs.patch b/debian/patches/113-static-binutils-libs.patch
new file mode 100644
index 0000000..60068e8
--- /dev/null
+++ b/debian/patches/113-static-binutils-libs.patch
@@ -0,0 +1,41 @@
+From ff9d00b51fa348a5ddca5fa74f1d15b310aa7142 Mon Sep 17 00:00:00 2001
+From: Sven Eckelmann <sven.eckelmann at gmx.de>
+Date: Sat, 15 Aug 2009 13:00:52 +0200
+Subject: [PATCH] Link binutils libraries with unstable abi as static library
+
+
+Signed-off-by: Sven Eckelmann <sven.eckelmann at gmx.de>
+---
+ Makefile |    5 +++--
+ 1 files changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 4926931..be81163 100644
+--- a/Makefile
++++ b/Makefile
+@@ -238,11 +238,12 @@ SHARE = $(shell grep CONFIG_PATH config.h | cut -d '"' -f 2)
+ ALL = mupen64plus $(PLUGINS)
+ OBJECTS = $(OBJ_CORE) $(OBJ_DYNAREC) $(OBJ_OPENGL)
+ LIBS = $(SDL_LIBS) $(LIBGL_LIBS) -lbz2
++STATIC_LIBS =
+ 
+ # add extra objects and libraries for selected options
+ ifeq ($(DBG), 1)
+   OBJECTS +=  $(OBJ_DBG) $(OBJ_GTK_DBG_GUI)
+-  LIBS += -lopcodes -lbfd
++  STATIC_LIBS += /usr/lib/libopcodes.a
+ endif
+ ifeq ($(LIRC), 1)
+   OBJECTS += $(OBJ_LIRC)
+@@ -305,7 +306,7 @@ targets:
+ all: version.h $(ALL)
+ 
+ mupen64plus: $(MISC_DEPS) version.h $(OBJECTS)
+-	$(CXX) $(OBJECTS) $(LDFLAGS) $(CORE_LDFLAGS) $(LIBS) -o $@
++	$(CXX) $(OBJECTS) $(LDFLAGS) $(CORE_LDFLAGS) $(LIBS) -o $@ $(STATIC_LIBS)
+ ifneq ($(OS), WINDOWS)
+ 	$(STRIP) $@
+ endif
+-- 
+1.6.3.3
+
diff --git a/debian/patches/series b/debian/patches/series
index a4fa977..f5b37a4 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -11,3 +11,4 @@
 110-glide64-noasm.patch
 111-rice-texturepack-crash.patch
 112-rice-screenflickering.patch
+113-static-binutils-libs.patch

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