From bef53c726b1e2042cdcefcec57c1fd5828bd4d7e Mon Sep 17 00:00:00 2001 From: Bananymous Date: Tue, 21 Apr 2026 21:46:00 +0300 Subject: [PATCH] Userspace: Install libdl, libm, libpthread as symlinks to libc Having dummy libraries was just unnecessary --- userspace/libraries/CMakeLists.txt | 3 --- userspace/libraries/LibC/CMakeLists.txt | 7 +++++++ userspace/libraries/LibDL/CMakeLists.txt | 18 ------------------ userspace/libraries/LibDL/dummy.cpp | 0 userspace/libraries/LibMath/CMakeLists.txt | 18 ------------------ userspace/libraries/LibMath/dummy.cpp | 0 userspace/libraries/LibPthread/CMakeLists.txt | 18 ------------------ userspace/libraries/LibPthread/dummy.cpp | 0 8 files changed, 7 insertions(+), 57 deletions(-) delete mode 100644 userspace/libraries/LibDL/CMakeLists.txt delete mode 100644 userspace/libraries/LibDL/dummy.cpp delete mode 100644 userspace/libraries/LibMath/CMakeLists.txt delete mode 100644 userspace/libraries/LibMath/dummy.cpp delete mode 100644 userspace/libraries/LibPthread/CMakeLists.txt delete mode 100644 userspace/libraries/LibPthread/dummy.cpp diff --git a/userspace/libraries/CMakeLists.txt b/userspace/libraries/CMakeLists.txt index 8b03acf4..00efaae4 100644 --- a/userspace/libraries/CMakeLists.txt +++ b/userspace/libraries/CMakeLists.txt @@ -3,14 +3,11 @@ set(USERSPACE_LIBRARIES LibC LibClipboard LibDEFLATE - LibDL LibELF LibFont LibGUI LibImage LibInput - LibMath - LibPthread LibQR ) diff --git a/userspace/libraries/LibC/CMakeLists.txt b/userspace/libraries/LibC/CMakeLists.txt index fe017753..f8bc460c 100644 --- a/userspace/libraries/LibC/CMakeLists.txt +++ b/userspace/libraries/LibC/CMakeLists.txt @@ -105,6 +105,13 @@ target_link_options(libc-shared PRIVATE -nolibc -nostdlib++) install(TARGETS libc-static OPTIONAL) install(TARGETS libc-shared OPTIONAL) +install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink \"libc.a\" \"${CMAKE_INSTALL_LIBDIR}/libdl.a\")") +install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink \"libc.so\" \"${CMAKE_INSTALL_LIBDIR}/libdl.so\")") +install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink \"libc.a\" \"${CMAKE_INSTALL_LIBDIR}/libm.a\")") +install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink \"libc.so\" \"${CMAKE_INSTALL_LIBDIR}/libm.so\")") +install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink \"libc.a\" \"${CMAKE_INSTALL_LIBDIR}/libpthread.a\")") +install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink \"libc.so\" \"${CMAKE_INSTALL_LIBDIR}/libpthread.so\")") + set_target_properties(libc-static PROPERTIES OUTPUT_NAME libc) set_target_properties(libc-shared PROPERTIES OUTPUT_NAME libc) diff --git a/userspace/libraries/LibDL/CMakeLists.txt b/userspace/libraries/LibDL/CMakeLists.txt deleted file mode 100644 index 5c00785b..00000000 --- a/userspace/libraries/LibDL/CMakeLists.txt +++ /dev/null @@ -1,18 +0,0 @@ -set(SOURCES - dummy.cpp -) - -add_library(libdl-static STATIC ${SOURCES}) -add_library(libdl-shared SHARED ${SOURCES}) - -target_link_options(libdl-static PRIVATE -nolibc) -target_link_options(libdl-shared PRIVATE -nolibc) - -banan_link_library(libdl-static libc) -banan_link_library(libdl-shared libc) - -set_target_properties(libdl-static PROPERTIES OUTPUT_NAME libdl) -set_target_properties(libdl-shared PROPERTIES OUTPUT_NAME libdl) - -install(TARGETS libdl-static OPTIONAL) -install(TARGETS libdl-shared OPTIONAL) diff --git a/userspace/libraries/LibDL/dummy.cpp b/userspace/libraries/LibDL/dummy.cpp deleted file mode 100644 index e69de29b..00000000 diff --git a/userspace/libraries/LibMath/CMakeLists.txt b/userspace/libraries/LibMath/CMakeLists.txt deleted file mode 100644 index 0fd70281..00000000 --- a/userspace/libraries/LibMath/CMakeLists.txt +++ /dev/null @@ -1,18 +0,0 @@ -set(SOURCES - dummy.cpp -) - -add_library(libmath-static STATIC ${SOURCES}) -add_library(libmath-shared SHARED ${SOURCES}) - -target_link_options(libmath-static PRIVATE -nolibc) -target_link_options(libmath-shared PRIVATE -nolibc) - -banan_link_library(libmath-static libc) -banan_link_library(libmath-shared libc) - -set_target_properties(libmath-static PROPERTIES OUTPUT_NAME libm) -set_target_properties(libmath-shared PROPERTIES OUTPUT_NAME libm) - -install(TARGETS libmath-static OPTIONAL) -install(TARGETS libmath-shared OPTIONAL) diff --git a/userspace/libraries/LibMath/dummy.cpp b/userspace/libraries/LibMath/dummy.cpp deleted file mode 100644 index e69de29b..00000000 diff --git a/userspace/libraries/LibPthread/CMakeLists.txt b/userspace/libraries/LibPthread/CMakeLists.txt deleted file mode 100644 index a1fedfa0..00000000 --- a/userspace/libraries/LibPthread/CMakeLists.txt +++ /dev/null @@ -1,18 +0,0 @@ -set(SOURCES - dummy.cpp -) - -add_library(libpthread-static STATIC ${SOURCES}) -add_library(libpthread-shared SHARED ${SOURCES}) - -target_link_options(libpthread-static PRIVATE -nolibc) -target_link_options(libpthread-shared PRIVATE -nolibc) - -banan_link_library(libpthread-static libc) -banan_link_library(libpthread-shared libc) - -set_target_properties(libpthread-static PROPERTIES OUTPUT_NAME libpthread) -set_target_properties(libpthread-shared PROPERTIES OUTPUT_NAME libpthread) - -install(TARGETS libpthread-static OPTIONAL) -install(TARGETS libpthread-shared OPTIONAL) diff --git a/userspace/libraries/LibPthread/dummy.cpp b/userspace/libraries/LibPthread/dummy.cpp deleted file mode 100644 index e69de29b..00000000