Added patch to USD for DTS bug

CHANGELOG.md

@@ -1,6 +1,10 @@
 # Changelog
 All notable changes to this project will be documented in this file.
 
+## 2020-02-12
+### Changed
+* Updated `aswf/ci-vfxall:2019.2` with patch for USD-19.11 for DTS bug discussed here: https://github.com/Autodesk/maya-usd/pull/198 .
+
 ## 2019-12-21
 ### Added
 * New `aswf/ci-opencue:2020.1` image [#21](/../../issues/21)

docker-bake-base-2019.hcl

@@ -22,7 +22,7 @@ target "ci-baseqt" {
 	dockerfile = "ci-baseqt/Dockerfile"
 	tags = [
 		"docker.io/aswftesting/ci-baseqt:2019",
-		"docker.io/aswftesting/ci-baseqt:2019.1",
+		"docker.io/aswftesting/ci-baseqt:2019.2",
 		"docker.io/aswftesting/ci-baseqt:latest",
 	]
 }

scripts/vfx/build_usd.sh

@@ -10,23 +10,50 @@ fi
 tar -zxf $DOWNLOADS_DIR/usd-${USD_VERSION}.tar.gz
 cd USD-${USD_VERSION}
 
+touch pxr/base/lib/vt/devtoolset6Workaround.cpp
+echo '#if (__GNUC__ >= 6)
+#include <cstdlib>
+#pragma weak __cxa_throw_bad_array_new_length
+extern "C" void __cxa_throw_bad_array_new_length()
+{
+ abort();
+}
+#endif' >> pxr/base/lib/vt/devtoolset6Workaround.cpp
+
+patch -p1 <<EOF
+diff --git a/pxr/base/lib/vt/CMakeLists.txt b/pxr/base/lib/vt/CMakeLists.txt
+index aecffd7fb..c8f840bed 100644
+--- a/pxr/base/lib/vt/CMakeLists.txt
++++ b/pxr/base/lib/vt/CMakeLists.txt
+@@ -38,6 +38,9 @@ pxr_library(vt
+
+     PRIVATE_HEADERS
+         typeHeaders.h
++        
++    CPPFILES
++        devtoolset6Workaround.cpp
+
+     PYTHON_CPPFILES
+         moduleDeps.cpp
+EOF
+
 mkdir build
 cd build
 
 cmake \
-    -DCMAKE_INSTALL_PREFIX=${ASWF_INSTALL_PREFIX} \
-    -DOPENEXR_LOCATION=${ASWF_INSTALL_PREFIX} \
-    -DCPPUNIT_LOCATION=${ASWF_INSTALL_PREFIX} \
-    -DBLOSC_LOCATION=${ASWF_INSTALL_PREFIX} \
-    -DTBB_LOCATION=${ASWF_INSTALL_PREFIX} \
-    -DILMBASE_LOCATION=${ASWF_INSTALL_PREFIX} \
-    -DPXR_BUILD_TESTS=OFF \
-    -DUSD_ROOT_DIR=$ASWF_INSTALL_PREFIX \
-    -DPXR_BUILD_ALEMBIC_PLUGIN=OFF \ # @TODO: Fix needed for HDF5 not found
-    -DPXR_BUILD_MAYA_PLUGIN=FALSE \
-    ..
-
-make -j64
+     -DCMAKE_INSTALL_PREFIX=${ASWF_INSTALL_PREFIX} \
+     -DOPENEXR_LOCATION=${ASWF_INSTALL_PREFIX} \
+     -DCPPUNIT_LOCATION=${ASWF_INSTALL_PREFIX} \
+     -DBLOSC_LOCATION=${ASWF_INSTALL_PREFIX} \
+     -DTBB_LOCATION=${ASWF_INSTALL_PREFIX} \
+     -DILMBASE_LOCATION=${ASWF_INSTALL_PREFIX} \
+     -DPXR_BUILD_TESTS=OFF \
+     -DUSD_ROOT_DIR=$ASWF_INSTALL_PREFIX \
+     -DPXR_BUILD_ALEMBIC_PLUGIN=OFF \
+     -DPXR_BUILD_MAYA_PLUGIN=FALSE \
+     ..
+
+make -j$(nproc)
 make install
 
 cd ../..