Merge branch 'master' into blender2.8
authorBastien Montagne <montagne29@wanadoo.fr>
Fri, 7 Sep 2018 18:22:57 +0000 (20:22 +0200)
committerBastien Montagne <montagne29@wanadoo.fr>
Fri, 7 Sep 2018 18:22:57 +0000 (20:22 +0200)
1  2 
build_files/build_environment/install_deps.sh

index 8f7b0c41fd33b3154c872f1b3fc2e3dbb2731a8c,2abef79a035810ed92bcca91779649b18be08c28..a1167d754722d15cee36cca669e054de6c8eb747
@@@ -25,7 -25,7 +25,7 @@@
  ARGS=$( \
  getopt \
  -o s:i:t:h \
 ---long source:,install:,tmp:,info:,threads:,help,show-deps,no-sudo,no-build,no-confirm,use-cxx11,\
 +--long source:,install:,tmp:,info:,threads:,help,show-deps,no-sudo,no-build,no-confirm,\
  with-all,with-opencollada,with-jack,\
  ver-ocio:,ver-oiio:,ver-llvm:,ver-osl:,ver-osd:,ver-openvdb:,\
  force-all,force-python,force-numpy,force-boost,\
@@@ -104,6 -104,11 +104,6 @@@ ARGUMENTS_INFO="\"COMMAND LINE ARGUMENT
      --no-confirm
          Disable any interaction with user (suitable for automated run).
  
 -    --use-cxx11
 -        Build all libraries in cpp11 'mode' (will be mandatory soon in blender2.8 branch).
 -        NOTE: If your compiler is gcc-6.0 or above, you probably *want* to enable this option (since it's default
 -              standard starting from this version).
 -
      --with-all
          By default, a number of optional and not-so-often needed libraries are not installed.
          This option will try to install them, at the cost of potential conflicts (depending on
@@@ -2663,10 -2668,10 +2663,10 @@@ install_DEB() 
    install_packages_DEB $_packages
  
    PRINT""
 -  SNDFILE_DEV="libsndfile1-dev"
 -  check_package_DEB $SNDFILE_DEV
 +  LIBSNDFILE_DEV="libsndfile1-dev"
 +  check_package_DEB $LIBSNDFILE_DEV
    if [ $? -eq 0 ]; then
 -    install_packages_DEB $SNDFILE_DEV
 +    install_packages_DEB $LIBSNDFILE_DEV
    fi
  
    PRINT ""
    fi
  
    if $_do_compile_python; then
+     install_packages_DEB libffi-dev
      compile_Python
      PRINT ""
      if [ "$NUMPY_SKIP" = true ]; then
@@@ -3261,10 -3267,10 +3262,10 @@@ install_RPM() 
    fi
  
    PRINT""
 -  SNDFILE_DEV="libsndfile-devel"
 -  check_package_RPM $SNDFILE_DEV
 +  LIBSNDFILE_DEV="libsndfile-devel"
 +  check_package_RPM $LIBSNDFILE_DEV
    if [ $? -eq 0 ]; then
 -    install_packages_RPM $SNDFILE_DEV
 +    install_packages_RPM $LIBSNDFILE_DEV
    fi
  
    if [ "$WITH_ALL" = true ]; then
    fi
  
    if [ "$_do_compile_python" = true ]; then
+     install_packages_RPM libffi-devel
      compile_Python
      PRINT ""
      if [ "$NUMPY_SKIP" = true ]; then
@@@ -3668,10 -3675,10 +3670,10 @@@ install_ARCH() 
    install_packages_ARCH $_packages
  
    PRINT""
 -  SNDFILE_DEV="libsndfile"
 -  check_package_ARCH $SNDFILE_DEV
 +  LIBSNDFILE_DEV="libsndfile"
 +  check_package_ARCH $LIBSNDFILE_DEV
    if [ $? -eq 0 ]; then
 -    install_packages_ARCH $SNDFILE_DEV
 +    install_packages_ARCH $LIBSNDFILE_DEV
    fi
  
    PRINT ""
    fi
  
    if [ "$_do_compile_python" = true ]; then
+     install_packages_ARCH libffi
      compile_Python
      PRINT ""
      if [ "$NUMPY_SKIP" = true ]; then