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: Merge pkg-config Libs.private into Libs for static-only builds

sdl-pkg-config-static-libs.patch (text/plain), 5.05 KB, created by James Le Cuirot on 2020-04-12 12:37:15 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: James Le Cuirot

Created: 2020-04-12 12:37:15 UTC

Size: 5.05 KB

patch

obsolete

># HG changeset patch
># User James Le Cuirot <chewi@gentoo.org>
># Date 1586644714 -3600
>#      Sat Apr 11 23:38:34 2020 +0100
># Node ID 9628f5add5ed1b4c4d20b0f521cabb7c7f26f968
># Parent  293eb6ce40ed10f015de6c43901a34b7a996aace
>build: Merge pkg-config Libs.private into Libs for static-only builds
>
>A project being built entirely statically will call pkg-config with
>--static, which utilises the Libs.private field. Conversely it will
>not use --static when not being built entirely statically, even if
>there is only a static build of SDL available. This will most likely
>cause the build to fail due to underlinking unless we merge the Libs
>fields.
>
>This is what the Meson build system does when it generates pkg-config
>files. This also also follows the behaviour of sdl2-config.
>
>At the same time, the runtime linker flags are not applicable to
>static-only builds so only add them for shared builds.
>
>diff -r 293eb6ce40ed -r 9628f5add5ed CMakeLists.txt
>--- a/CMakeLists.txt	Mon Sep 30 22:54:16 2019 +0300
>+++ b/CMakeLists.txt	Sat Apr 11 23:38:34 2020 +0100
>@@ -1279,8 +1279,8 @@
>     set(HAVE_SDL_TIMERS TRUE)
>   endif()
> 
>-  if(RPATH)
>-    set(SDL_RLD_FLAGS "")
>+  set(SDL_RLD_FLAGS "")
>+  if(RPATH AND SDL_SHARED)
>     if(BSDI OR FREEBSD OR LINUX OR NETBSD)
>       set(CMAKE_REQUIRED_FLAGS "-Wl,--enable-new-dtags")
>       check_c_compiler_flag("" HAVE_ENABLE_NEW_DTAGS)
>@@ -1950,9 +1950,12 @@
>     set(ENABLE_STATIC_FALSE "")
>   endif()
>   if(SDL_SHARED)
>+    set(PKG_CONFIG_LIBS_PRIV "
>+Libs.private:")
>     set(ENABLE_SHARED_TRUE "")
>     set(ENABLE_SHARED_FALSE "#")
>   else()
>+    set(PKG_CONFIG_LIBS_PRIV "")
>     set(ENABLE_SHARED_TRUE "#")
>     set(ENABLE_SHARED_FALSE "")
>   endif()
>diff -r 293eb6ce40ed -r 9628f5add5ed configure
>--- a/configure	Mon Sep 30 22:54:16 2019 +0300
>+++ b/configure	Sat Apr 11 23:38:34 2020 +0100
>@@ -647,6 +647,7 @@
> ENABLE_STATIC_TRUE
> ENABLE_SHARED_FALSE
> ENABLE_SHARED_TRUE
>+PKG_CONFIG_LIBS_PRIV
> SDL_RLD_FLAGS
> SDL_STATIC_LIBS
> SDL_LIBS
>@@ -25675,7 +25676,7 @@
> 
> # Set runtime shared library paths as needed
> 
>-if test "x$enable_rpath" = "xyes"; then
>+if test "x$enable_rpath" = "xyes" -a "x$enable_shared" = "xyes"; then
>   if test $ARCH = bsdi -o $ARCH = freebsd -o $ARCH = linux -o $ARCH = netbsd; then
>     SDL_RLD_FLAGS="-Wl,-rpath,\${libdir}"
> 
>@@ -25723,9 +25724,12 @@
> 
> 
> if test x$enable_shared = xyes; then
>+    PKG_CONFIG_LIBS_PRIV="
>+Libs.private:"
>     ENABLE_SHARED_TRUE=
>     ENABLE_SHARED_FALSE="#"
> else
>+    PKG_CONFIG_LIBS_PRIV=
>     ENABLE_SHARED_TRUE="#"
>     ENABLE_SHARED_FALSE=
> fi
>diff -r 293eb6ce40ed -r 9628f5add5ed configure.ac
>--- a/configure.ac	Mon Sep 30 22:54:16 2019 +0300
>+++ b/configure.ac	Sat Apr 11 23:38:34 2020 +0100
>@@ -4247,7 +4247,7 @@
> 
> # Set runtime shared library paths as needed
> 
>-if test "x$enable_rpath" = "xyes"; then
>+if test "x$enable_rpath" = "xyes" -a "x$enable_shared" = "xyes"; then
>   if test $ARCH = bsdi -o $ARCH = freebsd -o $ARCH = linux -o $ARCH = netbsd; then
>     SDL_RLD_FLAGS="-Wl,-rpath,\${libdir}"
> 
>@@ -4279,9 +4279,12 @@
> AC_SUBST(SDL_STATIC_LIBS)
> AC_SUBST(SDL_RLD_FLAGS)
> if test x$enable_shared = xyes; then
>+    PKG_CONFIG_LIBS_PRIV="
>+Libs.private:"
>     ENABLE_SHARED_TRUE=
>     ENABLE_SHARED_FALSE="#"
> else
>+    PKG_CONFIG_LIBS_PRIV=
>     ENABLE_SHARED_TRUE="#"
>     ENABLE_SHARED_FALSE=
> fi
>@@ -4292,6 +4295,7 @@
>     ENABLE_STATIC_TRUE="#"
>     ENABLE_STATIC_FALSE=
> fi
>+AC_SUBST(PKG_CONFIG_LIBS_PRIV)
> AC_SUBST(ENABLE_SHARED_TRUE)
> AC_SUBST(ENABLE_SHARED_FALSE)
> AC_SUBST(ENABLE_STATIC_TRUE)
>diff -r 293eb6ce40ed -r 9628f5add5ed sdl2-config.cmake.in
>--- a/sdl2-config.cmake.in	Mon Sep 30 22:54:16 2019 +0300
>+++ b/sdl2-config.cmake.in	Sat Apr 11 23:38:34 2020 +0100
>@@ -15,7 +15,7 @@
>   # This may require "libdir" beeing set (from above)
>   string(REPLACE "-lSDL2 " "" SDL2_EXTRA_LINK_FLAGS "@SDL_RLD_FLAGS@ @SDL_LIBS@ ")
>   string(STRIP "${SDL2_EXTRA_LINK_FLAGS}" SDL2_EXTRA_LINK_FLAGS)
>-  string(REPLACE "-lSDL2 " "" SDL2_EXTRA_LINK_FLAGS_STATIC "@SDL_RLD_FLAGS@ @SDL_STATIC_LIBS@ ")
>+  string(REPLACE "-lSDL2 " "" SDL2_EXTRA_LINK_FLAGS_STATIC "@SDL_STATIC_LIBS@ ")
>   string(STRIP "${SDL2_EXTRA_LINK_FLAGS_STATIC}" SDL2_EXTRA_LINK_FLAGS_STATIC)
> 
>   add_library(SDL2::SDL2 SHARED IMPORTED)
>diff -r 293eb6ce40ed -r 9628f5add5ed sdl2-config.in
>--- a/sdl2-config.in	Mon Sep 30 22:54:16 2019 +0300
>+++ b/sdl2-config.in	Sat Apr 11 23:38:34 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_RLD_FLAGS@ @SDL_STATIC_LIBS@
>+@ENABLE_STATIC_TRUE@      echo -L@libdir@ @SDL_STATIC_LIBS@
> @ENABLE_STATIC_TRUE@      ;;
>     *)
>       echo "${usage}" 1>&2
>diff -r 293eb6ce40ed -r 9628f5add5ed sdl2.pc.in
>--- a/sdl2.pc.in	Mon Sep 30 22:54:16 2019 +0300
>+++ b/sdl2.pc.in	Sat Apr 11 23:38:34 2020 +0100
>@@ -10,6 +10,5 @@
> Version: @SDL_VERSION@
> Requires:
> Conflicts:
>-Libs: -L${libdir} @SDL_RLD_FLAGS@ @SDL_LIBS@
>-Libs.private: @SDL_STATIC_LIBS@
>+Libs: -L${libdir} @SDL_RLD_FLAGS@ @SDL_LIBS@ @PKG_CONFIG_LIBS_PRIV@ @SDL_STATIC_LIBS@
> Cflags: -I${includedir}/SDL2 @SDL_CFLAGS@

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.