From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 169EB139084 for ; Mon, 18 Dec 2017 13:14:00 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 54533E0FA2; Mon, 18 Dec 2017 13:13:59 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 261C9E0FA2 for ; Mon, 18 Dec 2017 13:13:58 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 69F6A33BEF1 for ; Mon, 18 Dec 2017 13:13:57 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D42FAAE89 for ; Mon, 18 Dec 2017 13:13:55 +0000 (UTC) From: "Guilherme Amadio" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Guilherme Amadio" Message-ID: <1513602718.6fef4a8c4a68fddc2b0162e2963fb643017f6a86.amadio@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sci-physics/root/, sci-physics/root/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: sci-physics/root/files/root-6.12.04-z3.patch sci-physics/root/root-6.12.04.ebuild X-VCS-Directories: sci-physics/root/files/ sci-physics/root/ X-VCS-Committer: amadio X-VCS-Committer-Name: Guilherme Amadio X-VCS-Revision: 6fef4a8c4a68fddc2b0162e2963fb643017f6a86 X-VCS-Branch: master Date: Mon, 18 Dec 2017 13:13:55 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: e0041e14-e87a-4b42-8277-da2d619beae1 X-Archives-Hash: 6f343fe1433c1de94da158ac06568474 commit: 6fef4a8c4a68fddc2b0162e2963fb643017f6a86 Author: Guilherme Amadio gentoo org> AuthorDate: Mon Dec 18 10:54:51 2017 +0000 Commit: Guilherme Amadio gentoo org> CommitDate: Mon Dec 18 13:11:58 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6fef4a8c 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(-) 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 00000000000..04f6edf2c6d --- /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 +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 4a5da3db24e..cb4d5d9a4ec 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