We are currently migrating Bugzilla to GitHub issues.
Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.
When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.

[patch] Build fix patch.

SDL_mixer.patch (text/plain), 3.50 KB, created by orbea on 2021-01-22 18:38:39 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: orbea

Created: 2021-01-22 18:38:39 UTC

Size: 3.50 KB

patch

obsolete

>    build: Fix parallel make.
>
>diff --git a/Makefile.in b/Makefile.in
>index 2df505e..2e39674 100644
>--- a/Makefile.in
>+++ b/Makefile.in
>@@ -46,7 +46,7 @@ LT_RELEASE  = @LT_RELEASE@
> LT_REVISION = @LT_REVISION@
> LT_LDFLAGS  = -no-undefined -rpath $(libdir) -release $(LT_RELEASE) -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
> 
>-all: $(srcdir)/configure Makefile $(objects) $(objects)/$(TARGET) $(objects)/playwave$(EXE) $(objects)/playmus$(EXE)
>+all: $(srcdir)/configure Makefile $(objects)/$(TARGET) $(objects)/playwave$(EXE) $(objects)/playmus$(EXE)
> 
> $(srcdir)/configure: $(srcdir)/configure.in
> 	@echo "Warning, configure is out of date, please re-run autogen.sh"
>@@ -54,8 +54,9 @@ $(srcdir)/configure: $(srcdir)/configure.in
> Makefile: $(srcdir)/Makefile.in
> 	$(SHELL) config.status $@
> 
>-$(objects):
>-	$(SHELL) $(auxdir)/mkinstalldirs $@
>+$(objects)/.created:
>+	$(SHELL) $(auxdir)/mkinstalldirs $(objects)
>+	touch $@
> 
> .PHONY: all install install-hdrs install-lib install-bin uninstall uninstall-hdrs uninstall-lib uninstall-bin clean distclean dist
> 
>diff --git a/configure b/configure
>index bc6ae58..4b4cbc7 100755
>--- a/configure
>+++ b/configure
>@@ -12956,14 +12956,14 @@ OBJECTS=`echo $SOURCES`
> DEPENDS=`echo $SOURCES`
> OBJECTS=`echo "$OBJECTS" | sed 's,[^ ]*/$[^ ]*$\.c,$(objects)/\1.lo,g'`
> DEPENDS=`echo "$DEPENDS" | sed 's,$[^ ]*$/$[^ ]*$\.c,\\
>-$(objects)/\2.lo: \1/\2.c\\
>+$(objects)/\2.lo: \1/\2.c \$(objects)/.created\\
> 	\$(LIBTOOL) --mode=compile \$(CC) \$(CFLAGS) \$(EXTRA_CFLAGS) '"$DEPENDENCY_TRACKING_OPTIONS"' -c \$< -o \$@,g'`
> 
> OBJECTS_CXX=`echo $SOURCES_CXX`
> DEPENDS_CXX=`echo $SOURCES_CXX`
> OBJECTS_CXX=`echo "$OBJECTS_CXX" | sed 's,[^ ]*/$[^ ]*$\.cpp,$(objects)/\1.lo,g'`
> DEPENDS_CXX=`echo "$DEPENDS_CXX" | sed 's,$[^ ]*$/$[^ ]*$\.cpp,\\
>-$(objects)/\2.lo: \1/\2.cpp\\
>+$(objects)/\2.lo: \1/\2.cpp \$(objects)/.created\\
> 	\$(LIBTOOL) --mode=compile \$(CXX) \$(CFLAGS) \$(EXTRA_CFLAGS) '"$DEPENDENCY_TRACKING_OPTIONS"' -c \$< -o \$@,g'`
> OBJECTS="$OBJECTS $OBJECTS_CXX"
> DEPENDS="$DEPENDS $DEPENDS_CXX"
>@@ -12973,7 +12973,7 @@ VERSION_OBJECTS=`echo $VERSION_SOURCES`
> VERSION_DEPENDS=`echo $VERSION_SOURCES`
> VERSION_OBJECTS=`echo "$VERSION_OBJECTS" | sed 's,[^ ]*/$[^ ]*$\.rc,$(objects)/\1.o,g'`
> VERSION_DEPENDS=`echo "$VERSION_DEPENDS" | sed 's,$[^ ]*$/$[^ ]*$\.rc,\\
>-$(objects)/\2.o: \1/\2.rc\\
>+$(objects)/\2.o: \1/\2.rc \$(objects)/.created\\
> 	\$(WINDRES) \$< \$@,g'`
> VERSION_DEPENDS=`echo "$VERSION_DEPENDS" | sed 's,\\$,\\\\$,g'`
> 
>@@ -12982,7 +12982,7 @@ PLAYWAVE_OBJECTS=`echo $PLAYWAVE_SOURCES`
> PLAYWAVE_DEPENDS=`echo $PLAYWAVE_SOURCES`
> PLAYWAVE_OBJECTS=`echo "$PLAYWAVE_OBJECTS" | sed 's,[^ ]*/$[^ ]*$\.c,$(objects)/\1.lo,g'`
> PLAYWAVE_DEPENDS=`echo "$PLAYWAVE_DEPENDS" | sed 's,$[^ ]*$/$[^ ]*$\.c,\\
>-$(objects)/\2.lo: \1/\2.c\\
>+$(objects)/\2.lo: \1/\2.c \$(objects)/.created\\
> 	\$(LIBTOOL) --mode=compile \$(CC) \$(CFLAGS) \$(EXTRA_CFLAGS) '"$DEPENDENCY_TRACKING_OPTIONS"' -c \$< -o \$@,g'`
> PLAYWAVE_DEPENDS=`echo "$PLAYWAVE_DEPENDS" | sed 's,\\$,\\\\$,g'`
> 
>@@ -12991,7 +12991,7 @@ PLAYMUS_OBJECTS=`echo $PLAYMUS_SOURCES`
> PLAYMUS_DEPENDS=`echo $PLAYMUS_SOURCES`
> PLAYMUS_OBJECTS=`echo "$PLAYMUS_OBJECTS" | sed 's,[^ ]*/$[^ ]*$\.c,$(objects)/\1.lo,g'`
> PLAYMUS_DEPENDS=`echo "$PLAYMUS_DEPENDS" | sed 's,$[^ ]*$/$[^ ]*$\.c,\\
>-$(objects)/\2.lo: \1/\2.c\\
>+$(objects)/\2.lo: \1/\2.c \$(objects)/.created\\
> 	\$(LIBTOOL) --mode=compile \$(CC) \$(CFLAGS) \$(EXTRA_CFLAGS) '"$DEPENDENCY_TRACKING_OPTIONS"' -c \$< -o \$@,g'`
> PLAYMUS_DEPENDS=`echo "$PLAYMUS_DEPENDS" | sed 's,\\$,\\\\$,g'`
>

Actions: View | Diff

Attachments on bug 5494: 4688 | 4689

We are currently migrating Bugzilla to GitHub issues.Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.

We are currently migrating Bugzilla to GitHub issues.
Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.
When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.