diff options
| -rwxr-xr-x | bin/bootstrap.py | 8 | ||||
| -rw-r--r-- | etc/repos.json | 8 | ||||
| -rw-r--r-- | test/bootstrap/TARGETS | 1 |
3 files changed, 12 insertions, 5 deletions
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)) diff --git a/etc/repos.json b/etc/repos.json index b828ca60..ad04cca7 100644 --- a/etc/repos.json +++ b/etc/repos.json @@ -16,6 +16,8 @@ , "protoc": "protobuf" , "libcurl": "com_github_curl_curl" , "libarchive": "com_github_libarchive_libarchive" + , "lzma": "lzma" + , "bzip2": "bzip2" } , "bootstrap": {"link": ["-pthread"]} , "bootstrap_local": {"link": ["-pthread"]} @@ -57,6 +59,9 @@ , "com_github_cares_cares" , "com_github_grpc_grpc" , "com_github_libgit2_libgit2" + , "com_github_libarchive_libarchive" + , "lzma" + , "bzip2" ] } , "target_root": "import targets" @@ -332,7 +337,6 @@ , "target_root": "import targets" , "target_file_name": "TARGETS.bzip2" , "bindings": {"rules": "rules-bzip2"} - , "bootstrap": {"drop": true} } , "lzma": { "repository": @@ -346,7 +350,6 @@ , "target_root": "import targets" , "target_file_name": "TARGETS.lzma" , "bindings": {"rules": "rules-lzma"} - , "bootstrap": {"drop": true} } , "re2": { "repository": @@ -471,7 +474,6 @@ , "bzip2": "bzip2" , "lzma": "lzma" } - , "bootstrap": {"drop": true} } } } diff --git a/test/bootstrap/TARGETS b/test/bootstrap/TARGETS index 039dec92..1bf2c431 100644 --- a/test/bootstrap/TARGETS +++ b/test/bootstrap/TARGETS @@ -61,6 +61,7 @@ , ["@", "protoc", "", "libprotobuf"] , ["@", "grpc", "", "grpc++"] , ["@", "grpc", "", "grpc_cpp_plugin"] + , ["@", "src", "", "libarchive"] ] } , "just_other_deps": |