From: Michael Sterrett <mr_bones_@gentoo.org>
Date: Sat, 30 Jul 2011 17:03:27 +0000 (+0000)
Subject: add multilib patch from Nathan Phillip (bug #376717
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=2373006b1ca31aeee6f1bae5db8a26eb53f909a8;p=gentoo.git

add multilib patch from Nathan Phillip (bug #376717

Package-Manager: portage-2.1.10.3/cvs/Linux i686
---

diff --git a/media-libs/sdl-mixer/ChangeLog b/media-libs/sdl-mixer/ChangeLog
index fdec5387bcff..04638ba03947 100644
--- a/media-libs/sdl-mixer/ChangeLog
+++ b/media-libs/sdl-mixer/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/sdl-mixer
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/sdl-mixer/ChangeLog,v 1.81 2010/07/27 05:25:15 mr_bones_ Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/sdl-mixer/ChangeLog,v 1.82 2011/07/30 17:03:27 mr_bones_ Exp $
+
+  30 Jul 2011; Michael Sterrett <mr_bones_@gentoo.org>
+  sdl-mixer-1.2.11-r1.ebuild, +files/sdl-mixer-1.2.11-multilib.patch:
+  add multilib patch from Nathan Phillip (bug #376717)
 
   27 Jul 2010; Michael Sterrett <mr_bones_@gentoo.org>
   sdl-mixer-1.2.11-r1.ebuild:
diff --git a/media-libs/sdl-mixer/Manifest b/media-libs/sdl-mixer/Manifest
index d4296e70d599..2fed18d68f6d 100644
--- a/media-libs/sdl-mixer/Manifest
+++ b/media-libs/sdl-mixer/Manifest
@@ -1,4 +1,5 @@
+AUX sdl-mixer-1.2.11-multilib.patch 1247 RMD160 76f4d4c32bcfd1367dda5e82816d5adc7ff9c1f4 SHA1 05fc2f40e177fd92c27f67a7661f273efca53169 SHA256 76ab56747d29bdae932394f8e501ce22f470096268e0b8cc63ea4335c837976c
 DIST SDL_mixer-1.2.11.tar.gz 2690654 RMD160 559355116a1c380edf71879da0dbcf5359f05476 SHA1 ef5d45160babeb51eafa7e4019cec38324ee1a5d SHA256 86145ac39cac6d2c6169c226f937648dca5e89dcd828751763dd174fa9af9cf9
-EBUILD sdl-mixer-1.2.11-r1.ebuild 1786 RMD160 e9743ee52c44cb62b9697cac0b7448490bb54c33 SHA1 7aca127ac070acf5d43923f0baeb67c24964bb5b SHA256 814ccfa18140f578aa0fcd061800b3e3037c5adbce7b330ecf011a5069552001
-MISC ChangeLog 10649 RMD160 0ab6a1d72a0f0b4353e3c23829f186bc3fa5e533 SHA1 c4dfb8ccd4a5bf67d10013eb28eab0b4978ba73c SHA256 fb79599e3f74b8398216691d2e764e9f8fcb90a2c7ee3f5ee95be9e661fd8c78
+EBUILD sdl-mixer-1.2.11-r1.ebuild 1847 RMD160 98a4abad83291643c1ff5d2d486c4ab5840d78ab SHA1 8711935a082443166bd5a98dc48abaa564a6923d SHA256 aa2bd4f12ba0d4a4cd1661b0e5ec64158ac4471e59cbd1b63d08978fa26c5f48
+MISC ChangeLog 10830 RMD160 f102abe91375c0bee47bd10da124deee29306b7d SHA1 f468789f30153025e9ff6287271ce0a30ea08519 SHA256 2914c007c213783071a17b017856e3db32cc88c3b5f3555ccd77c1816741e4f9
 MISC metadata.xml 270 RMD160 bfb5537139a9b462e73d53be68abf4ebdf32e075 SHA1 9b403bbea2ff8d5777fad870df9aa8607f65c9a7 SHA256 289953d2114ffe3867a3783062fcfbc3d0fa638dd223e8f827c2480cc9db9b72
diff --git a/media-libs/sdl-mixer/files/sdl-mixer-1.2.11-multilib.patch b/media-libs/sdl-mixer/files/sdl-mixer-1.2.11-multilib.patch
new file mode 100644
index 000000000000..2e6d6d5ceb63
--- /dev/null
+++ b/media-libs/sdl-mixer/files/sdl-mixer-1.2.11-multilib.patch
@@ -0,0 +1,25 @@
+From: Nathan Phillip Brink <binki@gentoo.org>
+Date: 2011-07-28
+Subject: Fix linking to respect CFLAGS and LDFLAGS properly, fixing a
+	compilation bug (https://bugs.gentoo.org/376717) on
+	portage-multilib.
+
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -72,13 +72,13 @@
+ @PLAYMUS_DEPENDS@
+ 
+ $(objects)/$(TARGET): $(OBJECTS) $(VERSION_OBJECTS)
+-	$(LIBTOOL) --mode=link $(CC) -o $@ $(OBJECTS) $(VERSION_OBJECTS) $(LDFLAGS) $(EXTRA_LDFLAGS) $(LT_LDFLAGS)
++	$(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) $(EXTRA_LDFLAGS) $(LT_LDFLAGS) -o $@ $(OBJECTS) $(VERSION_OBJECTS)
+ 
+ $(objects)/playwave$(EXE): $(objects)/playwave.lo $(objects)/$(TARGET)
+-	$(LIBTOOL) --mode=link $(CC) -o $@ $(objects)/playwave.lo $(SDL_CFLAGS) $(SDL_LIBS) $(objects)/$(TARGET)
++	$(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(objects)/playwave.lo $(SDL_CFLAGS) $(SDL_LIBS) $(objects)/$(TARGET)
+ 
+ $(objects)/playmus$(EXE): $(objects)/playmus.lo $(objects)/$(TARGET)
+-	$(LIBTOOL) --mode=link $(CC) -o $@ $(objects)/playmus.lo $(SDL_CFLAGS) $(SDL_LIBS) $(objects)/$(TARGET)
++	$(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(objects)/playmus.lo $(SDL_CFLAGS) $(SDL_LIBS) $(objects)/$(TARGET)
+ 
+ install: all install-hdrs install-lib #install-bin
+ install-hdrs:
diff --git a/media-libs/sdl-mixer/sdl-mixer-1.2.11-r1.ebuild b/media-libs/sdl-mixer/sdl-mixer-1.2.11-r1.ebuild
index 231e56af96be..9f854d5a8553 100644
--- a/media-libs/sdl-mixer/sdl-mixer-1.2.11-r1.ebuild
+++ b/media-libs/sdl-mixer/sdl-mixer-1.2.11-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/sdl-mixer/sdl-mixer-1.2.11-r1.ebuild,v 1.8 2010/07/27 05:25:15 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/sdl-mixer/sdl-mixer-1.2.11-r1.ebuild,v 1.9 2011/07/30 17:03:27 mr_bones_ Exp $
 
 EAPI=2
 inherit eutils
@@ -25,6 +25,10 @@ DEPEND=">=media-libs/libsdl-1.2.10
 
 S=${WORKDIR}/${MY_P}
 
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-multilib.patch
+}
+
 src_configure() {
 	econf \
 		--disable-dependency-tracking \