Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: "Michael Sterrett (mr_bones_)" <mr_bones_@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in media-libs/sdl-mixer/files: sdl-mixer-1.2.11-multilib.patch
Date: Sat, 30 Jul 2011 17:03:38
Message-Id: 20110730170327.41F9F2004B@flycatcher.gentoo.org
1 mr_bones_ 11/07/30 17:03:27
2
3 Added: sdl-mixer-1.2.11-multilib.patch
4 Log:
5 add multilib patch from Nathan Phillip (bug #376717
6
7 (Portage version: 2.1.10.3/cvs/Linux i686)
8
9 Revision Changes Path
10 1.1 media-libs/sdl-mixer/files/sdl-mixer-1.2.11-multilib.patch
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/sdl-mixer/files/sdl-mixer-1.2.11-multilib.patch?rev=1.1&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/sdl-mixer/files/sdl-mixer-1.2.11-multilib.patch?rev=1.1&content-type=text/plain
14
15 Index: sdl-mixer-1.2.11-multilib.patch
16 ===================================================================
17 From: Nathan Phillip Brink <binki@g.o>
18 Date: 2011-07-28
19 Subject: Fix linking to respect CFLAGS and LDFLAGS properly, fixing a
20 compilation bug (https://bugs.gentoo.org/376717) on
21 portage-multilib.
22
23 --- a/Makefile.in
24 +++ b/Makefile.in
25 @@ -72,13 +72,13 @@
26 @PLAYMUS_DEPENDS@
27
28 $(objects)/$(TARGET): $(OBJECTS) $(VERSION_OBJECTS)
29 - $(LIBTOOL) --mode=link $(CC) -o $@ $(OBJECTS) $(VERSION_OBJECTS) $(LDFLAGS) $(EXTRA_LDFLAGS) $(LT_LDFLAGS)
30 + $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) $(EXTRA_LDFLAGS) $(LT_LDFLAGS) -o $@ $(OBJECTS) $(VERSION_OBJECTS)
31
32 $(objects)/playwave$(EXE): $(objects)/playwave.lo $(objects)/$(TARGET)
33 - $(LIBTOOL) --mode=link $(CC) -o $@ $(objects)/playwave.lo $(SDL_CFLAGS) $(SDL_LIBS) $(objects)/$(TARGET)
34 + $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(objects)/playwave.lo $(SDL_CFLAGS) $(SDL_LIBS) $(objects)/$(TARGET)
35
36 $(objects)/playmus$(EXE): $(objects)/playmus.lo $(objects)/$(TARGET)
37 - $(LIBTOOL) --mode=link $(CC) -o $@ $(objects)/playmus.lo $(SDL_CFLAGS) $(SDL_LIBS) $(objects)/$(TARGET)
38 + $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(objects)/playmus.lo $(SDL_CFLAGS) $(SDL_LIBS) $(objects)/$(TARGET)
39
40 install: all install-hdrs install-lib #install-bin
41 install-hdrs:
Report Message
Find on MARC Find on Google Groups