Commit: b22db23aee11f3b940e4674408b03beb5d4d51d0 Author: Michael Date: Tue Feb 15 14:12:21 2022 +0100 Branches: master https://developer.blender.org/rBb22db23aee11f3b940e4674408b03beb5d4d51d0
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 =================================================================== M build_files/build_environment/install_deps.sh =================================================================== 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" _______________________________________________ Bf-blender-cvs mailing list [email protected] List details, subscription details or unsubscribe: https://lists.blender.org/mailman/listinfo/bf-blender-cvs
