* [gentoo-commits] repo/gentoo:master commit in: media-libs/libsdl2/files/
@ 2021-04-23 22:40 James Le Cuirot
0 siblings, 0 replies; 4+ messages in thread
From: James Le Cuirot @ 2021-04-23 22:40 UTC (permalink / raw
To: gentoo-commits
commit: ca4dcf1bce51ecf5887036985092732300367924
Author: orbea <orbea <AT> riseup <DOT> net>
AuthorDate: Tue Mar 23 23:12:42 2021 +0000
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Fri Apr 23 22:39:45 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ca4dcf1b
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 <AT> riseup.net>
Closes: https://github.com/gentoo/gentoo/pull/20087
Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>
media-libs/libsdl2/files/libsdl2-2.0.14-static-libs.patch | 4 ++--
1 file 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 01b9c513437..0d4dfdcb445 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:
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/libsdl2/files/
@ 2021-05-18 20:05 Ulrich Müller
0 siblings, 0 replies; 4+ messages in thread
From: Ulrich Müller @ 2021-05-18 20:05 UTC (permalink / raw
To: gentoo-commits
commit: 8d35efd215c730c194c7534e0352a50b6dfebd27
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Tue May 18 20:03:03 2021 +0000
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Tue May 18 20:05:10 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8d35efd2
Revert "media-libs/libsdl2: Fix --disable-static patch for slibtool."
Invalid signoff, violation of GLEP 76 copyright policy.
This reverts commit ca4dcf1bce51ecf5887036985092732300367924.
Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>
media-libs/libsdl2/files/libsdl2-2.0.14-static-libs.patch | 4 ++--
1 file 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 0d4dfdcb445..01b9c513437 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) -static
++ $(RUN_CMD_LTLINK)$(LIBTOOL) --tag=CC --mode=link $(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS) $(EXTRA_LDFLAGS) $(LT_LDFLAGS) -all-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) -static
++ $(RUN_CMD_LTLINK)$(LIBTOOL) --tag=CC --mode=link $(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS) $(EXTRA_LDFLAGS) $(LT_LDFLAGS) -all-static
install: all install-bin install-hdrs install-lib install-data
install-bin:
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/libsdl2/files/
@ 2021-05-18 20:13 Ulrich Müller
0 siblings, 0 replies; 4+ messages in thread
From: Ulrich Müller @ 2021-05-18 20:13 UTC (permalink / raw
To: gentoo-commits
commit: 47d07116a90fe9265a90573fb9eb7355facf9e2b
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Tue May 18 20:13:12 2021 +0000
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Tue May 18 20:13:12 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=47d07116
Revert "Revert "media-libs/libsdl2: Fix --disable-static patch for slibtool.""
Re-revert older (trivial) commit.
This reverts commit 8d35efd215c730c194c7534e0352a50b6dfebd27.
Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>
media-libs/libsdl2/files/libsdl2-2.0.14-static-libs.patch | 4 ++--
1 file 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 01b9c513437..0d4dfdcb445 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:
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/libsdl2/files/
@ 2023-01-20 1:23 Sam James
0 siblings, 0 replies; 4+ messages in thread
From: Sam James @ 2023-01-20 1:23 UTC (permalink / raw
To: gentoo-commits
commit: cb17fbe3cfdc620aefd1017f500810d69a2bccb9
Author: Carlos Eduardo <carana2099 <AT> gmail <DOT> com>
AuthorDate: Mon Jan 16 02:09:13 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Jan 20 01:21:33 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cb17fbe3
media-libs/libsdl2: fix build with slibtool + clang
Closes: https://bugs.gentoo.org/890744
Signed-off-by: Carlos Eduardo <carana2099 <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/29129
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-libs/libsdl2/files/libsdl2-2.0.16-static-libs.patch | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-libs/libsdl2/files/libsdl2-2.0.16-static-libs.patch b/media-libs/libsdl2/files/libsdl2-2.0.16-static-libs.patch
index d57c7b8f1c6b..ec0db40c0b3d 100644
--- a/media-libs/libsdl2/files/libsdl2-2.0.16-static-libs.patch
+++ b/media-libs/libsdl2/files/libsdl2-2.0.16-static-libs.patch
@@ -21,7 +21,7 @@ Bug: https://github.com/gentoo/gentoo/pull/20087
$(objects)/$(TARGET): $(GEN_HEADERS) $(GEN_OBJECTS) $(OBJECTS) $(VERSION_OBJECTS)
- $(RUN_CMD_LTLINK)$(LIBTOOL) --tag=$(LIBTOOLLINKERTAG) --mode=link $(LINKER) -o $@ $(OBJECTS) $(GEN_OBJECTS) $(VERSION_OBJECTS) $(LDFLAGS) $(EXTRA_LDFLAGS) $(LT_LDFLAGS)
-+ $(RUN_CMD_LTLINK)$(LIBTOOL) --tag=$(LIBTOOLLINKERTAG) --mode=link $(LINKER) $(CFLAGS) -o $@ $^ $(LDFLAGS) $(EXTRA_LDFLAGS) $(LT_LDFLAGS)
++ $(RUN_CMD_LTLINK)$(LIBTOOL) --tag=$(LIBTOOLLINKERTAG) --mode=link $(LINKER) $(CFLAGS) -o $@ $(OBJECTS) $(GEN_OBJECTS) $(VERSION_OBJECTS) $(LDFLAGS) $(EXTRA_LDFLAGS) $(LT_LDFLAGS)
$(objects)/$(SDLMAIN_TARGET): $(SDLMAIN_OBJECTS)
- $(RUN_CMD_LTLINK)$(LIBTOOL) --tag=$(LIBTOOLLINKERTAG) --mode=link $(LINKER) -static -o $@ $(SDLMAIN_OBJECTS) -rpath $(libdir)
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2023-01-20 1:23 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-05-18 20:05 [gentoo-commits] repo/gentoo:master commit in: media-libs/libsdl2/files/ Ulrich Müller
-- strict thread matches above, loose matches on Subject: below --
2023-01-20 1:23 Sam James
2021-05-18 20:13 Ulrich Müller
2021-04-23 22:40 James Le Cuirot
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox