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 6AB521395E2 for ; Tue, 1 Nov 2016 00:41:31 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 82656E0B74; Tue, 1 Nov 2016 00:41:28 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 44E03E0B74 for ; Tue, 1 Nov 2016 00:41:28 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id C566A3411D7 for ; Tue, 1 Nov 2016 00:41:26 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id C856724B0 for ; Tue, 1 Nov 2016 00:41:24 +0000 (UTC) From: "Michał Górny" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michał Górny" Message-ID: <1477956559.871a6adcce9514e05f1d5074c337c0684c932c2b.mgorny@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-devel/clang/files/9999/, sys-devel/clang/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-devel/clang/clang-9999.ebuild sys-devel/clang/files/9999/0006-cmake-Add-CLANG_GOLD_LIBDIR_SUFFIX-to-specify-loc-of.patch X-VCS-Directories: sys-devel/clang/ sys-devel/clang/files/9999/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 871a6adcce9514e05f1d5074c337c0684c932c2b X-VCS-Branch: master Date: Tue, 1 Nov 2016 00:41:24 +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: 4a2658d9-3fcc-4343-a25b-f11a7d9d8202 X-Archives-Hash: c847da835d14ad7b133494f83656ba11 commit: 871a6adcce9514e05f1d5074c337c0684c932c2b Author: Michał Górny gentoo org> AuthorDate: Mon Oct 31 23:25:55 2016 +0000 Commit: Michał Górny gentoo org> CommitDate: Mon Oct 31 23:29:19 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=871a6adc sys-devel/clang: Stop overriding incorrect LLVMgold.so location Remove the patch allowing override of LLVMgold.so libdir, and the relevant override. The patch has been rejected upstream, and the case of running non-native driver considered not important enough to deserve the added complexity. I will attempt to find another (upstreamable) solution. sys-devel/clang/clang-9999.ebuild | 7 --- ...LANG_GOLD_LIBDIR_SUFFIX-to-specify-loc-of.patch | 64 ---------------------- 2 files changed, 71 deletions(-) diff --git a/sys-devel/clang/clang-9999.ebuild b/sys-devel/clang/clang-9999.ebuild index 6a09eb1..689eaae 100644 --- a/sys-devel/clang/clang-9999.ebuild +++ b/sys-devel/clang/clang-9999.ebuild @@ -117,16 +117,11 @@ src_prepare() { # support overriding clang runtime install directory eapply "${FILESDIR}"/9999/0005-cmake-Supporting-overriding-runtime-libdir-via-CLANG.patch - # support overriding LLVMgold.so plugin directory - eapply "${FILESDIR}"/9999/0006-cmake-Add-CLANG_GOLD_LIBDIR_SUFFIX-to-specify-loc-of.patch # fix stand-alone doc build eapply "${FILESDIR}"/9999/0007-cmake-Support-stand-alone-Sphinx-doxygen-doc-build.patch # User patches eapply_user - - # Native libdir is used to hold LLVMgold.so - NATIVE_LIBDIR=$(get_libdir) } multilib_src_configure() { @@ -135,8 +130,6 @@ multilib_src_configure() { -DLLVM_LIBDIR_SUFFIX=${libdir#lib} # install clang runtime straight into /usr/lib -DCLANG_LIBDIR_SUFFIX="" - # specify host's binutils gold plugin path - -DCLANG_GOLD_LIBDIR_SUFFIX="${NATIVE_LIBDIR#lib}" -DBUILD_SHARED_LIBS=ON -DLLVM_TARGETS_TO_BUILD="${LLVM_TARGETS// /;}" diff --git a/sys-devel/clang/files/9999/0006-cmake-Add-CLANG_GOLD_LIBDIR_SUFFIX-to-specify-loc-of.patch b/sys-devel/clang/files/9999/0006-cmake-Add-CLANG_GOLD_LIBDIR_SUFFIX-to-specify-loc-of.patch deleted file mode 100644 index 18adcca..00000000 --- a/sys-devel/clang/files/9999/0006-cmake-Add-CLANG_GOLD_LIBDIR_SUFFIX-to-specify-loc-of.patch +++ /dev/null @@ -1,64 +0,0 @@ -From cf60af04f0ac2836f50d5a042acc89ef76e76a66 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= -Date: Sun, 21 Aug 2016 23:31:28 +0200 -Subject: [PATCH 6/7] cmake: Add CLANG_GOLD_LIBDIR_SUFFIX to specify loc of - LLVMgold.so - -Add CLANG_GOLD_LIBDIR_SUFFIX that defaults to ${LLVM_LIBDIR_SUFFIX} -and can be overriden if LLVMgold.so is installed elsewhere. The use case -are multilib systems where binutils is 64-bit and clang is 32-bit, -therefore the gold plugin is installed in 64-bit libdir while clang -is not. - -Bug: https://llvm.org/bugs/show_bug.cgi?id=23793 -Patch: https://reviews.llvm.org/D23754 ---- - CMakeLists.txt | 3 +++ - include/clang/Config/config.h.cmake | 3 +++ - lib/Driver/Tools.cpp | 2 +- - 3 files changed, 7 insertions(+), 1 deletion(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 67b85b5..8ed8c10 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -239,6 +239,9 @@ set(CLANG_LIBDIR_SUFFIX "${LLVM_LIBDIR_SUFFIX}" CACHE - STRING "Define suffix of library directory name for clang runtime (32/64)") - set(CLANG_LIBRARY_OUTPUT_INTDIR ${CMAKE_BINARY_DIR}/${CMAKE_CFG_INTDIR}/lib${CLANG_LIBDIR_SUFFIX}) - -+set(CLANG_GOLD_LIBDIR_SUFFIX "${LLVM_LIBDIR_SUFFIX}" CACHE -+ STRING "Define suffix of library directory name that contains LLVMgold.so (32/64)") -+ - set(CLANG_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}) - set(CLANG_BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}) - -diff --git a/include/clang/Config/config.h.cmake b/include/clang/Config/config.h.cmake -index 9bf9ea5..26e0e7e 100644 ---- a/include/clang/Config/config.h.cmake -+++ b/include/clang/Config/config.h.cmake -@@ -20,6 +20,9 @@ - /* Multilib suffix for libdir. */ - #define CLANG_LIBDIR_SUFFIX "${CLANG_LIBDIR_SUFFIX}" - -+/* Multilib suffix for libdir containing LLVMgold.so. */ -+#define CLANG_GOLD_LIBDIR_SUFFIX "${CLANG_GOLD_LIBDIR_SUFFIX}" -+ - /* Relative directory for resource files */ - #define CLANG_RESOURCE_DIR "${CLANG_RESOURCE_DIR}" - -diff --git a/lib/Driver/Tools.cpp b/lib/Driver/Tools.cpp -index a814df3..333a2e9 100644 ---- a/lib/Driver/Tools.cpp -+++ b/lib/Driver/Tools.cpp -@@ -2007,7 +2007,7 @@ static void AddGoldPlugin(const ToolChain &ToolChain, const ArgList &Args, - // forward. - CmdArgs.push_back("-plugin"); - std::string Plugin = -- ToolChain.getDriver().Dir + "/../lib" CLANG_LIBDIR_SUFFIX "/LLVMgold.so"; -+ ToolChain.getDriver().Dir + "/../lib" CLANG_GOLD_LIBDIR_SUFFIX "/LLVMgold.so"; - CmdArgs.push_back(Args.MakeArgString(Plugin)); - - // Try to pass driver level flags relevant to LTO code generation down to --- -2.9.3 -