From 22d6948f3dac4bb35da2a285ccf6ec6809baffdc Mon Sep 17 00:00:00 2001 From: "alexey.lysiuk" Date: Sun, 10 Jul 2022 10:51:33 +0300 Subject: [PATCH] aedi: move zstd to tier 3 --- aedi/target/__init__.py | 2 +- aedi/target/library_tier2.py | 18 ------------------ aedi/target/library_tier3.py | 18 ++++++++++++++++++ 3 files changed, 19 insertions(+), 19 deletions(-) diff --git a/aedi/target/__init__.py b/aedi/target/__init__.py index 7dcdc2d0..8f3cd116 100644 --- a/aedi/target/__init__.py +++ b/aedi/target/__init__.py @@ -88,7 +88,6 @@ def targets(): VulkanLoaderTarget(), WebpTarget(), XmpTarget(), - ZstdTarget(), # Obsolete libraries without binaries BrotliTarget(), @@ -103,6 +102,7 @@ def targets(): SfmlTarget(), TiffTarget(), WxWidgetsTarget(), + ZstdTarget(), # Tools BuildCMakeTarget(), diff --git a/aedi/target/library_tier2.py b/aedi/target/library_tier2.py index 8595c5ff..d3a85c2b 100644 --- a/aedi/target/library_tier2.py +++ b/aedi/target/library_tier2.py @@ -427,21 +427,3 @@ class XmpTarget(ConfigureMakeStaticDependencyTarget): def configure(self, state: BuildState): state.options['--enable-static'] = None super().configure(state) - - -class ZstdTarget(CMakeStaticDependencyTarget): - def __init__(self, name='zstd'): - super().__init__(name) - self.src_root = 'build/cmake' - - def prepare_source(self, state: BuildState): - state.download_source( - 'https://github.com/facebook/zstd/releases/download/v1.5.0/zstd-1.5.0.tar.gz', - '5194fbfa781fcf45b98c5e849651aa7b3b0a008c6b72d4a0db760f3002291e94') - - def configure(self, state: BuildState): - opts = state.options - opts['ZSTD_BUILD_PROGRAMS'] = 'NO' - opts['ZSTD_BUILD_SHARED'] = 'NO' - - super().configure(state) diff --git a/aedi/target/library_tier3.py b/aedi/target/library_tier3.py index 2ce7974a..80a8ef5b 100644 --- a/aedi/target/library_tier3.py +++ b/aedi/target/library_tier3.py @@ -387,3 +387,21 @@ class WxWidgetsTarget(CMakeStaticDependencyTarget): wx_config_path = state.install_path / 'bin/wx-config' self.update_text_file(wx_config_path, patch_wx_config) + + +class ZstdTarget(CMakeStaticDependencyTarget): + def __init__(self, name='zstd'): + super().__init__(name) + self.src_root = 'build/cmake' + + def prepare_source(self, state: BuildState): + state.download_source( + 'https://github.com/facebook/zstd/releases/download/v1.5.0/zstd-1.5.0.tar.gz', + '5194fbfa781fcf45b98c5e849651aa7b3b0a008c6b72d4a0db760f3002291e94') + + def configure(self, state: BuildState): + opts = state.options + opts['ZSTD_BUILD_PROGRAMS'] = 'NO' + opts['ZSTD_BUILD_SHARED'] = 'NO' + + super().configure(state)