compile with external llvm

4 files changed, 35 insertions, 9 deletions

diff --git a/.SRCINFO b/.SRCINFO
index b158e61bd939..f249f9b507a9 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,13 +1,14 @@
 pkgbase = root
 	pkgdesc = C++ data analysis framework and interpreter from CERN.
 	pkgver = 6.14.04
-	pkgrel = 1
+	pkgrel = 2
 	url = http://root.cern.ch
 	install = root.install
 	arch = i686
 	arch = x86_64
 	license = LGPL2.1
 	makedepends = cmake
+	makedepends = llvm50>=5.0.2-5
 	depends = cfitsio
 	depends = cern-vdt
 	depends = fftw
@@ -46,13 +47,15 @@ pkgbase = root
 	source = root.xml
 	source = rootd
 	source = settings.cmake
+	source = exclude_clang_from_install_directive.patch
 	source = fix_tmva_numpy_dependency.patch
 	sha256sums = 463ec20692332a422cfb5f38c78bedab1c40ab4d81be18e99b50cf9f53f596cf
 	sha256sums = 72ba38e0faffa084ac2f787f360201f72b1733d27e36c3cb88eb2f3a4716fa61
 	sha256sums = 9d1f8e7ad923cb5450386edbbce085d258653c0160419cdd6ff154542cc32bd7
 	sha256sums = 50c08191a5b281a39aa05ace4feb8d5405707b4c54a5dcba061f954649c38cb0
 	sha256sums = 3c45b03761d5254142710b7004af0077f18efece7c95511910140d0542c8de8a
-	sha256sums = 0a614a23794495d917fc4060d184be06e78fde5f5e343b70920c77a80ae0abbf
+	sha256sums = a0ccce4517908a864afef4dff7fb1bd5c5ad0e6210cb86e191cc5e1994428f3d
+	sha256sums = f2d07ccfa65dc0db8b41e36b67cc4cf471a0dec318f0f9f883711c5d2c0e296b
 	sha256sums = bc0a31992c0da5004d6d9be8f0236e77185245f218ec49a6d86d9279c7bbb868
 
 pkgname = root
diff --git a/PKGBUILD b/PKGBUILD
index 0110861187bc..6f868b0b76e2 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,12 +6,13 @@
 
 pkgname=root
 pkgver=6.14.04
-pkgrel=1
+pkgrel=2
 pkgdesc='C++ data analysis framework and interpreter from CERN.'
 arch=('i686' 'x86_64')
 url='http://root.cern.ch'
 license=('LGPL2.1')
-makedepends=('cmake')
+makedepends=('cmake'
+             'llvm50>=5.0.2-5')
 depends=('cfitsio'
          'cern-vdt'
          'fftw'
@@ -51,20 +52,22 @@ source=("https://root.cern.ch/download/root_v${pkgver}.source.tar.gz"
         'root.xml'
         'rootd'
         'settings.cmake'
+        'exclude_clang_from_install_directive.patch'
         'fix_tmva_numpy_dependency.patch')
 sha256sums=('463ec20692332a422cfb5f38c78bedab1c40ab4d81be18e99b50cf9f53f596cf'
             '72ba38e0faffa084ac2f787f360201f72b1733d27e36c3cb88eb2f3a4716fa61'
             '9d1f8e7ad923cb5450386edbbce085d258653c0160419cdd6ff154542cc32bd7'
             '50c08191a5b281a39aa05ace4feb8d5405707b4c54a5dcba061f954649c38cb0'
             '3c45b03761d5254142710b7004af0077f18efece7c95511910140d0542c8de8a'
-            '0a614a23794495d917fc4060d184be06e78fde5f5e343b70920c77a80ae0abbf'
+            'a0ccce4517908a864afef4dff7fb1bd5c5ad0e6210cb86e191cc5e1994428f3d'
+            'f2d07ccfa65dc0db8b41e36b67cc4cf471a0dec318f0f9f883711c5d2c0e296b'
             'bc0a31992c0da5004d6d9be8f0236e77185245f218ec49a6d86d9279c7bbb868')
 prepare() {
     cd "${pkgname}-${pkgver}"
 
-    msg2 'Adjusting to Python3...'
     2to3 -w etc/dictpch/makepch.py 2>&1 > /dev/null
 
+    patch -p1 -i "${srcdir}/exclude_clang_from_install_directive.patch"
     patch -p1 -i "${srcdir}/fix_tmva_numpy_dependency.patch"
 
     mkdir -p "${srcdir}/build"
@@ -106,11 +109,9 @@ package() {
     install -D -m644 "${srcdir}/${pkgname}-${pkgver}/build/package/debian/root-system-bin.png" \
         "${pkgdir}/usr/share/icons/hicolor/48x48/apps/root-system-bin.png"
 
-    msg2 'Updating system config...'
     # use a file that pacman can track instead of adding directly to ld.so.conf
     install -d "${pkgdir}/etc/ld.so.conf.d"
     echo '/usr/lib/root' > "${pkgdir}/etc/ld.so.conf.d/root.conf"
 
-    msg2 'Cleaning up...'
     rm -rf "${pkgdir}/etc/root/daemons"
 }
diff --git a/exclude_clang_from_install_directive.patch b/exclude_clang_from_install_directive.patch
new file mode 100644
index 000000000000..87fccbef7451
--- /dev/null
+++ b/exclude_clang_from_install_directive.patch
@@ -0,0 +1,22 @@
+From b6922a7500a398ade56488166e9a65ead2e27c79 Mon Sep 17 00:00:00 2001
+From: Konstantin Gizdov <kgizdov@gmail.com>
+Date: Fri, 21 Sep 2018 10:14:46 +0200
+Subject: [PATCH] exclude clang from install directive
+
+---
+ interpreter/CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/interpreter/CMakeLists.txt b/interpreter/CMakeLists.txt
+index 62d6bdbfa62..3faff61f102 100644
+--- a/interpreter/CMakeLists.txt
++++ b/interpreter/CMakeLists.txt
+@@ -375,7 +375,7 @@ Please install Python or specify the PYTHON_EXECUTABLE CMake variable.")
+ 
+ 
+ if (builtin_clang)
+-  add_subdirectory(llvm/src/tools/clang)
++  add_subdirectory(llvm/src/tools/clang EXCLUDE_FROM_ALL)
+ else()
+   add_subdirectory(cling)
+ endif()
diff --git a/settings.cmake b/settings.cmake
index 3168621cc2ea..52b8cf2b6711 100644
--- a/settings.cmake
+++ b/settings.cmake
@@ -11,7 +11,7 @@ set (builtin_freetype OFF CACHE BOOL "" FORCE)
 set (builtin_gl2ps OFF CACHE BOOL "" FORCE)
 set (builtin_glew OFF CACHE BOOL "" FORCE)
 set (builtin_lzma OFF CACHE BOOL "" FORCE)
-set (builtin_llvm ON CACHE BOOL "" FORCE)
+set (builtin_llvm OFF CACHE BOOL "" FORCE)
 set (builtin_pcre OFF CACHE BOOL "" FORCE)
 set (builtin_tbb OFF CACHE BOOL "" FORCE)
 set (builtin_unuran OFF CACHE BOOL "" FORCE)