From 6fef4a8c4a68fddc2b0162e2963fb643017f6a86 Mon Sep 17 00:00:00 2001
From: Guilherme Amadio <amadio@gentoo.org>
Date: Mon, 18 Dec 2017 11:54:51 +0100
Subject: sci-physics/root: do not look for Z3, since it's not necessary

Package-Manager: Portage-2.3.19, Repoman-2.3.6
---
 sci-physics/root/files/root-6.12.04-z3.patch | 39 ++++++++++++++++++++++++++++
 sci-physics/root/root-6.12.04.ebuild         |  3 ++-
 2 files changed, 41 insertions(+), 1 deletion(-)
 create mode 100644 sci-physics/root/files/root-6.12.04-z3.patch

(limited to 'sci-physics')

diff --git a/sci-physics/root/files/root-6.12.04-z3.patch b/sci-physics/root/files/root-6.12.04-z3.patch
new file mode 100644
index 000000000000..04f6edf2c6d5
--- /dev/null
+++ b/sci-physics/root/files/root-6.12.04-z3.patch
@@ -0,0 +1,39 @@
+From 4445e05660493841b5fb683c7e8a8dc6c08564ac Mon Sep 17 00:00:00 2001
+From: Guilherme Amadio <amadio@cern.ch>
+Date: Mon, 18 Dec 2017 11:49:55 +0100
+Subject: [PATCH] Only look for Z3 if necessary
+
+---
+ interpreter/llvm/src/tools/clang/CMakeLists.txt | 9 ++-------
+ 1 file changed, 2 insertions(+), 7 deletions(-)
+
+diff --git a/interpreter/llvm/src/tools/clang/CMakeLists.txt b/interpreter/llvm/src/tools/clang/CMakeLists.txt
+index 2667b1d689..a1559d9b15 100644
+--- a/interpreter/llvm/src/tools/clang/CMakeLists.txt
++++ b/interpreter/llvm/src/tools/clang/CMakeLists.txt
+@@ -186,8 +186,6 @@ if (LIBXML2_FOUND)
+   set(CLANG_HAVE_LIBXML 1)
+ endif()
+ 
+-find_package(Z3 4.5)
+-
+ include(CheckIncludeFile)
+ check_include_file(sys/resource.h CLANG_HAVE_RLIMITS)
+ 
+@@ -381,11 +379,8 @@ if(NOT CLANG_ENABLE_STATIC_ANALYZER AND (CLANG_ENABLE_ARCMT OR CLANG_ANALYZER_BU
+ endif()
+ 
+ if(CLANG_ANALYZER_BUILD_Z3)
+-  if(Z3_FOUND)
+-    set(CLANG_ANALYZER_WITH_Z3 1)
+-  else()
+-    message(FATAL_ERROR "Cannot find Z3 header file or shared library")
+-  endif()
++  find_package(Z3 4.5 REQUIRED)
++  set(CLANG_ANALYZER_WITH_Z3 1)
+ endif()
+ 
+ if(CLANG_ENABLE_ARCMT)
+-- 
+2.15.1
+
diff --git a/sci-physics/root/root-6.12.04.ebuild b/sci-physics/root/root-6.12.04.ebuild
index 4a5da3db24e8..cb4d5d9a4ec5 100644
--- a/sci-physics/root/root-6.12.04.ebuild
+++ b/sci-physics/root/root-6.12.04.ebuild
@@ -128,7 +128,8 @@ src_prepare() {
         "${FILESDIR}"/${PN}-5.32.00-cfitsio.patch \
         "${FILESDIR}"/${PN}-5.32.00-chklib64.patch \
         "${FILESDIR}"/${PN}-6.00.01-dotfont.patch \
-		"${FILESDIR}"/${PN}-6.11.02-hsimple.patch
+		"${FILESDIR}"/${PN}-6.11.02-hsimple.patch \
+		"${FILESDIR}"/${PN}-6.12.04-z3.patch
 
 	# make sure we use system libs and headers
 	rm montecarlo/eg/inc/cfortran.h README/cfortran.doc || die
-- 
cgit v1.2.3-65-gdbad