[Bf-blender-cvs] [aa1b35bb60d] master: Fix install_deps usage of patches.

Bastien Montagne noreply at git.blender.org
Thu Aug 10 15:56:58 CEST 2017


Commit: aa1b35bb60d1d559f00095ed895a0c1884193a39
Author: Bastien Montagne
Date:   Thu Aug 10 15:55:19 2017 +0200
Branches: master
https://developer.blender.org/rBaa1b35bb60d1d559f00095ed895a0c1884193a39

Fix install_deps usage of patches.

Who in Hell did rename those files and did not update accordingly
install_deps.sh script???

===================================================================

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 db2a1246a60..1f25b37c979 100755
--- a/build_files/build_environment/install_deps.sh
+++ b/build_files/build_environment/install_deps.sh
@@ -1777,7 +1777,7 @@ compile_LLVM() {
       cd $_src
 
       # XXX Ugly patching hack!
-      patch -p1 -i "$SCRIPT_DIR/patches/install_deps_llvm.patch"
+      patch -p1 -i "$SCRIPT_DIR/patches/install_deps_llvm.diff"
 
       cd $CWD
 
@@ -1883,7 +1883,7 @@ compile_OSL() {
       git reset --hard
 
       # XXX Ugly patching hack!
-      patch -p1 -i "$SCRIPT_DIR/patches/install_deps_osl.patch"
+      patch -p1 -i "$SCRIPT_DIR/patches/install_deps_osl.diff"
     fi
 
     # Always refresh the whole build!




More information about the Bf-blender-cvs mailing list