[Bf-blender-cvs] [e27d9fa] master: install_deps cleanup: some Debian stuff was still present in the 'generic compile-only' part of the script.

Bastien Montagne noreply at git.blender.org
Thu Nov 3 20:09:07 CET 2016


Commit: e27d9facdfbdd6d7dade202d6c318accca2f5c3e
Author: Bastien Montagne
Date:   Thu Nov 3 20:08:04 2016 +0100
Branches: master
https://developer.blender.org/rBe27d9facdfbdd6d7dade202d6c318accca2f5c3e

install_deps cleanup: some Debian stuff was still present in the 'generic compile-only' part of the 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 d6ea7d9..7844ff5 100755
--- a/build_files/build_environment/install_deps.sh
+++ b/build_files/build_environment/install_deps.sh
@@ -4023,9 +4023,6 @@ install_OTHER() {
   fi
 
   if [ "$_do_compile_llvm" = true ]; then
-    install_packages_DEB libffi-dev
-    # LLVM can't find the debian ffi header dir
-    _FFI_INCLUDE_DIR=`dpkg -L libffi-dev | grep -e ".*/ffi.h" | sed -r 's/(.*)\/ffi.h/\1/'`
     PRINT ""
     compile_LLVM
     have_llvm=true
@@ -4044,7 +4041,6 @@ install_OTHER() {
 
   if [ "$_do_compile_osl" = true ]; then
     if [ "$have_llvm" = true ]; then
-      install_packages_DEB flex bison libtbb-dev
       PRINT ""
       compile_OSL
     else
@@ -4063,7 +4059,6 @@ install_OTHER() {
   fi
 
   if [ "$_do_compile_osd" = true ]; then
-    install_packages_DEB flex bison libtbb-dev
     PRINT ""
     compile_OSD
   fi
@@ -4080,10 +4075,6 @@ install_OTHER() {
     fi
 
     if [ "$_do_compile_collada" = true ]; then
-      install_packages_DEB libpcre3-dev
-      # Find path to libxml shared lib...
-      _XML2_LIB=`dpkg -L libxml2-dev | grep -e ".*/libxml2.so"`
-      # No package
       PRINT ""
       compile_OpenCOLLADA
     fi




More information about the Bf-blender-cvs mailing list