summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlfredo Tupone <tupone@gentoo.org>2011-07-13 06:55:27 +0000
committerAlfredo Tupone <tupone@gentoo.org>2011-07-13 06:55:27 +0000
commitaa7df239850a95b00729f9fcf805ae99626dbd65 (patch)
treeb6822d3c010918a4ed2a970807222d6278dc9236 /games-emulation/mupen64plus
parentAdd fix from upstream for other half of ldso breakage #374107 by Juergen Rose. (diff)
downloadgentoo-2-aa7df239850a95b00729f9fcf805ae99626dbd65.tar.gz
gentoo-2-aa7df239850a95b00729f9fcf805ae99626dbd65.tar.bz2
gentoo-2-aa7df239850a95b00729f9fcf805ae99626dbd65.zip
Better fix of Bug #363317 from upstream.
(Portage version: 2.1.10.4/cvs/Linux i686)
Diffstat (limited to 'games-emulation/mupen64plus')
-rw-r--r--games-emulation/mupen64plus/ChangeLog6
-rw-r--r--games-emulation/mupen64plus/files/mupen64plus-1.5-gcc46.patch2
2 files changed, 6 insertions, 2 deletions
diff --git a/games-emulation/mupen64plus/ChangeLog b/games-emulation/mupen64plus/ChangeLog
index fa8158836052..4ed7aac33651 100644
--- a/games-emulation/mupen64plus/ChangeLog
+++ b/games-emulation/mupen64plus/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for games-emulation/mupen64plus
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/mupen64plus/ChangeLog,v 1.13 2011/04/15 11:45:26 tupone Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/mupen64plus/ChangeLog,v 1.14 2011/07/13 06:55:27 tupone Exp $
+
+ 13 Jul 2011; Tupone Alfredo <tupone@gentoo.org>
+ files/mupen64plus-1.5-gcc46.patch:
+ Better fix of Bug #363317 from upstream.
15 Apr 2011; Alfredo Tupone <tupone@gentoo.org> mupen64plus-1.5-r2.ebuild,
+files/mupen64plus-1.5-gcc46.patch:
diff --git a/games-emulation/mupen64plus/files/mupen64plus-1.5-gcc46.patch b/games-emulation/mupen64plus/files/mupen64plus-1.5-gcc46.patch
index 0461eee7fbed..2608fcd32a77 100644
--- a/games-emulation/mupen64plus/files/mupen64plus-1.5-gcc46.patch
+++ b/games-emulation/mupen64plus/files/mupen64plus-1.5-gcc46.patch
@@ -5,7 +5,7 @@
ifeq ($(ARCH), 64BITS_32)
CFLAGS += -m32
- LDFLAGS += -m32 -m elf_i386
-+ LDFLAGS += -Wl,-m32 -Wl,-m,elf_i386
++ LDFLAGS += -m32 -Wl,-m,elf_i386
endif
endif
ifeq ($(CPU_ENDIANNESS), BIG)