Gentoo Archives: gentoo-commits

From: "Ulrich Müller" <ulm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/libsdl2/files/
Date: Tue, 18 May 2021 20:13:41
Message-Id: 1621368792.47d07116a90fe9265a90573fb9eb7355facf9e2b.ulm@gentoo
1 commit: 47d07116a90fe9265a90573fb9eb7355facf9e2b
2 Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
3 AuthorDate: Tue May 18 20:13:12 2021 +0000
4 Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
5 CommitDate: Tue May 18 20:13:12 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=47d07116
7
8 Revert "Revert "media-libs/libsdl2: Fix --disable-static patch for slibtool.""
9
10 Re-revert older (trivial) commit.
11 This reverts commit 8d35efd215c730c194c7534e0352a50b6dfebd27.
12
13 Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>
14
15 media-libs/libsdl2/files/libsdl2-2.0.14-static-libs.patch | 4 ++--
16 1 file changed, 2 insertions(+), 2 deletions(-)
17
18 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
19 index 01b9c513437..0d4dfdcb445 100644
20 --- a/media-libs/libsdl2/files/libsdl2-2.0.14-static-libs.patch
21 +++ b/media-libs/libsdl2/files/libsdl2-2.0.14-static-libs.patch
22 @@ -24,11 +24,11 @@ Bug: https://bugzilla.libsdl.org/show_bug.cgi?id=1431
23
24 $(objects)/$(SDLMAIN_TARGET): $(SDLMAIN_OBJECTS)
25 - $(RUN_CMD_LTLINK)$(LIBTOOL) --tag=CC --mode=link $(CC) -static -o $@ $(SDLMAIN_OBJECTS) -rpath $(libdir)
26 -+ $(RUN_CMD_LTLINK)$(LIBTOOL) --tag=CC --mode=link $(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS) $(EXTRA_LDFLAGS) $(LT_LDFLAGS) -all-static
27 ++ $(RUN_CMD_LTLINK)$(LIBTOOL) --tag=CC --mode=link $(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS) $(EXTRA_LDFLAGS) $(LT_LDFLAGS) -static
28
29 $(objects)/$(SDLTEST_TARGET): $(SDLTEST_OBJECTS)
30 - $(RUN_CMD_LTLINK)$(LIBTOOL) --tag=CC --mode=link $(CC) -static -o $@ $(SDLTEST_OBJECTS) -rpath $(libdir)
31 -+ $(RUN_CMD_LTLINK)$(LIBTOOL) --tag=CC --mode=link $(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS) $(EXTRA_LDFLAGS) $(LT_LDFLAGS) -all-static
32 ++ $(RUN_CMD_LTLINK)$(LIBTOOL) --tag=CC --mode=link $(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS) $(EXTRA_LDFLAGS) $(LT_LDFLAGS) -static
33
34 install: all install-bin install-hdrs install-lib install-data
35 install-bin: