[Bf-blender-cvs] [2ef695fabf3] master: build_environment: fix paths in osl.diff

[Ray Molenkamp]

Commit: 2ef695fabf33e227d742aa5adf39490a2a87f58b
Author: Ray Molenkamp
Date:   Sat Jun 2 13:12:42 2018 -0600
Branches: master
https://developer.blender.org/rB2ef695fabf33e227d742aa5adf39490a2a87f58b

build_environment: fix paths in osl.diff

===================================================================

M	build_files/build_environment/patches/osl.diff

===================================================================

diff --git a/build_files/build_environment/patches/osl.diff b/build_files/build_environment/patches/osl.diff
index 960a2506374..ccf34d99699 100644
--- a/build_files/build_environment/patches/osl.diff
+++ b/build_files/build_environment/patches/osl.diff
@@ -10,8 +10,8 @@ diff -Naur osl/src/external_osl/src/cmake/flexbison.cmake osl_bak/src/external_o
            MAIN_DEPENDENCY ${flexsrc}
            DEPENDS ${${compiler_headers}}
            WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} )
---- a/src/include/OSL/oslconfig.h	2016-10-31 16:48:19 -0600
-+++ b/src/include/OSL/oslconfig.h	2018-05-27 11:18:08 -0600
+--- osl/src/external_osl/src/include/OSL/oslconfig.h	2016-10-31 16:48:19 -0600
++++ osl/src/external_osl/src/include/OSL/oslconfig.h	2018-05-27 11:18:08 -0600
 @@ -44,12 +44,18 @@
  // same if another packages is compiling against OSL and using these headers
  // (OSL may be C++11 but the client package may be older, or vice versa --