From b22db23aee11f3b940e4674408b03beb5d4d51d0 Mon Sep 17 00:00:00 2001 From: Michael Date: Tue, 15 Feb 2022 14:12:21 +0100 Subject: Define CLANG_FORMAT_VERSION in install_deps.sh When running `./blender/build_files/build_environment/install_deps.sh` on Ubuntu 20.04.3 LTS the following error can be seen: ``` ./blender/build_files/build_environment/install_deps.sh: line 1266: [: too many arguments ``` This error results from the call: ``` check_package_version_ge_DEB $CLANG_FORMAT $CLANG_FORMAT_VERSION ``` with `CLANG_FORMAT_VERSION` being undefined. Also as `clang-format` 13 is already released and hopefully didn't break anything `CLANG_FORMAT_VERSION_MEX` could use version bump. Reviewed By: mont29 Differential Revision: https://developer.blender.org/D13924 --- build_files/build_environment/install_deps.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'build_files') diff --git a/build_files/build_environment/install_deps.sh b/build_files/build_environment/install_deps.sh index bb412524401..3d0f6cacb56 100755 --- a/build_files/build_environment/install_deps.sh +++ b/build_files/build_environment/install_deps.sh @@ -360,8 +360,9 @@ USE_CXX11=true # XXX_VERSION_SHORT is used for various things, like preferred version (when distribution provides several of them), # and to name shortcuts to built libraries' installation directories... +CLANG_FORMAT_VERSION="10.0" CLANG_FORMAT_VERSION_MIN="6.0" -CLANG_FORMAT_VERSION_MEX="10.0" +CLANG_FORMAT_VERSION_MEX="14.0" PYTHON_VERSION="3.10.2" PYTHON_VERSION_SHORT="3.10" -- cgit v1.2.3