diff options
| author | Bastien Montagne <bastien@blender.org> | 2021-07-29 17:00:59 +0300 |
|---|---|---|
| committer | Bastien Montagne <bastien@blender.org> | 2021-07-29 18:00:48 +0300 |
| commit | b60e72100b52493f9d2e4b86826671af218d1cc5 (patch) | |
| tree | 775b3dd3d85afad5bc26a28fdbabdf66cd33d480 /build_files | |
| parent | 21b4799793600dc3df9e7e57e17fc0437efa6084 (diff) | |
Cleanup: OSL buildlib patch: Remove `.rej` part.
This patch contained changes for an `.rej` rejection file generated by
failed patch apply... Definitly nothing to do here.
Diffstat (limited to 'build_files')
| -rw-r--r-- | build_files/build_environment/patches/osl.diff | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/build_files/build_environment/patches/osl.diff b/build_files/build_environment/patches/osl.diff index 8553115b50d..54885323571 100644 --- a/build_files/build_environment/patches/osl.diff +++ b/build_files/build_environment/patches/osl.diff @@ -1,18 +1,3 @@ -diff -Naur OpenShadingLanguage-Release-1.9.9/src/cmake/flexbison.cmake.rej external_osl/src/cmake/flexbison.cmake.rej ---- OpenShadingLanguage-Release-1.9.9/src/cmake/flexbison.cmake.rej 1969-12-31 17:00:00 -0700 -+++ external_osl/src/cmake/flexbison.cmake.rej 2018-08-24 17:42:11 -0600 -@@ -0,0 +1,11 @@ -+--- src/cmake/flexbison.cmake 2018-05-01 16:39:02 -0600 -++++ src/cmake/flexbison.cmake 2018-08-24 10:24:03 -0600 -+@@ -77,7 +77,7 @@ -+ DEPENDS ${${compiler_headers}} -+ WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} ) -+ ADD_CUSTOM_COMMAND ( OUTPUT ${flexoutputcxx} -+- COMMAND ${FLEX_EXECUTABLE} -o ${flexoutputcxx} "${CMAKE_CURRENT_SOURCE_DIR}/${flexsrc}" -++ COMMAND ${FLEX_EXECUTABLE} ${FLEX_EXTRA_OPTIONS} -o ${flexoutputcxx} "${CMAKE_CURRENT_SOURCE_DIR}/${flexsrc}" -+ MAIN_DEPENDENCY ${flexsrc} -+ DEPENDS ${${compiler_headers}} -+ WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} ) diff -Naur OpenShadingLanguage-Release-1.9.9/src/include/OSL/llvm_util.h external_osl/src/include/OSL/llvm_util.h --- OpenShadingLanguage-Release-1.9.9/src/include/OSL/llvm_util.h 2018-05-01 16:39:02 -0600 +++ external_osl/src/include/OSL/llvm_util.h 2018-08-25 14:05:00 -0600 |