diff options
| author | Michael Olbrich <m.olbrich@pengutronix.de> | 2011-11-01 15:31:10 +0100 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2011-11-01 15:31:10 +0100 |
| commit | 35f5af714dd987d4420e8f36b73bee851975c9cf (patch) | |
| tree | e3e693016f97d8b910a8ebae354b31c320bba83d /patches/SDL_mixer-1.2.11/0001-fix-parallel-build.patch | |
| parent | 53d6ddad7d054c1f0303591c3e6663b2b084d3ce (diff) | |
| download | ptxdist-35f5af714dd987d4420e8f36b73bee851975c9cf.tar.gz ptxdist-35f5af714dd987d4420e8f36b73bee851975c9cf.tar.xz | |
sdl-mixer: clean up patches
Based on a patch by Robert Schwebel <r.schwebel@pengutronix.de>
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'patches/SDL_mixer-1.2.11/0001-fix-parallel-build.patch')
| -rw-r--r-- | patches/SDL_mixer-1.2.11/0001-fix-parallel-build.patch | 48 |
1 files changed, 48 insertions, 0 deletions
diff --git a/patches/SDL_mixer-1.2.11/0001-fix-parallel-build.patch b/patches/SDL_mixer-1.2.11/0001-fix-parallel-build.patch new file mode 100644 index 000000000..99bb837e3 --- /dev/null +++ b/patches/SDL_mixer-1.2.11/0001-fix-parallel-build.patch @@ -0,0 +1,48 @@ +From: Marc Kleine-Budde <mkl@pengutronix.de> +Date: Sat, 29 Oct 2011 18:51:39 +0200 +Subject: [PATCH] fix parallel build + +We have to create the objects dir before saving gcc's output into it. + +Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de> +Signed-off-by: Robert Schwebel <rsc@pengutronix.de> +--- +V2: + rsc: ported to 1.2.11 + +V1: + mkl: patch for 1.2.8 + + Makefile.in | 8 ++++---- + 1 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/Makefile.in b/Makefile.in +index 76fdd3c..26961b7 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -71,13 +71,13 @@ $(objects): + -include $(PLAYMUS_OBJECTS:.lo=.d) + @PLAYMUS_DEPENDS@ + +-$(objects)/$(TARGET): $(OBJECTS) $(VERSION_OBJECTS) ++$(objects)/$(TARGET): $(OBJECTS) $(VERSION_OBJECTS) $(objects) + $(LIBTOOL) --mode=link $(CC) -o $@ $(OBJECTS) $(VERSION_OBJECTS) $(LDFLAGS) $(EXTRA_LDFLAGS) $(LT_LDFLAGS) + +-$(objects)/playwave$(EXE): $(objects)/playwave.lo $(objects)/$(TARGET) ++$(objects)/playwave$(EXE): $(objects)/playwave.lo $(objects)/$(TARGET) $(objects) + $(LIBTOOL) --mode=link $(CC) -o $@ $(objects)/playwave.lo $(SDL_CFLAGS) $(SDL_LIBS) $(objects)/$(TARGET) + +-$(objects)/playmus$(EXE): $(objects)/playmus.lo $(objects)/$(TARGET) ++$(objects)/playmus$(EXE): $(objects)/playmus.lo $(objects)/$(TARGET) $(objects) + $(LIBTOOL) --mode=link $(CC) -o $@ $(objects)/playmus.lo $(SDL_CFLAGS) $(SDL_LIBS) $(objects)/$(TARGET) + + install: all install-hdrs install-lib #install-bin +@@ -92,7 +92,7 @@ install-hdrs: + install-lib: $(objects) $(objects)/$(TARGET) + $(SHELL) $(auxdir)/mkinstalldirs $(libdir) + $(LIBTOOL) --mode=install $(INSTALL) $(objects)/$(TARGET) $(libdir)/$(TARGET) +-install-bin: ++install-bin: $(objects) + $(SHELL) $(auxdir)/mkinstalldirs $(bindir) + $(LIBTOOL) --mode=install $(INSTALL) -m 755 $(objects)/playwave$(EXE) $(bindir)/playwave$(EXE) + $(LIBTOOL) --mode=install $(INSTALL) -m 755 $(objects)/playmus$(EXE) $(bindir)/playmus$(EXE) |