57 lines
2.0 KiB
Diff
57 lines
2.0 KiB
Diff
|
From d5e9e51860f4e90f7ba0bb53b1c26740dc1ee7eb Mon Sep 17 00:00:00 2001
|
||
|
|
From: Neal Gompa <ngompa@fedoraproject.org>
|
||
|
|
Date: Thu, 3 Jun 2021 08:31:58 -0400
|
||
|
|
Subject: [PATCH] Remove libdir definition from sdl-config for multilib support
|
||
|
|
|
||
|
|
If we export the library directory, then the contents of sdl-config
|
||
|
|
wind up differing across architectures, which will make sdl12-compat
|
||
|
|
not multilib-safe.
|
||
|
|
|
||
|
|
Thus, strip out the libdir stuff so that this isn't a problem.
|
||
|
|
---
|
||
|
|
CMakeLists.txt | 1 -
|
||
|
|
sdl-config.in | 5 ++---
|
||
|
|
2 files changed, 2 insertions(+), 4 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||
|
|
index 6256c3a..9163f9f 100644
|
||
|
|
--- a/CMakeLists.txt
|
||
|
|
+++ b/CMakeLists.txt
|
||
|
|
@@ -182,7 +182,6 @@ if(SDL12DEVEL)
|
||
|
|
set(SDL_STATIC_LIBS "-lm -ldl -lpthread")
|
||
|
|
set(prefix ${CMAKE_INSTALL_PREFIX})
|
||
|
|
set(exec_prefix "\${prefix}")
|
||
|
|
- set(libdir "\${exec_prefix}/lib${LIB_SUFFIX}")
|
||
|
|
set(bindir "\${exec_prefix}/bin")
|
||
|
|
set(includedir "\${prefix}/include")
|
||
|
|
configure_file("${CMAKE_SOURCE_DIR}/sdl-config.in" "${CMAKE_BINARY_DIR}/sdl-config" @ONLY)
|
||
|
|
diff --git a/sdl-config.in b/sdl-config.in
|
||
|
|
index f7895c2..e55633e 100755
|
||
|
|
--- a/sdl-config.in
|
||
|
|
+++ b/sdl-config.in
|
||
|
|
@@ -10,7 +10,6 @@
|
||
|
|
prefix=@prefix@
|
||
|
|
exec_prefix=@exec_prefix@
|
||
|
|
exec_prefix_set=no
|
||
|
|
-libdir=@libdir@
|
||
|
|
|
||
|
|
@ENABLE_STATIC_FALSE@usage="\
|
||
|
|
@ENABLE_STATIC_FALSE@Usage: $0 [--prefix[=DIR]] [--exec-prefix[=DIR]] [--version] [--cflags] [--libs]"
|
||
|
|
@@ -52,11 +51,11 @@ while test $# -gt 0; do
|
||
|
|
echo -I@includedir@/SDL2 @SDL_CFLAGS@
|
||
|
|
;;
|
||
|
|
@ENABLE_SHARED_TRUE@ --libs)
|
||
|
|
-@ENABLE_SHARED_TRUE@ echo -L@libdir@ @SDL_RLD_FLAGS@ @SDL_LIBS@
|
||
|
|
+@ENABLE_SHARED_TRUE@ echo @SDL_RLD_FLAGS@ @SDL_LIBS@
|
||
|
|
@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_LIBS@ @SDL_STATIC_LIBS@
|
||
|
|
+@ENABLE_STATIC_TRUE@ echo @SDL_LIBS@ @SDL_STATIC_LIBS@
|
||
|
|
@ENABLE_STATIC_TRUE@ ;;
|
||
|
|
*)
|
||
|
|
echo "${usage}" 1>&2
|
||
|
|
--
|
||
|
|
2.31.1
|
||
|
|
|