diff options
Diffstat (limited to 'build_files/build_environment/patches')
| -rw-r--r-- | build_files/build_environment/patches/llvm.diff | 4 | ||||
| -rw-r--r-- | build_files/build_environment/patches/osl.diff | 24 |
2 files changed, 12 insertions, 16 deletions
diff --git a/build_files/build_environment/patches/llvm.diff b/build_files/build_environment/patches/llvm.diff index b797bb030ee..5f89816292b 100644 --- a/build_files/build_environment/patches/llvm.diff +++ b/build_files/build_environment/patches/llvm.diff @@ -1,5 +1,5 @@ ---- a/lib/Support/Unix/Path.inc 2020-02-17 09:24:26.000000000 +0100 -+++ b/lib/Support/Unix/Path.inc 2020-02-17 09:26:25.000000000 +0100 +--- a/llvm/lib/Support/Unix/Path.inc 2020-02-17 09:24:26.000000000 +0100 ++++ b/llvm/lib/Support/Unix/Path.inc 2020-02-17 09:26:25.000000000 +0100 @@ -1200,7 +1200,9 @@ /// implementation. std::error_code copy_file(const Twine &From, const Twine &To) { diff --git a/build_files/build_environment/patches/osl.diff b/build_files/build_environment/patches/osl.diff index 989800174e2..badb6c0d9b3 100644 --- a/build_files/build_environment/patches/osl.diff +++ b/build_files/build_environment/patches/osl.diff @@ -43,27 +43,23 @@ diff -Naur OpenShadingLanguage-Release-1.9.9/src/liboslexec/llvm_util.cpp extern - +void LLVM_Util::Cleanup () +{ -+ jitmm_hold.clear(); ++ if(jitmm_hold) jitmm_hold->clear(); +} size_t LLVM_Util::total_jit_memory_held () -diff -Naur OpenShadingLanguage-Release-1.9.9/CMakeLists.txt external_osl/CMakeLists.txt - --- orig/CMakeLists.txt 2020-01-27 16:22:31 -0700 -+++ external_osl/CMakeLists.txt 2020-05-13 18:04:52 -0600 -@@ -102,10 +102,11 @@ - set (OPTIX_EXTRA_LIBS CACHE STRING "Extra lib targets needed for OptiX") - set (CUDA_TARGET_ARCH "sm_35" CACHE STRING "CUDA GPU architecture (e.g. sm_35)") - --# set (USE_OIIO_STATIC ON CACHE BOOL "If OIIO is built static") --# if (USE_OIIO_STATIC) --# add_definitions ("-DOIIO_STATIC_BUILD=1") --# endif () +diff -Naur org/CMakeLists.txt external_osl/CMakeLists.txt +--- org/CMakeLists.txt 2020-12-01 12:37:15 -0700 ++++ external_osl/CMakeLists.txt 2021-01-20 13:26:50 -0700 +@@ -84,6 +84,11 @@ + CACHE STRING "Directory where OptiX PTX files will be installed") + set (CMAKE_DEBUG_POSTFIX "" CACHE STRING "Library naming postfix for Debug builds (e.g., '_debug')") + +set (USE_OIIO_STATIC ON CACHE BOOL "If OIIO is built static") +if (USE_OIIO_STATIC) + add_definitions ("-DOIIO_STATIC_BUILD=1") + add_definitions ("-DOIIO_STATIC_DEFINE=1") +endif () - + set (OSL_NO_DEFAULT_TEXTURESYSTEM OFF CACHE BOOL "Do not use create a raw OIIO::TextureSystem") - if (OSL_NO_DEFAULT_TEXTURESYSTEM)
\ No newline at end of file + if (OSL_NO_DEFAULT_TEXTURESYSTEM) |