diff options
| author | Ørjan Malde <red@foxi.me> | 2021-10-05 23:45:05 +0200 |
|---|---|---|
| committer | Ørjan Malde <red@foxi.me> | 2021-10-05 23:45:05 +0200 |
| commit | 1b25314fddd69a3556fd5bb338dd5de77e2cd3db (patch) | |
| tree | 2fb0a0a27ffc8041f2138945635447835f4a1081 | |
| parent | be32d78f7776a271ce73cf0182b0348b1a28be26 (diff) | |
| download | midipix_build-1b25314fddd69a3556fd5bb338dd5de77e2cd3db.tar.bz2 midipix_build-1b25314fddd69a3556fd5bb338dd5de77e2cd3db.tar.xz | |
patches/sdl1-1.2.15_pre.local.patch: integrate slibtool fix (via orbea.)
Signed-off-by: Ørjan Malde <red@foxi.me>
| -rw-r--r-- | groups/251.native_packages_lib.group | 1 | ||||
| -rw-r--r-- | patches/sdl1-1.2.15_pre.local.patch | 56 |
2 files changed, 56 insertions, 1 deletions
diff --git a/groups/251.native_packages_lib.group b/groups/251.native_packages_lib.group index 9cff77e4..d569769d 100644 --- a/groups/251.native_packages_lib.group +++ b/groups/251.native_packages_lib.group @@ -333,7 +333,6 @@ ksba_cv_visibility_attribute=yes"}; : ${PKG_SDL1_CFLAGS_CONFIGURE_EXTRA:="-DWINAPI_ANSI_DEFAULT -I${PREFIX_NATIVE}/include/w32api.ports"}; : ${PKG_SDL1_IN_TREE:=1}; : ${PKG_SDL1_LDFLAGS_CONFIGURE_EXTRA:="-L${PREFIX_NATIVE}/lib/w32lib"}; -: ${PKG_SDL1_MAKEFLAGS_BUILD:=-j1}; : ${PKG_SDL1_NET_DEPENDS:="sdl1"}; : ${PKG_SDL1_NET_SHA256SUM:=5f4a7a8bb884f793c278ac3f3713be41980c5eedccecff0260411347714facb4}; : ${PKG_SDL1_NET_VERSION:=1.2.8}; diff --git a/patches/sdl1-1.2.15_pre.local.patch b/patches/sdl1-1.2.15_pre.local.patch index 559bb3c2..2e03773a 100644 --- a/patches/sdl1-1.2.15_pre.local.patch +++ b/patches/sdl1-1.2.15_pre.local.patch @@ -1,3 +1,59 @@ +https://bugs.gentoo.org/779445 + +commit ed1030d9b6a98e06aa293d18c49da18169918b8b +Author: orbea <orbea@riseup.net> +Date: Tue Mar 30 18:57:37 2021 -0700 + + Fix the build with parallel make and slibtool. + + There is no dependency on the $(OBJECTS) files on the 'build' + directory which causes slibtool to fail when the directory + does not yet exist. GNU libtool avoids this by being slower + than mkdir(1). + +diff --git a/Makefile.in b/Makefile.in +index ab51035..90940d4 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -51,7 +51,7 @@ LT_RELEASE = @LT_RELEASE@ + LT_REVISION = @LT_REVISION@ + LT_LDFLAGS = -no-undefined -rpath $(DESTDIR)$(libdir) -release $(LT_RELEASE) -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) + +-all: $(srcdir)/configure Makefile $(objects) $(objects)/$(TARGET) $(objects)/$(SDLMAIN_TARGET) ++all: $(srcdir)/configure Makefile $(objects)/$(TARGET) $(objects)/$(SDLMAIN_TARGET) + + $(srcdir)/configure: $(srcdir)/configure.in + @echo "Warning, configure.in is out of date" +@@ -61,8 +61,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 depend install install-bin install-hdrs install-lib install-data install-man uninstall uninstall-bin uninstall-hdrs uninstall-lib uninstall-data uninstall-man clean distclean dist + depend: +@@ -71,6 +72,8 @@ depend: + + include $(depend) + ++$(OBJECTS) $(SDLMAIN_OBJECTS): $(objects)/.created ++ + $(objects)/$(TARGET): $(OBJECTS) + $(LIBTOOL) --mode=link $(CC) -o $@ $^ $(LDFLAGS) $(EXTRA_LDFLAGS) $(LT_LDFLAGS) + +@@ -88,7 +91,7 @@ install-hdrs: + $(INSTALL) -m 644 $(srcdir)/include/$$file $(DESTDIR)$(includedir)/SDL/$$file; \ + done + $(INSTALL) -m 644 include/SDL_config.h $(DESTDIR)$(includedir)/SDL/SDL_config.h +-install-lib: $(objects) $(objects)/$(TARGET) $(objects)/$(SDLMAIN_TARGET) ++install-lib: $(objects)/$(TARGET) $(objects)/$(SDLMAIN_TARGET) + $(SHELL) $(auxdir)/mkinstalldirs $(DESTDIR)$(libdir) + $(LIBTOOL) --mode=install $(INSTALL) $(objects)/$(TARGET) $(DESTDIR)$(libdir)/$(TARGET) + $(LIBTOOL) --mode=install $(INSTALL) $(objects)/$(SDLMAIN_TARGET) $(DESTDIR)$(libdir)/$(SDLMAIN_TARGET) diff -ru SDL-1.2.15.orig/configure.in SDL-1.2.15/configure.in --- SDL-1.2.15.orig/configure.in 2012-01-19 07:30:05.000000000 +0100 +++ SDL-1.2.15/configure.in 2019-11-08 11:00:50.134023690 +0100 |