|
 |
3e7ef7 |
From 3cfbf8e889b50d5d19795d6f81f66345c70ce4e0 Mon Sep 17 00:00:00 2001
|
|
|
3e7ef7 |
From: Neal Gompa <ngompa@fedoraproject.org>
|
|
|
3e7ef7 |
Date: Wed, 9 Jun 2021 06:57:51 -0400
|
|
|
3e7ef7 |
Subject: [PATCH] Remove libdir definition from sdl-config for multilib support
|
|
|
3e7ef7 |
|
|
|
3e7ef7 |
If we export the library directory, then the contents of sdl-config
|
|
|
3e7ef7 |
wind up differing across architectures, which will make sdl12-compat
|
|
|
3e7ef7 |
not multilib-safe.
|
|
|
3e7ef7 |
|
|
|
3e7ef7 |
Thus, strip out the libdir stuff so that this isn't a problem.
|
|
|
3e7ef7 |
---
|
|
|
3e7ef7 |
sdl-config.in | 5 ++---
|
|
|
3e7ef7 |
1 file changed, 2 insertions(+), 3 deletions(-)
|
|
|
3e7ef7 |
|
|
|
3e7ef7 |
diff --git a/sdl-config.in b/sdl-config.in
|
|
|
3e7ef7 |
index 528a355..addabd8 100755
|
|
|
3e7ef7 |
--- a/sdl-config.in
|
|
|
3e7ef7 |
+++ b/sdl-config.in
|
|
|
3e7ef7 |
@@ -10,7 +10,6 @@
|
|
|
3e7ef7 |
prefix=@CMAKE_INSTALL_PREFIX@
|
|
|
3e7ef7 |
exec_prefix=${prefix}
|
|
|
3e7ef7 |
exec_prefix_set=no
|
|
|
3e7ef7 |
-libdir=@CMAKE_INSTALL_FULL_LIBDIR@
|
|
|
3e7ef7 |
includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@
|
|
|
3e7ef7 |
|
|
|
3e7ef7 |
@ENABLE_STATIC_FALSE@usage="\
|
|
|
3e7ef7 |
@@ -53,11 +52,11 @@ while test $# -gt 0; do
|
|
|
3e7ef7 |
echo -I${includedir}/SDL @SDL_CFLAGS@
|
|
|
3e7ef7 |
;;
|
|
|
3e7ef7 |
@ENABLE_SHARED_TRUE@ --libs)
|
|
|
3e7ef7 |
-@ENABLE_SHARED_TRUE@ echo -L${libdir} @SDL_RLD_FLAGS@ @SDL_LIBS@
|
|
|
3e7ef7 |
+@ENABLE_SHARED_TRUE@ echo @SDL_RLD_FLAGS@ @SDL_LIBS@
|
|
|
3e7ef7 |
@ENABLE_SHARED_TRUE@ ;;
|
|
|
3e7ef7 |
@ENABLE_STATIC_TRUE@@ENABLE_SHARED_TRUE@ --static-libs)
|
|
|
3e7ef7 |
@ENABLE_STATIC_TRUE@@ENABLE_SHARED_FALSE@ --libs|--static-libs)
|
|
|
3e7ef7 |
-@ENABLE_STATIC_TRUE@ echo -L${libdir} @SDL_LIBS@ @SDL_STATIC_LIBS@
|
|
|
3e7ef7 |
+@ENABLE_STATIC_TRUE@ echo @SDL_LIBS@ @SDL_STATIC_LIBS@
|
|
|
3e7ef7 |
@ENABLE_STATIC_TRUE@ ;;
|
|
|
3e7ef7 |
*)
|
|
|
3e7ef7 |
echo "${usage}" 1>&2
|
|
|
3e7ef7 |
--
|
|
|
3e7ef7 |
2.31.1
|
|
|
3e7ef7 |
|