| 1 |
commit: ca4dcf1bce51ecf5887036985092732300367924 |
| 2 |
Author: orbea <orbea <AT> riseup <DOT> net> |
| 3 |
AuthorDate: Tue Mar 23 23:12:42 2021 +0000 |
| 4 |
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Apr 23 22:39:45 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ca4dcf1b |
| 7 |
|
| 8 |
media-libs/libsdl2: Fix --disable-static patch for slibtool. |
| 9 |
|
| 10 |
With slibtool both libSDL2main.a and libSDL2_test.a fail to |
| 11 |
install. This was fixed in slibtool here. |
| 12 |
|
| 13 |
https://dev.midipix.org/cross/slibtool/c/9a5f9681f88126c47e11ef49e7fb01c604c90986?branch=main |
| 14 |
|
| 15 |
However using it still does not work in gentoo with -all-static, |
| 16 |
but works fine if its changed back to -static as is done |
| 17 |
upstream in SDL2. GNU libtool does not seem to behave any |
| 18 |
differently here and its unclear why this was ever changed? |
| 19 |
|
| 20 |
Also see this slibtool issue: |
| 21 |
|
| 22 |
https://dev.midipix.org/cross/slibtool/issue/28 |
| 23 |
|
| 24 |
Signed-off-by: orbea <orbea <AT> riseup.net> |
| 25 |
Closes: https://github.com/gentoo/gentoo/pull/20087 |
| 26 |
Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org> |
| 27 |
|
| 28 |
media-libs/libsdl2/files/libsdl2-2.0.14-static-libs.patch | 4 ++-- |
| 29 |
1 file changed, 2 insertions(+), 2 deletions(-) |
| 30 |
|
| 31 |
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 |
| 32 |
index 01b9c513437..0d4dfdcb445 100644 |
| 33 |
--- a/media-libs/libsdl2/files/libsdl2-2.0.14-static-libs.patch |
| 34 |
+++ b/media-libs/libsdl2/files/libsdl2-2.0.14-static-libs.patch |
| 35 |
@@ -24,11 +24,11 @@ Bug: https://bugzilla.libsdl.org/show_bug.cgi?id=1431 |
| 36 |
|
| 37 |
$(objects)/$(SDLMAIN_TARGET): $(SDLMAIN_OBJECTS) |
| 38 |
- $(RUN_CMD_LTLINK)$(LIBTOOL) --tag=CC --mode=link $(CC) -static -o $@ $(SDLMAIN_OBJECTS) -rpath $(libdir) |
| 39 |
-+ $(RUN_CMD_LTLINK)$(LIBTOOL) --tag=CC --mode=link $(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS) $(EXTRA_LDFLAGS) $(LT_LDFLAGS) -all-static |
| 40 |
++ $(RUN_CMD_LTLINK)$(LIBTOOL) --tag=CC --mode=link $(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS) $(EXTRA_LDFLAGS) $(LT_LDFLAGS) -static |
| 41 |
|
| 42 |
$(objects)/$(SDLTEST_TARGET): $(SDLTEST_OBJECTS) |
| 43 |
- $(RUN_CMD_LTLINK)$(LIBTOOL) --tag=CC --mode=link $(CC) -static -o $@ $(SDLTEST_OBJECTS) -rpath $(libdir) |
| 44 |
-+ $(RUN_CMD_LTLINK)$(LIBTOOL) --tag=CC --mode=link $(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS) $(EXTRA_LDFLAGS) $(LT_LDFLAGS) -all-static |
| 45 |
++ $(RUN_CMD_LTLINK)$(LIBTOOL) --tag=CC --mode=link $(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS) $(EXTRA_LDFLAGS) $(LT_LDFLAGS) -static |
| 46 |
|
| 47 |
install: all install-bin install-hdrs install-lib install-data |
| 48 |
install-bin: |
Archives