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 0AC761382C5 for ; Mon, 16 Apr 2018 06:31:34 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 09A69E08D1; Mon, 16 Apr 2018 06:31:33 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (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 C86BEE08D1 for ; Mon, 16 Apr 2018 06:31:32 +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 29211335C07 for ; Mon, 16 Apr 2018 06:31:31 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 6888C260 for ; Mon, 16 Apr 2018 06:31:29 +0000 (UTC) From: "Benda XU" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Benda XU" Message-ID: <1523860279.b2f6e08f25278f0140d2b159d705777d5554f4e8.heroxbd@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sci-physics/root/files/, sci-physics/root/ X-VCS-Repository: repo/gentoo X-VCS-Files: sci-physics/root/files/root-6.12.06_cling-runtime-sysroot.patch sci-physics/root/root-6.12.06-r1.ebuild X-VCS-Directories: sci-physics/root/files/ sci-physics/root/ X-VCS-Committer: heroxbd X-VCS-Committer-Name: Benda XU X-VCS-Revision: b2f6e08f25278f0140d2b159d705777d5554f4e8 X-VCS-Branch: master Date: Mon, 16 Apr 2018 06:31:29 +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: b1c64029-48a3-4871-ad92-9934de13c36a X-Archives-Hash: 1c6a2fbedc12f46b9e920687a99dc619 commit: b2f6e08f25278f0140d2b159d705777d5554f4e8 Author: Benda Xu gentoo org> AuthorDate: Mon Apr 16 06:31:03 2018 +0000 Commit: Benda XU gentoo org> CommitDate: Mon Apr 16 06:31:19 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b2f6e08f sci-physics/root: disable cling -isystem injection. This fixes the ACLiC failure on Prefix. We use SYSROOT to guide llvm in ROOT to locate headers and libraries at build time. Such feature is not to be used at runtime. The patch has no effect to usual Gentoo, therefore applying it unconditionally. Closes: https://bugs.gentoo.org/653124 Package-Manager: Portage-2.3.28, Repoman-2.3.9 .../files/root-6.12.06_cling-runtime-sysroot.patch | 22 ++++++++++++++++++++++ sci-physics/root/root-6.12.06-r1.ebuild | 1 + 2 files changed, 23 insertions(+) diff --git a/sci-physics/root/files/root-6.12.06_cling-runtime-sysroot.patch b/sci-physics/root/files/root-6.12.06_cling-runtime-sysroot.patch new file mode 100644 index 00000000000..1f8e056e946 --- /dev/null +++ b/sci-physics/root/files/root-6.12.06_cling-runtime-sysroot.patch @@ -0,0 +1,22 @@ +On Prefix, we have specified SYSROOT for llvm at build time. But we + do not need sysroot at runtime as we are not crosscompiling. + +This patch disable the sysroot feature for cling, so that ACLiC can +work on Prefix. + +Index: root-6.12.06/interpreter/cling/lib/Utils/Paths.cpp +=================================================================== +--- root-6.12.06.orig/interpreter/cling/lib/Utils/Paths.cpp ++++ root-6.12.06/interpreter/cling/lib/Utils/Paths.cpp +@@ -57,11 +57,6 @@ using namespace clang; + void CopyIncludePaths(const clang::HeaderSearchOptions& Opts, + llvm::SmallVectorImpl& incpaths, + bool withSystem, bool withFlags) { +- if (withFlags && Opts.Sysroot != "/") { +- incpaths.push_back("-isysroot"); +- incpaths.push_back(Opts.Sysroot); +- } +- + /// User specified include entries. + for (unsigned i = 0, e = Opts.UserEntries.size(); i != e; ++i) { + const HeaderSearchOptions::Entry &E = Opts.UserEntries[i]; diff --git a/sci-physics/root/root-6.12.06-r1.ebuild b/sci-physics/root/root-6.12.06-r1.ebuild index ab9b95a0ad4..f3b7aeca416 100644 --- a/sci-physics/root/root-6.12.06-r1.ebuild +++ b/sci-physics/root/root-6.12.06-r1.ebuild @@ -134,6 +134,7 @@ src_prepare() { cmake-utils_src_prepare hprefixify build/CMakeLists.txt core/clingutils/CMakeLists.txt + eapply "${FILESDIR}"/${PN}-6.12.06_cling-runtime-sysroot.patch # CSS should use local images sed -i -e 's,http://.*/,,' etc/html/ROOT.css || die "html sed failed"