From 7205bac989771d2198d6683f4cdae3aedb64ab1e Mon Sep 17 00:00:00 2001 From: Ejner Fergo Date: Thu, 21 Apr 2016 10:44:46 +0200 Subject: 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 --- .../build_environment/install_deps_patches/llvm.patch | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) (limited to 'build_files/build_environment/install_deps_patches') 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) -- cgit v1.2.3