From aa0a6d58b2fd3c92b07aa46eea80c9718192c242 Mon Sep 17 00:00:00 2001 From: Timothy Flynn Date: Sun, 21 Jan 2024 18:37:08 -0500 Subject: [PATCH] Userland: Remove LibCore dependency from libraries that do not use it --- Meta/gn/secondary/Userland/Libraries/LibGL/BUILD.gn | 1 - Meta/gn/secondary/Userland/Libraries/LibGPU/BUILD.gn | 5 +---- Meta/gn/secondary/Userland/Libraries/LibJIT/BUILD.gn | 5 +---- Meta/gn/secondary/Userland/Libraries/LibLocale/BUILD.gn | 1 - Meta/gn/secondary/Userland/Libraries/LibPDF/BUILD.gn | 1 - Meta/gn/secondary/Userland/Libraries/LibRIFF/BUILD.gn | 5 +---- Meta/gn/secondary/Userland/Libraries/LibRegex/BUILD.gn | 1 - Meta/gn/secondary/Userland/Libraries/LibUnicode/BUILD.gn | 6 ++---- Userland/Libraries/LibDNS/CMakeLists.txt | 2 +- Userland/Libraries/LibDSP/CMakeLists.txt | 1 - Userland/Libraries/LibDeviceTree/CMakeLists.txt | 1 - Userland/Libraries/LibGL/CMakeLists.txt | 2 +- Userland/Libraries/LibGPU/CMakeLists.txt | 2 +- Userland/Libraries/LibJIT/CMakeLists.txt | 1 - Userland/Libraries/LibLocale/CMakeLists.txt | 4 ++-- Userland/Libraries/LibPDF/CMakeLists.txt | 2 +- Userland/Libraries/LibRIFF/CMakeLists.txt | 1 - Userland/Libraries/LibRegex/CMakeLists.txt | 2 +- Userland/Libraries/LibUnicode/CMakeLists.txt | 1 - 19 files changed, 12 insertions(+), 32 deletions(-) diff --git a/Meta/gn/secondary/Userland/Libraries/LibGL/BUILD.gn b/Meta/gn/secondary/Userland/Libraries/LibGL/BUILD.gn index ec8ffa5bb9..84e49fea9e 100644 --- a/Meta/gn/secondary/Userland/Libraries/LibGL/BUILD.gn +++ b/Meta/gn/secondary/Userland/Libraries/LibGL/BUILD.gn @@ -50,7 +50,6 @@ shared_library("LibGL") { deps = [ ":generate_glapi", "//AK", - "//Userland/Libraries/LibCore", "//Userland/Libraries/LibGLSL", "//Userland/Libraries/LibGPU", "//Userland/Libraries/LibGfx", diff --git a/Meta/gn/secondary/Userland/Libraries/LibGPU/BUILD.gn b/Meta/gn/secondary/Userland/Libraries/LibGPU/BUILD.gn index 25005e0cb7..2ca1f5da89 100644 --- a/Meta/gn/secondary/Userland/Libraries/LibGPU/BUILD.gn +++ b/Meta/gn/secondary/Userland/Libraries/LibGPU/BUILD.gn @@ -5,10 +5,7 @@ shared_library("LibGPU") { "Driver.cpp", "Image.cpp", ] - deps = [ - "//AK", - "//Userland/Libraries/LibCore", - ] + deps = [ "//AK" ] # FIXME: express this dependency properly to avoid cycles # we want to make sure that LibSoftGPU is built when LibGPU is needed diff --git a/Meta/gn/secondary/Userland/Libraries/LibJIT/BUILD.gn b/Meta/gn/secondary/Userland/Libraries/LibJIT/BUILD.gn index c8f0791ee4..acd45f974a 100644 --- a/Meta/gn/secondary/Userland/Libraries/LibJIT/BUILD.gn +++ b/Meta/gn/secondary/Userland/Libraries/LibJIT/BUILD.gn @@ -7,10 +7,7 @@ shared_library("LibJIT") { "GDB.cpp", "GDB.h", ] - deps = [ - "//AK", - "//Userland/Libraries/LibCore", - ] + deps = [ "//AK" ] if (current_os == "mac") { sources += [ "GDBUnsupported.cpp" ] diff --git a/Meta/gn/secondary/Userland/Libraries/LibLocale/BUILD.gn b/Meta/gn/secondary/Userland/Libraries/LibLocale/BUILD.gn index 6574e4eeaf..3d69c29bde 100644 --- a/Meta/gn/secondary/Userland/Libraries/LibLocale/BUILD.gn +++ b/Meta/gn/secondary/Userland/Libraries/LibLocale/BUILD.gn @@ -179,7 +179,6 @@ source_set("LibLocale") { ] deps = [ "//AK", - "//Userland/Libraries/LibCore", "//Userland/Libraries/LibUnicode", ] if (enable_unicode_database_download) { diff --git a/Meta/gn/secondary/Userland/Libraries/LibPDF/BUILD.gn b/Meta/gn/secondary/Userland/Libraries/LibPDF/BUILD.gn index 882dd11d7d..b48bd384b8 100644 --- a/Meta/gn/secondary/Userland/Libraries/LibPDF/BUILD.gn +++ b/Meta/gn/secondary/Userland/Libraries/LibPDF/BUILD.gn @@ -28,7 +28,6 @@ shared_library("LibPDF") { deps = [ "//AK", "//Userland/Libraries/LibCompress", - "//Userland/Libraries/LibCore", "//Userland/Libraries/LibCrypto", "//Userland/Libraries/LibGfx", "//Userland/Libraries/LibIPC", diff --git a/Meta/gn/secondary/Userland/Libraries/LibRIFF/BUILD.gn b/Meta/gn/secondary/Userland/Libraries/LibRIFF/BUILD.gn index c9fc5a6515..fea37c59a8 100644 --- a/Meta/gn/secondary/Userland/Libraries/LibRIFF/BUILD.gn +++ b/Meta/gn/secondary/Userland/Libraries/LibRIFF/BUILD.gn @@ -12,8 +12,5 @@ shared_library("LibRIFF") { "RIFF.h", ] - deps = [ - "//AK", - "//Userland/Libraries/LibCore", - ] + deps = [ "//AK" ] } diff --git a/Meta/gn/secondary/Userland/Libraries/LibRegex/BUILD.gn b/Meta/gn/secondary/Userland/Libraries/LibRegex/BUILD.gn index f9a57ec988..6806006d7b 100644 --- a/Meta/gn/secondary/Userland/Libraries/LibRegex/BUILD.gn +++ b/Meta/gn/secondary/Userland/Libraries/LibRegex/BUILD.gn @@ -13,7 +13,6 @@ shared_library("LibRegex") { } deps = [ "//AK", - "//Userland/Libraries/LibCore", "//Userland/Libraries/LibUnicode", ] } diff --git a/Meta/gn/secondary/Userland/Libraries/LibUnicode/BUILD.gn b/Meta/gn/secondary/Userland/Libraries/LibUnicode/BUILD.gn index 32e818cd55..d65e87f5e5 100644 --- a/Meta/gn/secondary/Userland/Libraries/LibUnicode/BUILD.gn +++ b/Meta/gn/secondary/Userland/Libraries/LibUnicode/BUILD.gn @@ -177,10 +177,8 @@ source_set("LibUnicode") { "URL.cpp", "UnicodeUtils.cpp", ] - deps = [ - "//AK", - "//Userland/Libraries/LibCore", - ] + deps = [ "//AK" ] + if (enable_unicode_database_download) { deps += [ ":generate_emoji_sources", diff --git a/Userland/Libraries/LibDNS/CMakeLists.txt b/Userland/Libraries/LibDNS/CMakeLists.txt index b449de5fd6..327558725b 100644 --- a/Userland/Libraries/LibDNS/CMakeLists.txt +++ b/Userland/Libraries/LibDNS/CMakeLists.txt @@ -5,4 +5,4 @@ set(SOURCES ) serenity_lib(LibDNS dns) -target_link_libraries(LibDNS PRIVATE LibCore LibIPC) +target_link_libraries(LibDNS PRIVATE LibIPC) diff --git a/Userland/Libraries/LibDSP/CMakeLists.txt b/Userland/Libraries/LibDSP/CMakeLists.txt index a56f4262a5..c43fe41ee8 100644 --- a/Userland/Libraries/LibDSP/CMakeLists.txt +++ b/Userland/Libraries/LibDSP/CMakeLists.txt @@ -7,4 +7,3 @@ set(SOURCES ) serenity_lib(LibDSP dsp) -target_link_libraries(LibDSP PRIVATE LibCore) diff --git a/Userland/Libraries/LibDeviceTree/CMakeLists.txt b/Userland/Libraries/LibDeviceTree/CMakeLists.txt index 16db2e0aec..6ab6fc7380 100644 --- a/Userland/Libraries/LibDeviceTree/CMakeLists.txt +++ b/Userland/Libraries/LibDeviceTree/CMakeLists.txt @@ -5,4 +5,3 @@ set(SOURCES ) serenity_lib(LibDeviceTree DeviceTree) -target_link_libraries(LibDeviceTree PRIVATE LibCore) diff --git a/Userland/Libraries/LibGL/CMakeLists.txt b/Userland/Libraries/LibGL/CMakeLists.txt index d9235adb54..731eddfda7 100644 --- a/Userland/Libraries/LibGL/CMakeLists.txt +++ b/Userland/Libraries/LibGL/CMakeLists.txt @@ -26,4 +26,4 @@ set(GENERATED_SOURCES GLAPI.cpp) serenity_lib(LibGL gl) -target_link_libraries(LibGL PRIVATE LibCore LibGfx LibGLSL LibGPU) +target_link_libraries(LibGL PRIVATE LibGfx LibGLSL LibGPU) diff --git a/Userland/Libraries/LibGPU/CMakeLists.txt b/Userland/Libraries/LibGPU/CMakeLists.txt index 2a34e78497..352154434d 100644 --- a/Userland/Libraries/LibGPU/CMakeLists.txt +++ b/Userland/Libraries/LibGPU/CMakeLists.txt @@ -4,7 +4,7 @@ set(SOURCES ) serenity_lib(LibGPU gpu) -target_link_libraries(LibGPU PRIVATE LibCore ${CMAKE_DL_LIBS}) +target_link_libraries(LibGPU PRIVATE ${CMAKE_DL_LIBS}) add_dependencies(LibGPU LibSoftGPU) diff --git a/Userland/Libraries/LibJIT/CMakeLists.txt b/Userland/Libraries/LibJIT/CMakeLists.txt index 9f49619391..57c3807f7e 100644 --- a/Userland/Libraries/LibJIT/CMakeLists.txt +++ b/Userland/Libraries/LibJIT/CMakeLists.txt @@ -12,4 +12,3 @@ serenity_lib(LibJIT jit) if(NOT APPLE AND NOT WIN32 AND NOT EMSCRIPTEN) target_link_libraries(LibJIT PRIVATE LibELF) endif() -target_link_libraries(LibJIT PRIVATE LibCore) diff --git a/Userland/Libraries/LibLocale/CMakeLists.txt b/Userland/Libraries/LibLocale/CMakeLists.txt index 88cca29b90..911faa6940 100644 --- a/Userland/Libraries/LibLocale/CMakeLists.txt +++ b/Userland/Libraries/LibLocale/CMakeLists.txt @@ -10,7 +10,7 @@ if (DEFINED LOCALE_DATA_SOURCES) serenity_generated_sources(LibLocaleData) endif() target_compile_options(LibLocaleData PRIVATE -g0 -Os -Wno-parentheses-equality) - target_link_libraries(LibLocaleData PRIVATE LibCore LibTimeZone) + target_link_libraries(LibLocaleData PRIVATE LibTimeZone) unset(GENERATED_SOURCES) endif() @@ -23,7 +23,7 @@ set(SOURCES ) serenity_lib(LibLocale locale) -target_link_libraries(LibLocale PRIVATE LibCore LibUnicode) +target_link_libraries(LibLocale PRIVATE LibUnicode) target_compile_definitions(LibLocale PRIVATE ENABLE_UNICODE_DATA=$) if (DEFINED LOCALE_DATA_SOURCES) diff --git a/Userland/Libraries/LibPDF/CMakeLists.txt b/Userland/Libraries/LibPDF/CMakeLists.txt index dfa45c224e..2e1b456c8c 100644 --- a/Userland/Libraries/LibPDF/CMakeLists.txt +++ b/Userland/Libraries/LibPDF/CMakeLists.txt @@ -26,4 +26,4 @@ set(SOURCES ) serenity_lib(LibPDF pdf) -target_link_libraries(LibPDF PRIVATE LibCore LibCompress LibIPC LibGfx LibTextCodec LibCrypto) +target_link_libraries(LibPDF PRIVATE LibCompress LibIPC LibGfx LibTextCodec LibCrypto) diff --git a/Userland/Libraries/LibRIFF/CMakeLists.txt b/Userland/Libraries/LibRIFF/CMakeLists.txt index e0c91f5c28..1de53fe04a 100644 --- a/Userland/Libraries/LibRIFF/CMakeLists.txt +++ b/Userland/Libraries/LibRIFF/CMakeLists.txt @@ -4,4 +4,3 @@ set(SOURCES ) serenity_lib(LibRIFF riff) -target_link_libraries(LibRIFF PRIVATE LibCore) diff --git a/Userland/Libraries/LibRegex/CMakeLists.txt b/Userland/Libraries/LibRegex/CMakeLists.txt index 3cb2a5660f..7c4d8cd687 100644 --- a/Userland/Libraries/LibRegex/CMakeLists.txt +++ b/Userland/Libraries/LibRegex/CMakeLists.txt @@ -11,4 +11,4 @@ if(SERENITYOS) endif() serenity_lib(LibRegex regex) -target_link_libraries(LibRegex PRIVATE LibCore LibUnicode) +target_link_libraries(LibRegex PRIVATE LibUnicode) diff --git a/Userland/Libraries/LibUnicode/CMakeLists.txt b/Userland/Libraries/LibUnicode/CMakeLists.txt index 3a6e44ffab..45ac83182c 100644 --- a/Userland/Libraries/LibUnicode/CMakeLists.txt +++ b/Userland/Libraries/LibUnicode/CMakeLists.txt @@ -16,5 +16,4 @@ set(SOURCES set(GENERATED_SOURCES ${CURRENT_LIB_GENERATED}) serenity_lib(LibUnicode unicode) -target_link_libraries(LibUnicode PRIVATE LibCore) target_compile_definitions(LibUnicode PRIVATE ENABLE_UNICODE_DATA=$)