diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2018-09-05 18:11:03 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2018-09-06 12:29:21 +0300 |
| commit | bb98eef777cbc3484bfcb50ea460b9c5622e9200 (patch) | |
| tree | f0695667ef5fa2a60cd4717fd3af81e11924cf4a /build_files/build_environment/patches | |
| parent | b07d866cf6d206d2e8012e1286c3c205eba0f24e (diff) | |
Update install_deps.sh to latest libs.
Tested with Debian Testing, might need some adjustements for other
distributions...
Also removed last patches we used here, we shall not need any anymore!
Diffstat (limited to 'build_files/build_environment/patches')
| -rw-r--r-- | build_files/build_environment/patches/install_deps_llvm.diff | 11 | ||||
| -rw-r--r-- | build_files/build_environment/patches/install_deps_osl.diff | 12 |
2 files changed, 0 insertions, 23 deletions
diff --git a/build_files/build_environment/patches/install_deps_llvm.diff b/build_files/build_environment/patches/install_deps_llvm.diff deleted file mode 100644 index 968f011e57c..00000000000 --- a/build_files/build_environment/patches/install_deps_llvm.diff +++ /dev/null @@ -1,11 +0,0 @@ ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -14,7 +14,7 @@ - set(LLVM_VERSION_MINOR 4) - - if (NOT PACKAGE_VERSION) -- set(PACKAGE_VERSION "${LLVM_VERSION_MAJOR}.${LLVM_VERSION_MINOR}svn") -+ set(PACKAGE_VERSION "${LLVM_VERSION_MAJOR}.${LLVM_VERSION_MINOR}") - endif() - - option(LLVM_INSTALL_TOOLCHAIN_ONLY "Only include toolchain files in the 'install' target." OFF) diff --git a/build_files/build_environment/patches/install_deps_osl.diff b/build_files/build_environment/patches/install_deps_osl.diff deleted file mode 100644 index 3b52403f740..00000000000 --- a/build_files/build_environment/patches/install_deps_osl.diff +++ /dev/null @@ -1,12 +0,0 @@ ---- a/src/shaders/CMakeLists.txt -+++ b/src/shaders/CMakeLists.txt -@@ -27,7 +27,7 @@ macro (osl_compile oslsrc objlist headers) - message (STATUS "cmd: ${CMAKE_CURRENT_BINARY_DIR}/../oslc/oslc ${oslsrc}") - endif () - add_custom_command (OUTPUT ${osofile} -- COMMAND "${CMAKE_CURRENT_BINARY_DIR}/../oslc/oslc" ${oslsrc} -+ COMMAND "${CMAKE_CURRENT_BINARY_DIR}/../oslc/oslc" "-o" ${osofile} ${oslsrc} - MAIN_DEPENDENCY ${oslsrc} - DEPENDS ${${headers}} ${oslsrc} "${CMAKE_CURRENT_BINARY_DIR}/stdosl.h" "${CMAKE_CURRENT_BINARY_DIR}/../oslc/oslc" - WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}) - |