summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authororbea <orbea@riseup.net>2021-03-23 16:12:42 -0700
committerJames Le Cuirot <chewi@gentoo.org>2021-04-23 23:39:45 +0100
commitca4dcf1bce51ecf5887036985092732300367924 (patch)
treec2f6a0a7fbe34ff3067b502de3cb895a18e00eb6 /media-libs/libsdl2/files
parentdev-lang/spidermonkey: update firefox patch set (diff)
downloadgentoo-ca4dcf1bce51ecf5887036985092732300367924.tar.gz
gentoo-ca4dcf1bce51ecf5887036985092732300367924.tar.bz2
gentoo-ca4dcf1bce51ecf5887036985092732300367924.zip
media-libs/libsdl2: Fix --disable-static patch for slibtool.
With slibtool both libSDL2main.a and libSDL2_test.a fail to install. This was fixed in slibtool here. https://dev.midipix.org/cross/slibtool/c/9a5f9681f88126c47e11ef49e7fb01c604c90986?branch=main However using it still does not work in gentoo with -all-static, but works fine if its changed back to -static as is done upstream in SDL2. GNU libtool does not seem to behave any differently here and its unclear why this was ever changed? Also see this slibtool issue: https://dev.midipix.org/cross/slibtool/issue/28 Signed-off-by: orbea <orbea@riseup.net> Closes: https://github.com/gentoo/gentoo/pull/20087 Signed-off-by: James Le Cuirot <chewi@gentoo.org>
Diffstat (limited to 'media-libs/libsdl2/files')
-rw-r--r--media-libs/libsdl2/files/libsdl2-2.0.14-static-libs.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/media-libs/libsdl2/files/libsdl2-2.0.14-static-libs.patch b/media-libs/libsdl2/files/libsdl2-2.0.14-static-libs.patch
index 01b9c5134379..0d4dfdcb445e 100644
--- a/media-libs/libsdl2/files/libsdl2-2.0.14-static-libs.patch
+++ b/media-libs/libsdl2/files/libsdl2-2.0.14-static-libs.patch
@@ -24,11 +24,11 @@ Bug: https://bugzilla.libsdl.org/show_bug.cgi?id=1431
$(objects)/$(SDLMAIN_TARGET): $(SDLMAIN_OBJECTS)
- $(RUN_CMD_LTLINK)$(LIBTOOL) --tag=CC --mode=link $(CC) -static -o $@ $(SDLMAIN_OBJECTS) -rpath $(libdir)
-+ $(RUN_CMD_LTLINK)$(LIBTOOL) --tag=CC --mode=link $(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS) $(EXTRA_LDFLAGS) $(LT_LDFLAGS) -all-static
++ $(RUN_CMD_LTLINK)$(LIBTOOL) --tag=CC --mode=link $(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS) $(EXTRA_LDFLAGS) $(LT_LDFLAGS) -static
$(objects)/$(SDLTEST_TARGET): $(SDLTEST_OBJECTS)
- $(RUN_CMD_LTLINK)$(LIBTOOL) --tag=CC --mode=link $(CC) -static -o $@ $(SDLTEST_OBJECTS) -rpath $(libdir)
-+ $(RUN_CMD_LTLINK)$(LIBTOOL) --tag=CC --mode=link $(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS) $(EXTRA_LDFLAGS) $(LT_LDFLAGS) -all-static
++ $(RUN_CMD_LTLINK)$(LIBTOOL) --tag=CC --mode=link $(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS) $(EXTRA_LDFLAGS) $(LT_LDFLAGS) -static
install: all install-bin install-hdrs install-lib install-data
install-bin: