diff options
| author | Bastien Montagne <bastien@blender.org> | 2020-06-10 19:52:02 +0300 |
|---|---|---|
| committer | Bastien Montagne <bastien@blender.org> | 2020-06-10 20:45:52 +0300 |
| commit | 14bd92b12f0fa2382c7157ebc00f7adb644c2e85 (patch) | |
| tree | 29894dcf6e7d0278608ec5ee52c50a76d1ac5215 /build_files/build_environment | |
| parent | 91462fbb31baae85b7aa5e5a9ee3d70989ed93e1 (diff) | |
Installdeps: Fix broken commit rBe3396d8bfc94.
Not sure why final version of the change was lost...
Diffstat (limited to 'build_files/build_environment')
| -rwxr-xr-x | build_files/build_environment/install_deps.sh | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/build_files/build_environment/install_deps.sh b/build_files/build_environment/install_deps.sh index e4a916606fe..511ea341bb1 100755 --- a/build_files/build_environment/install_deps.sh +++ b/build_files/build_environment/install_deps.sh @@ -3428,7 +3428,7 @@ compile_XR_OpenXR_SDK() { # Install on DEB-like get_package_version_DEB() { - dpkg-query -W -f '${Version}' $1 | sed -r 's/([0-9]+:)?(([0-9]+\.?){$2}([0-9]+)).*/\2/' + dpkg-query -W -f '${Version}' $1 | sed -r 's/([0-9]+:)?(([0-9]+\.?)+([0-9]+)).*/\2/' } check_package_DEB() { @@ -3631,7 +3631,7 @@ install_DEB() { # Check cmake/glew versions and disable features for older distros. # This is so Blender can at least compile. PRINT "" - _cmake=`get_package_version_DEB cmake 3` + _cmake=`get_package_version_DEB cmake` version_ge $_cmake "2.8.10" if [ $? -eq 1 ]; then version_ge $_cmake "2.8.8" @@ -3646,7 +3646,7 @@ install_DEB() { fi PRINT "" - _glew=`get_package_version_DEB libglew-dev 3` + _glew=`get_package_version_DEB libglew-dev` if [ -z $_glew ]; then # Stupid virtual package in Ubuntu 12.04 doesn't show version number... _glew=`apt-cache showpkg libglew-dev|tail -n1|awk '{print $2}'|sed 's/-.*//'` @@ -3678,7 +3678,6 @@ install_DEB() { check_package_version_ge_DEB python3-dev $PYTHON_VERSION_MIN if [ $? -eq 0 ]; then PYTHON_VERSION_INSTALLED=$(echo `get_package_version_DEB python3-dev` | sed -r 's/^([0-9]+\.[0-9]+).*/\1/') - PRINT $(echo `get_package_version_DEB python3-dev` | sed -r 's/^([0-9]+\.[0-9]+).*/\1/') install_packages_DEB python3-dev clean_Python @@ -4302,8 +4301,7 @@ install_RPM() { else check_package_version_ge_RPM python3-devel $PYTHON_VERSION_MIN if [ $? -eq 0 ]; then - get_package_version_RPM python3-devel - PYTHON_VERSION_INSTALLED=`echo $? | sed -r 's/([0-9]+:)?(([0-9]+\.?)?([0-9]+)).*/\2/'` + PYTHON_VERSION_INSTALLED=$(echo `get_package_version_RPM python3-devel` | sed -r 's/^([0-9]+\.[0-9]+).*/\1/') install_packages_RPM python3-devel clean_Python @@ -4828,8 +4826,7 @@ install_ARCH() { else check_package_version_ge_ARCH python $PYTHON_VERSION_MIN if [ $? -eq 0 ]; then - get_package_version_ARCH python - PYTHON_VERSION_INSTALLED=`echo $? | sed -r 's/([0-9]+:)?(([0-9]+\.?)?([0-9]+)).*/\2/'` + PYTHON_VERSION_INSTALLED=$(echo `get_package_version_ARCH python` | sed -r 's/^([0-9]+\.[0-9]+).*/\1/') install_packages_ARCH python clean_Python |