griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

build_environment: osl work around shutdown issues.

Browse Source 
there is an issue with objects destructing in a non deterministic way during process shutdown, temporary work around this until osl has a fix in place.
This commit is contained in:
Ray Molenkamp
2018-08-25 19:35:45 -06:00
parent 94efc651d4
commit 3f1606cb7c
2 changed files with 66 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
build_files/build_environment/cmake/osl.cmake
View File

@@ -83,7 +83,7 @@ ExternalProject_Add(external_osl
LIST_SEPARATOR ^^
URL_HASH MD5=${OSL_HASH}
PREFIX ${BUILD_DIR}/osl
PATCH_COMMAND ${PATCH_CMD} -p 3 -d ${BUILD_DIR}/osl/src/external_osl < ${PATCH_DIR}/osl.diff
PATCH_COMMAND ${PATCH_CMD} -p 1 -d ${BUILD_DIR}/osl/src/external_osl < ${PATCH_DIR}/osl.diff
# ${PATCH_CMD} -p 0 -d ${BUILD_DIR}/osl/src/external_osl < ${PATCH_DIR}/osl_simd_oiio.diff
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/osl -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} ${DEFAULT_CMAKE_FLAGS} ${OSL_EXTRA_ARGS}
INSTALL_DIR ${LIBDIR}/osl