We are currently migrating Bugzilla to GitHub issues.
Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.
When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.

[patch] build: Don't duplicate Libs in Libs.private in pkg-config file

sdl-pkg-config-dedupe.patch (text/plain), 2.07 KB, created by James Le Cuirot on 2020-04-12 12:38:22 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: James Le Cuirot

Created: 2020-04-12 12:38:22 UTC

Size: 2.07 KB

patch

obsolete

># HG changeset patch
># User James Le Cuirot <chewi@gentoo.org>
># Date 1586694276 -3600
>#      Sun Apr 12 13:24:36 2020 +0100
># Node ID 9666f261bbb5b8e67c9c136189d8ccbda999af5b
># Parent  9628f5add5ed1b4c4d20b0f521cabb7c7f26f968
>build: Don't duplicate Libs in Libs.private in pkg-config file
>
>pkg-config already prepends Libs to Libs.private when you specify
>--static so there's no need to duplicate them. Most other projects
>don't do this.
>
>diff -r 9628f5add5ed -r 9666f261bbb5 CMakeLists.txt
>--- a/CMakeLists.txt	Sat Apr 11 23:38:34 2020 +0100
>+++ b/CMakeLists.txt	Sun Apr 12 13:24:36 2020 +0100
>@@ -1962,7 +1962,7 @@
> 
>   # Clean up the different lists
>   listtostr(EXTRA_LIBS _EXTRA_LIBS "-l")
>-  set(SDL_STATIC_LIBS ${SDL_LIBS} ${EXTRA_LDFLAGS} ${_EXTRA_LIBS})
>+  set(SDL_STATIC_LIBS ${EXTRA_LDFLAGS} ${_EXTRA_LIBS})
>   list(REMOVE_DUPLICATES SDL_STATIC_LIBS)
>   listtostr(SDL_STATIC_LIBS _SDL_STATIC_LIBS)
>   set(SDL_STATIC_LIBS ${_SDL_STATIC_LIBS})
>diff -r 9628f5add5ed -r 9666f261bbb5 configure
>--- a/configure	Sat Apr 11 23:38:34 2020 +0100
>+++ b/configure	Sun Apr 12 13:24:36 2020 +0100
>@@ -25717,7 +25717,7 @@
>   SDL_RLD_FLAGS=""
> fi
> 
>-SDL_STATIC_LIBS="$SDL_LIBS $EXTRA_LDFLAGS"
>+SDL_STATIC_LIBS="$EXTRA_LDFLAGS"
> 
> 
> 
>diff -r 9628f5add5ed -r 9666f261bbb5 configure.ac
>--- a/configure.ac	Sat Apr 11 23:38:34 2020 +0100
>+++ b/configure.ac	Sun Apr 12 13:24:36 2020 +0100
>@@ -4271,7 +4271,7 @@
>   SDL_RLD_FLAGS=""
> fi
> 
>-SDL_STATIC_LIBS="$SDL_LIBS $EXTRA_LDFLAGS"
>+SDL_STATIC_LIBS="$EXTRA_LDFLAGS"
> 
> dnl Expand the cflags and libraries needed by apps using SDL
> AC_SUBST(SDL_CFLAGS)
>diff -r 9628f5add5ed -r 9666f261bbb5 sdl2-config.in
>--- a/sdl2-config.in	Sat Apr 11 23:38:34 2020 +0100
>+++ b/sdl2-config.in	Sun Apr 12 13:24:36 2020 +0100
>@@ -49,7 +49,7 @@
> @ENABLE_SHARED_TRUE@      ;;
> @ENABLE_STATIC_TRUE@@ENABLE_SHARED_TRUE@    --static-libs)
> @ENABLE_STATIC_TRUE@@ENABLE_SHARED_FALSE@    --libs|--static-libs)
>-@ENABLE_STATIC_TRUE@      echo -L@libdir@ @SDL_STATIC_LIBS@
>+@ENABLE_STATIC_TRUE@      echo -L@libdir@ @SDL_LIBS@ @SDL_STATIC_LIBS@
> @ENABLE_STATIC_TRUE@      ;;
>     *)
>       echo "${usage}" 1>&2

Actions: View | Diff

Attachments on bug 5085: 4301 | 4302

We are currently migrating Bugzilla to GitHub issues.Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.

We are currently migrating Bugzilla to GitHub issues.
Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.
When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.