patches/sdl-mixer-01-cflags.diff
author yippi
Fri, 05 Mar 2010 23:57:55 +0000
changeset 2360 79c86e4af74c
parent 298 a29147abc9dd
child 8692 a44179243838
permissions -rw-r--r--
2010-03-05 Brian Cameron <[email protected]> * SFEsdl-mixer.spec, base-specs/sdl-mixer.spec, patches/sdl-mixer-01-cflags.diff: Bump to 1.2.11, rework patch. * SFEsdl-image.spec: Add %ifarch around install of arch specific pkgconfig files. * SFEmenu-cache.spec: Bump to 0.3.2. * SFElxterminal.spec: Bump to 0.1.7. * SFElxpanel.spec: Bump to 0.5.5. * patches/lxsession-02-fixcrash.diff: Fix additional crashing issue. * base-specs/abiword.spec: * SFEaspell.spec: Add -xannotate=no to CXXFLAGS and CFLAGS to address doo bug #9720 & bugster #6823945/#6865312. * base-specs/aspell.spec: Add "-I ./m4" to aclocal call, and do not reset CFLAGS. * base-specs/boost.spec: Add "-d+2 -q" to the call to bjam for better debug output. With this option the specific compile/link commands are echoed to the log which makes debugging build problems more simple. The -q option makes the build stop immediately if the build fails rather than continuing the build and finding out about the failure at the end.

--- SDL_mixer-1.2.11/Makefile.in-orig	2010-03-05 06:45:22.451925678 -0600
+++ SLD_mixer-1.2.11/Makefile.in	2010-03-05 06:45:44.741189765 -0600
@@ -72,13 +72,13 @@ $(objects):
 @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) -o $@ $(OBJECTS) $(VERSION_OBJECTS) $(LDFLAGS) $(EXTRA_LDFLAGS) $(LT_LDFLAGS)
 
 $(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) -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) -o $@ $(objects)/playmus.lo $(SDL_CFLAGS) $(SDL_LIBS) $(objects)/$(TARGET)
 
 install: all install-hdrs install-lib #install-bin
 install-hdrs: