From 8b7cf205528e1e5a4ff11208aedb469efdd0cbcb Mon Sep 17 00:00:00 2001 From: "alexey.lysiuk" Date: Sat, 26 Aug 2023 09:39:51 +0300 Subject: [PATCH] aedi: move highway target to tier 3 --- aedi/target/__init__.py | 2 +- aedi/target/library_tier1.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 e63f842d..0e6d6801 100644 --- a/aedi/target/__init__.py +++ b/aedi/target/__init__.py @@ -58,7 +58,6 @@ def targets(): FfiTarget(), FlacTarget(), GlibTarget(), - HighwayTarget(), IconvTarget(), IntlTarget(), JpegTurboTarget(), @@ -105,6 +104,7 @@ def targets(): FtglTarget(), GlewTarget(), HarfBuzzTarget(), + HighwayTarget(), LuaTarget(), LzmaTarget(), Sdl2TtfTarget(), diff --git a/aedi/target/library_tier1.py b/aedi/target/library_tier1.py index a46539e3..039cc203 100644 --- a/aedi/target/library_tier1.py +++ b/aedi/target/library_tier1.py @@ -175,24 +175,6 @@ class GlibTarget(base.MesonTarget): return 'exec_prefix=${prefix}\n' + line if line.startswith('libdir=') else line -class HighwayTarget(base.CMakeStaticDependencyTarget): - def __init__(self, name='highway'): - super().__init__(name) - - def prepare_source(self, state: BuildState): - state.download_source( - 'https://github.com/google/highway/archive/refs/tags/1.0.6.tar.gz', - 'd89664a045a41d822146e787bceeefbf648cc228ce354f347b18f2b419e57207') - - def configure(self, state: BuildState): - opts = state.options - opts['HWY_ENABLE_CONTRIB'] = 'NO' - opts['HWY_ENABLE_EXAMPLES'] = 'NO' - opts['HWY_ENABLE_TESTS'] = 'NO' - - super().configure(state) - - class IconvTarget(base.ConfigureMakeStaticDependencyTarget): def __init__(self, name='iconv'): super().__init__(name) diff --git a/aedi/target/library_tier3.py b/aedi/target/library_tier3.py index 0d4d74c8..ab8046d4 100644 --- a/aedi/target/library_tier3.py +++ b/aedi/target/library_tier3.py @@ -204,6 +204,24 @@ class HarfBuzzTarget(base.CMakeStaticDependencyTarget): libs_private='-lc++ -framework CoreFoundation -framework CoreGraphics -framework CoreText') +class HighwayTarget(base.CMakeStaticDependencyTarget): + def __init__(self, name='highway'): + super().__init__(name) + + def prepare_source(self, state: BuildState): + state.download_source( + 'https://github.com/google/highway/archive/refs/tags/1.0.6.tar.gz', + 'd89664a045a41d822146e787bceeefbf648cc228ce354f347b18f2b419e57207') + + def configure(self, state: BuildState): + opts = state.options + opts['HWY_ENABLE_CONTRIB'] = 'NO' + opts['HWY_ENABLE_EXAMPLES'] = 'NO' + opts['HWY_ENABLE_TESTS'] = 'NO' + + super().configure(state) + + class LuaTarget(base.MakeTarget): def __init__(self, name='lua'): super().__init__(name)