From 126cbce632d50c528482ba2a34021c614d2ee305 Mon Sep 17 00:00:00 2001 From: Timothy Flynn Date: Mon, 3 Jun 2024 20:06:42 -0400 Subject: [PATCH] Meta: Remove empty LibSystem library and references --- Documentation/QtCreatorConfiguration.md | 1 - Meta/Lagom/CMakeLists.txt | 8 +------- .../gn/secondary/Userland/Libraries/LibCore/BUILD.gn | 6 +----- .../secondary/Userland/Libraries/LibSystem/BUILD.gn | 3 --- Userland/Libraries/CMakeLists.txt | 1 - Userland/Libraries/LibCore/CMakeLists.txt | 5 ++--- Userland/Libraries/LibCore/SessionManagement.cpp | 12 ------------ Userland/Libraries/LibCore/System.cpp | 1 - 8 files changed, 4 insertions(+), 33 deletions(-) delete mode 100644 Meta/gn/secondary/Userland/Libraries/LibSystem/BUILD.gn diff --git a/Documentation/QtCreatorConfiguration.md b/Documentation/QtCreatorConfiguration.md index d10db054084..02b0bd29faf 100644 --- a/Documentation/QtCreatorConfiguration.md +++ b/Documentation/QtCreatorConfiguration.md @@ -28,7 +28,6 @@ First, make sure you have a working toolchain and can build and run SerenityOS. ./ Userland/ Userland/Libraries/ - Userland/Libraries/LibSystem/ Userland/Services/ Toolchain/Local/x86_64/x86_64-pc-serenity/include/c++/13.1.0 Build/x86_64/ diff --git a/Meta/Lagom/CMakeLists.txt b/Meta/Lagom/CMakeLists.txt index f8c620f21d2..ef0ebbd0b2c 100644 --- a/Meta/Lagom/CMakeLists.txt +++ b/Meta/Lagom/CMakeLists.txt @@ -327,18 +327,12 @@ add_lagom_library_install_rules(JSClangPlugin) # Create mostly empty targets for system libraries we don't need to build for Lagom add_library(LibC INTERFACE) add_library(LibCrypt INTERFACE) -add_library(LibSystem INTERFACE) if (NOT APPLE AND NOT ANDROID AND NOT EMSCRIPTEN AND NOT ${CMAKE_SYSTEM_NAME} MATCHES "OpenBSD" AND NOT HAIKU) target_link_libraries(LibCrypt INTERFACE crypt) # LibCore::Account uses crypt() but it's not in libcrypt on macOS endif() -if (SERENITYOS) - # Serenity only allows syscalls from LibSystem, so if someone asks for that on Lagom, - # we need to pass that through to the system's LibSystem. - target_link_libraries(LibSystem INTERFACE system) -endif() add_library(NoCoverage INTERFACE) # "install" these special targets to placate CMake -install(TARGETS LibC LibCrypt LibSystem NoCoverage EXPORT LagomTargets) +install(TARGETS LibC LibCrypt NoCoverage EXPORT LagomTargets) # AK add_serenity_subdirectory(AK) diff --git a/Meta/gn/secondary/Userland/Libraries/LibCore/BUILD.gn b/Meta/gn/secondary/Userland/Libraries/LibCore/BUILD.gn index ce7e662ed6c..f6c713a1fac 100644 --- a/Meta/gn/secondary/Userland/Libraries/LibCore/BUILD.gn +++ b/Meta/gn/secondary/Userland/Libraries/LibCore/BUILD.gn @@ -31,10 +31,7 @@ shared_library("minimal") { "Version.h", ] - deps = [ - "//AK", - "//Userland/Libraries/LibSystem", - ] + deps = [ "//AK" ] } source_set("sources") { @@ -170,7 +167,6 @@ shared_library("LibCore") { ":sources", "//Meta/gn/build/libs/crypt", "//Meta/gn/build/libs/pthread", - "//Userland/Libraries/LibSystem", "//Userland/Libraries/LibTimeZone", "//Userland/Libraries/LibURL", ] diff --git a/Meta/gn/secondary/Userland/Libraries/LibSystem/BUILD.gn b/Meta/gn/secondary/Userland/Libraries/LibSystem/BUILD.gn deleted file mode 100644 index 14d6674b352..00000000000 --- a/Meta/gn/secondary/Userland/Libraries/LibSystem/BUILD.gn +++ /dev/null @@ -1,3 +0,0 @@ -group("LibSystem") { - deps = [] -} diff --git a/Userland/Libraries/CMakeLists.txt b/Userland/Libraries/CMakeLists.txt index 0db68bd9a8c..6a9bf7abbdf 100644 --- a/Userland/Libraries/CMakeLists.txt +++ b/Userland/Libraries/CMakeLists.txt @@ -29,7 +29,6 @@ add_subdirectory(LibRIFF) add_subdirectory(LibSanitizer) add_subdirectory(LibSQL) add_subdirectory(LibSyntax) -add_subdirectory(LibSystem) add_subdirectory(LibTest) add_subdirectory(LibTextCodec) add_subdirectory(LibThreading) diff --git a/Userland/Libraries/LibCore/CMakeLists.txt b/Userland/Libraries/LibCore/CMakeLists.txt index 5ce7d2492c2..6dbf1e0a645 100644 --- a/Userland/Libraries/LibCore/CMakeLists.txt +++ b/Userland/Libraries/LibCore/CMakeLists.txt @@ -15,10 +15,9 @@ set(SOURCES ) serenity_lib(LibCoreMinimal coreminimal) -target_link_libraries(LibCoreMinimal PRIVATE LibSystem) if (SERENITYOS) - add_library(DynamicLoader_LibCoreArgsParser + add_library(DynamicLoader_LibCoreArgsParser ArgsParser.cpp Version.cpp) target_link_libraries(DynamicLoader_LibCoreArgsParser PUBLIC DynamicLoader_CompileOptions) @@ -93,7 +92,7 @@ if (APPLE OR CMAKE_SYSTEM_NAME STREQUAL "GNU") endif() serenity_lib(LibCore core) -target_link_libraries(LibCore PRIVATE LibCrypt LibSystem LibTimeZone LibURL) +target_link_libraries(LibCore PRIVATE LibCrypt LibTimeZone LibURL) target_link_libraries(LibCore PUBLIC LibCoreMinimal) if (APPLE) diff --git a/Userland/Libraries/LibCore/SessionManagement.cpp b/Userland/Libraries/LibCore/SessionManagement.cpp index 6ec367c3a69..e33900ab5de 100644 --- a/Userland/Libraries/LibCore/SessionManagement.cpp +++ b/Userland/Libraries/LibCore/SessionManagement.cpp @@ -8,23 +8,11 @@ #include #include -#ifdef AK_OS_SERENITY -# include -#endif - namespace Core::SessionManagement { ErrorOr root_session_id([[maybe_unused]] Optional force_sid) { -#ifdef AK_OS_SERENITY - int rc = syscall(SC_get_root_session_id, force_sid.value_or(-1)); - if (rc < 0) { - return Error::from_syscall("get_root_session_id"sv, rc); - } - return static_cast(rc); -#else return 0; -#endif } ErrorOr logout(Optional force_sid) diff --git a/Userland/Libraries/LibCore/System.cpp b/Userland/Libraries/LibCore/System.cpp index 07ce89f39c3..f26d3393850 100644 --- a/Userland/Libraries/LibCore/System.cpp +++ b/Userland/Libraries/LibCore/System.cpp @@ -31,7 +31,6 @@ #ifdef AK_OS_SERENITY # include # include -# include # include # include # include