diff options
| author | Ejner Fergo <ejnersan@gmail.com> | 2016-04-21 11:44:46 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2016-04-21 11:44:46 +0300 |
| commit | 7205bac989771d2198d6683f4cdae3aedb64ab1e (patch) | |
| tree | 49104db53571bd3cf04230806f75a50d3143422e /build_files/build_environment/install_deps_patches | |
| parent | c0943babdf001a957a6db51b14bb1b1ad3c2fdb2 (diff) | |
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
Diffstat (limited to 'build_files/build_environment/install_deps_patches')
| -rw-r--r-- | build_files/build_environment/install_deps_patches/llvm.patch | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/build_files/build_environment/install_deps_patches/llvm.patch b/build_files/build_environment/install_deps_patches/llvm.patch index 2e05c334569..968f011e57c 100644 --- a/build_files/build_environment/install_deps_patches/llvm.patch +++ b/build_files/build_environment/install_deps_patches/llvm.patch @@ -1,12 +1,11 @@ --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -13,7 +13,7 @@ - set(LLVM_VERSION_MAJOR 3) - set(LLVM_VERSION_MINOR 1) +@@ -14,7 +14,7 @@ + set(LLVM_VERSION_MINOR 4) --set(PACKAGE_VERSION "\${LLVM_VERSION_MAJOR}.\${LLVM_VERSION_MINOR}svn") -+set(PACKAGE_VERSION "\${LLVM_VERSION_MAJOR}.\${LLVM_VERSION_MINOR}") + if (NOT PACKAGE_VERSION) +- set(PACKAGE_VERSION "${LLVM_VERSION_MAJOR}.${LLVM_VERSION_MINOR}svn") ++ set(PACKAGE_VERSION "${LLVM_VERSION_MAJOR}.${LLVM_VERSION_MINOR}") + endif() - set_property(GLOBAL PROPERTY USE_FOLDERS ON) - - + option(LLVM_INSTALL_TOOLCHAIN_ONLY "Only include toolchain files in the 'install' target." OFF) |