kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity
078e012cd9
blender/build_files/build_environment/patches/install_deps_llvm.diff

12 lines
366 B
Diff
Raw Normal View History

InstallDeps: Fix broken OSL (would not generate valid default names for its .oso pre-compiled files). Also, externalize temp/hacky patches in own dir, much much cleaner than integrating them in bash script!
2015-10-03 14:20:03 +00:00
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
Update install_deps.sh for ArchLinux. The script is updated for ArchLinux, since all dependencies are included in Arch's official repositories. I've made a few changes, such as enabling OCIO and OSD without requiring locally installed lib-path, and a fix to ''get_package_version_ARCH()' so it ignores package epoch (as in the case of ffmpeg). I intend to look at OpenVDB next. Reviewers: mont29 Differential Revision: https://developer.blender.org/D1901
2016-04-21 08:44:46 +00:00
@@ -14,7 +14,7 @@
set(LLVM_VERSION_MINOR 4)
InstallDeps: Fix broken OSL (would not generate valid default names for its .oso pre-compiled files). Also, externalize temp/hacky patches in own dir, much much cleaner than integrating them in bash script!
2015-10-03 14:20:03 +00:00
Update install_deps.sh for ArchLinux. The script is updated for ArchLinux, since all dependencies are included in Arch's official repositories. I've made a few changes, such as enabling OCIO and OSD without requiring locally installed lib-path, and a fix to ''get_package_version_ARCH()' so it ignores package epoch (as in the case of ffmpeg). I intend to look at OpenVDB next. Reviewers: mont29 Differential Revision: https://developer.blender.org/D1901
2016-04-21 08:44:46 +00:00
if (NOT PACKAGE_VERSION)
- set(PACKAGE_VERSION "${LLVM_VERSION_MAJOR}.${LLVM_VERSION_MINOR}svn")
+ set(PACKAGE_VERSION "${LLVM_VERSION_MAJOR}.${LLVM_VERSION_MINOR}")
endif()
InstallDeps: Fix broken OSL (would not generate valid default names for its .oso pre-compiled files). Also, externalize temp/hacky patches in own dir, much much cleaner than integrating them in bash script!
2015-10-03 14:20:03 +00:00
Update install_deps.sh for ArchLinux. The script is updated for ArchLinux, since all dependencies are included in Arch's official repositories. I've made a few changes, such as enabling OCIO and OSD without requiring locally installed lib-path, and a fix to ''get_package_version_ARCH()' so it ignores package epoch (as in the case of ffmpeg). I intend to look at OpenVDB next. Reviewers: mont29 Differential Revision: https://developer.blender.org/D1901
2016-04-21 08:44:46 +00:00
option(LLVM_INSTALL_TOOLCHAIN_ONLY "Only include toolchain files in the 'install' target." OFF)
Copy Permalink