From 8d3d3a3dd8bda9f132dc3f15106c2f11bf22438b Mon Sep 17 00:00:00 2001 From: Paul Cristian Sarbu Date: Fri, 29 Sep 2023 16:41:24 +0200 Subject: bootstrap: Add libarchive dependency This is brought in by the tree-of-archive rpc of just serve. Also adds lzma and bzip2 as transitive dependencies. --- bin/bootstrap.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'bin/bootstrap.py') diff --git a/bin/bootstrap.py b/bin/bootstrap.py index 9f076c57..03fcbdd0 100755 --- a/bin/bootstrap.py +++ b/bin/bootstrap.py @@ -49,8 +49,10 @@ if 'JUST_BUILD_CONF' in os.environ: g_CONF = json.loads(os.environ['JUST_BUILD_CONF']) if "PACKAGE" in os.environ: - g_CONF["ADD_CFLAGS"] = ["-Wno-error", "-Wno-pedantic"] + g_CONF.get("ADD_CFLAGS", []) - g_CONF["ADD_CXXFLAGS"] = ["-Wno-error", "-Wno-pedantic"] + g_CONF.get("ADD_CXXFLAGS", []) + g_CONF["ADD_CFLAGS"] = ["-Wno-error", "-Wno-pedantic"] + g_CONF.get( + "ADD_CFLAGS", []) + g_CONF["ADD_CXXFLAGS"] = ["-Wno-error", "-Wno-pedantic"] + g_CONF.get( + "ADD_CXXFLAGS", []) ARCHS: Dict[str, str] = { 'i686': 'x86', @@ -405,6 +407,8 @@ def bootstrap() -> None: dirs.remove('serve_api') if 'other_tools' in dirs: dirs.remove('other_tools') + if 'archive' in dirs: + dirs.remove('archive') for f in files: if f.endswith(".cpp"): cpp_files.append(os.path.join(root, f)) -- cgit v1.2.3