Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNathan Craddock <nzcraddock@gmail.com>2019-08-29 19:16:13 +0300
committerNathan Craddock <nzcraddock@gmail.com>2019-08-29 20:15:43 +0300
commit33cd0535a0d31d9d558b0aa639c9dd5ad299676a (patch)
tree7a578b6eec6af8bfd6078ee430b4ab6675e0889b
parent5c7852ef9c6a77062adc3754258b181379e05f43 (diff)
Build: install_deps add lib64 paths for ldconfig
Building deps on some systems will install to opt/lib/library/lib64 directories rather than opt/lib/library/lib. This adds additional lib64 paths for ldconfig to ensure the libraries are found at runtime.
-rwxr-xr-xbuild_files/build_environment/install_deps.sh3
1 files changed, 2 insertions, 1 deletions
diff --git a/build_files/build_environment/install_deps.sh b/build_files/build_environment/install_deps.sh
index 9ab460ee00f..eecbe0812cc 100755
--- a/build_files/build_environment/install_deps.sh
+++ b/build_files/build_environment/install_deps.sh
@@ -1107,13 +1107,14 @@ _create_inst_shortcut() {
# ldconfig
run_ldconfig() {
_lib_path="$INST/$1/lib"
+ _lib64_path="$INST/$1/lib64"
_ldconf_path="/etc/ld.so.conf.d/$1.conf"
PRINT ""
if [ ! $SUDO ]; then
WARNING "--no-sudo enabled, impossible to run ldconfig for $1, you'll have to do it yourself..."
else
INFO "Running ldconfig for $1..."
- $SUDO sh -c "echo \"$_lib_path\" > $_ldconf_path"
+ $SUDO sh -c "echo -e \"$_lib_path\n$_lib64_path\" > $_ldconf_path"
$SUDO /sbin/ldconfig # XXX OpenSuse does not include sbin in command path with sudo!!!
fi
PRINT ""