Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix T40025: install_deps.sh generating wrong make flag for OSL

Browse Source 
Most cases should be handled OK now (not all though, would make script way too much tricky -
bash is a hell of a messy language :/).
This commit is contained in:
Bastien Montagne
2014-05-04 21:32:06 +02:00
parent d828d44d7a
commit f7aac45488
1 changed files with 51 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

89
build_files/build_environment/install_deps.sh
View File

@@ -2943,24 +2943,27 @@ print_info() {
_buildargs="$_buildargs $_1" _buildargs="$_buildargs $_1"
fi fi
_1="-D WITH_CYCLES_OSL=ON" PRINT "$OSL_SKIP"
_2="-D WITH_LLVM=ON" if [ "$OSL_SKIP" = false ]; then
_3="-D LLVM_VERSION=$LLVM_VERSION_FOUND" _1="-D WITH_CYCLES_OSL=ON"
PRINT " $_1" _2="-D WITH_LLVM=ON"
PRINT " $_2" _3="-D LLVM_VERSION=$LLVM_VERSION_FOUND"
PRINT " $_3"
_buildargs="$_buildargs $_1 $_2 $_3"
if [ -d $INST/osl ]; then
_1="-D CYCLES_OSL=$INST/osl"
PRINT " $_1"
_buildargs="$_buildargs $_1"
fi
if [ -d $INST/llvm ]; then
_1="-D LLVM_DIRECTORY=$INST/llvm"
_2="-D LLVM_STATIC=ON"
PRINT " $_1" PRINT " $_1"
PRINT " $_2" PRINT " $_2"
_buildargs="$_buildargs $_1 $_2" PRINT " $_3"
_buildargs="$_buildargs $_1 $_2 $_3"
if [ -d $INST/osl ]; then
_1="-D CYCLES_OSL=$INST/osl"
PRINT " $_1"
_buildargs="$_buildargs $_1"
fi
if [ -d $INST/llvm ]; then
_1="-D LLVM_DIRECTORY=$INST/llvm"
_2="-D LLVM_STATIC=ON"
PRINT " $_1"
PRINT " $_2"
_buildargs="$_buildargs $_1 $_2"
fi
fi fi
if $WITH_OPENCOLLADA; then if $WITH_OPENCOLLADA; then
@@ -2969,15 +2972,17 @@ print_info() {
_buildargs="$_buildargs $_1" _buildargs="$_buildargs $_1"
fi fi
_1="-D WITH_CODEC_FFMPEG=ON" if [ "$FFMPEG_SKIP" = false ]; then
_2="-D FFMPEG_LIBRARIES='avformat;avcodec;avutil;avdevice;swscale;rt;`print_info_ffmpeglink`'" _1="-D WITH_CODEC_FFMPEG=ON"
PRINT " $_1" _2="-D FFMPEG_LIBRARIES='avformat;avcodec;avutil;avdevice;swscale;rt;`print_info_ffmpeglink`'"
PRINT " $_2"
_buildargs="$_buildargs $_1 $_2"
if [ -d $INST/ffmpeg ]; then
_1="-D FFMPEG=$INST/ffmpeg"
PRINT " $_1" PRINT " $_1"
_buildargs="$_buildargs $_1" PRINT " $_2"
_buildargs="$_buildargs $_1 $_2"
if [ -d $INST/ffmpeg ]; then
_1="-D FFMPEG=$INST/ffmpeg"
PRINT " $_1"
_buildargs="$_buildargs $_1"
fi
fi fi
PRINT "" PRINT ""
@@ -2992,9 +2997,11 @@ print_info() {
PRINT "BF_PYTHON_ABI_FLAGS = 'm'" PRINT "BF_PYTHON_ABI_FLAGS = 'm'"
fi fi
PRINT "WITH_BF_OCIO = True" if [ "$OCIO_SKIP" = false ]; then
if [ -d $INST/ocio ]; then PRINT "WITH_BF_OCIO = True"
PRINT "BF_OCIO = '$INST/ocio'" if [ -d $INST/ocio ]; then
PRINT "BF_OCIO = '$INST/ocio'"
fi
fi fi
if [ -d $INST/openexr ]; then if [ -d $INST/openexr ]; then
@@ -3012,9 +3019,11 @@ print_info() {
PRINT "WITH_BF_STATICOPENEXR = True" PRINT "WITH_BF_STATICOPENEXR = True"
fi fi
PRINT "WITH_BF_OIIO = True" if [ "$OIIO_SKIP" = false ]; then
if [ -d $INST/oiio ]; then PRINT "WITH_BF_OIIO = True"
PRINT "BF_OIIO = '$INST/oiio'" if [ -d $INST/oiio ]; then
PRINT "BF_OIIO = '$INST/oiio'"
fi
fi fi
PRINT "WITH_BF_CYCLES = True" PRINT "WITH_BF_CYCLES = True"
@@ -3023,9 +3032,11 @@ print_info() {
PRINT "BF_OSL = '$INST/osl'" PRINT "BF_OSL = '$INST/osl'"
fi fi
PRINT "WITH_BF_BOOST = True" if [ "$BOOST_SKIP" = false ]; then
if [ -d $INST/boost ]; then PRINT "WITH_BF_BOOST = True"
PRINT "BF_BOOST = '$INST/boost'" if [ -d $INST/boost ]; then
PRINT "BF_BOOST = '$INST/boost'"
fi
fi fi
if $WITH_OPENCOLLADA; then if $WITH_OPENCOLLADA; then
@@ -3035,13 +3046,15 @@ print_info() {
fi fi
fi fi
_ffmpeg_list_sep=" " if [ "$FFMPEG_SKIP" = false ]; then
if [ -d $INST/ffmpeg ]; then _ffmpeg_list_sep=" "
PRINT "BF_FFMPEG = '$INST/ffmpeg'" if [ -d $INST/ffmpeg ]; then
PRINT "BF_FFMPEG = '$INST/ffmpeg'"
fi
PRINT "BF_FFMPEG_LIB = 'avformat avcodec swscale avutil avdevice `print_info_ffmpeglink`'"
fi fi
PRINT "BF_FFMPEG_LIB = 'avformat avcodec swscale avutil avdevice `print_info_ffmpeglink`'"
if ! $WITH_ALL; then if [ "$WITH_ALL" = false ]; then
PRINT "WITH_BF_3DMOUSE = False" PRINT "WITH_BF_3DMOUSE = False"
# No libspacenav in official arch repos... # No libspacenav in official arch repos...
elif [ "$DISTRO" = "ARCH" ]; then elif [ "$DISTRO" = "ARCH" ]; then