Merge pull request #3581 from neobrain/fix_libfwd_x11_libname

Library Forwarding: Fix issues with libGL's fake X11 dependency
FEX-Emu · Apr 23, 2024 · 81a4206 · 81a4206
2 parents a0bf6a4 + cf75cdd
commit 81a4206
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/ThunkLibs/GuestLibs/CMakeLists.txt b/ThunkLibs/GuestLibs/CMakeLists.txt
@@ -182,8 +182,10 @@ if (BITNESS EQUAL 64)
   add_guest_lib(GL "libGL.so.1")
 
   # libGL must pull in libX11.so, so generate a placeholder libX11.so to link against
-  add_library(X11 SHARED ../libX11/libX11_NativeGuest.cpp)
-  target_link_libraries(GL-guest PRIVATE X11)
+  add_library(PlaceholderX11 SHARED ../libX11/libX11_NativeGuest.cpp)
+  target_link_options(PlaceholderX11 PRIVATE "LINKER:-soname,libX11.so.6")
+  set_target_properties(PlaceholderX11 PROPERTIES NO_SONAME ON)
+  target_link_libraries(GL-guest PRIVATE PlaceholderX11)
 
   # disabled for now, headers are platform specific
   # find_package(SDL2 REQUIRED)