mirror of
https://github.com/gentoo-mirror/guru.git
synced 2026-07-22 21:43:03 -04:00
a1e7e45ebd
These three patches were present on the 0.0.34 ebuild but needed minor changes to be applied to 0.0.37. I've also applied them to the live ebuild this time, as they were not before. The patches for both ebuilds are currently identical but kept in distinct versioned files for easier handling in case they diverge in the future. Signed-off-by: Erica Nebula <EricaNebula@Proton.me>
22 lines
743 B
Diff
22 lines
743 B
Diff
Unbundle zstd.
|
|
--- a/3rdparty/CMakeLists.txt
|
|
+++ b/3rdparty/CMakeLists.txt
|
|
@@ -20,7 +20,8 @@ add_library(3rdparty_dummy_lib INTERFACE)
|
|
add_subdirectory(zlib EXCLUDE_FROM_ALL)
|
|
|
|
# ZSTD
|
|
-add_subdirectory(zstd EXCLUDE_FROM_ALL)
|
|
+pkg_check_modules(zstd REQUIRED IMPORTED_TARGET GLOBAL libzstd)
|
|
+add_library(3rdparty::zstd ALIAS PkgConfig::zstd)
|
|
|
|
# 7zip sdk
|
|
add_subdirectory(7zip EXCLUDE_FROM_ALL)
|
|
@@ -350,7 +351,6 @@ else()
|
|
add_library(3rdparty::libusb ALIAS usb-1.0-static)
|
|
endif()
|
|
add_library(3rdparty::zlib ALIAS 3rdparty_zlib)
|
|
-add_library(3rdparty::zstd ALIAS 3rdparty_zstd)
|
|
add_library(3rdparty::7zip ALIAS 3rdparty_7zip)
|
|
add_library(3rdparty::flatbuffers ALIAS 3rdparty_flatbuffers)
|
|
add_library(3rdparty::pugixml ALIAS pugixml)
|