pengjunjie/build_tools
1
0
Fork 1
mirror of https://github.com/ONLYOFFICE/build_tools.git synced 2026-04-07 14:06:31 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request 'Remove libnuma dependency on linux' (#131) from fix/libheif into release/v9.1.0

Browse Source 
Reviewed-on: https://git.onlyoffice.com/ONLYOFFICE/build_tools/pulls/131
This commit is contained in:
Oleg Korshul
2025-09-30 09:22:08 +00:00
parent 894f23b292 3ad5b9d05d
commit 7b31d85c7c
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
scripts/core_common/modules/heif.py
View File

@ -38,13 +38,13 @@ def setup_custom_sysroot_env() -> str:
env_vars += ['CFLAGS=\"' + "--sysroot=" + config.option("sysroot") + "\""] env_vars += ['CFLAGS=\"' + "--sysroot=" + config.option("sysroot") + "\""]
env_vars += ['CXXFLAGS=\"' + "--sysroot=" + config.option("sysroot") + "\""] env_vars += ['CXXFLAGS=\"' + "--sysroot=" + config.option("sysroot") + "\""]
env_vars += ['LDFLAGS=\"' + "--sysroot=" + config.option("sysroot") + "\""] env_vars += ['LDFLAGS=\"' + "--sysroot=" + config.option("sysroot") + "\""]
env_str = "" env_str = ""
for env_var in env_vars: for env_var in env_vars:
env_str += env_var + " " env_str += env_var + " "
return env_str return env_str
def get_vs_version(): def get_vs_version():
vs_version = "14 2015" vs_version = "14 2015"
if config.option("vs-version") == "2019": if config.option("vs-version") == "2019":
@ -124,13 +124,13 @@ def build_with_cmake(platform, cmake_args, build_type):
cmake_args_ext += get_cmake_args_android("x86", "16") cmake_args_ext += get_cmake_args_android("x86", "16")
elif platform == "android_x86_64": elif platform == "android_x86_64":
cmake_args_ext += get_cmake_args_android("x86_64", "21") cmake_args_ext += get_cmake_args_android("x86_64", "21")
# env setup for custom sysroot # env setup for custom sysroot
env_str = setup_custom_sysroot_env() if config.option("sysroot") != "" else "" env_str = setup_custom_sysroot_env() if config.option("sysroot") != "" else ""
# run cmake # run cmake
base.cmd(env_str + "cmake", cmake_args + cmake_args_ext) base.cmd(env_str + "cmake", cmake_args + cmake_args_ext)
# build # build
if "Unix Makefiles" in cmake_args_ext: if "Unix Makefiles" in cmake_args_ext:
base.cmd(env_str + "make", ["-j4"]) base.cmd(env_str + "make", ["-j4"])
@ -213,6 +213,7 @@ def make_x265(base_dir, build_type):
"-DENABLE_CLI=OFF", # do not build standalone CLI app "-DENABLE_CLI=OFF", # do not build standalone CLI app
"-DENABLE_SHARED=OFF", # do not build shared libs "-DENABLE_SHARED=OFF", # do not build shared libs
"-DENABLE_ASSEMBLY=OFF", # disable assembly optimizations "-DENABLE_ASSEMBLY=OFF", # disable assembly optimizations
"-DENABLE_LIBNUMA=OFF", # disable libnuma usage (affects Linux only)
] ]
# lib build function # lib build function