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 7CF77138330 for ; Wed, 14 Sep 2016 13:57:16 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E3D9C21C043; Wed, 14 Sep 2016 13:57:13 +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 1CD6E21C043 for ; Wed, 14 Sep 2016 13:57:13 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 089EC3408F9 for ; Wed, 14 Sep 2016 13:57:12 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 31231247E for ; Wed, 14 Sep 2016 13:57:10 +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: <1473861428.1ef50c2ffbd30a4b5af5a63c0c25cfbfdecce2db.mgorny@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-libs/compiler-rt/files/9999/, sys-libs/compiler-rt/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-libs/compiler-rt/compiler-rt-9999.ebuild sys-libs/compiler-rt/files/9999/0001-compiler-rt-cmake-Support-overriding-llvm-config-que.patch X-VCS-Directories: sys-libs/compiler-rt/files/9999/ sys-libs/compiler-rt/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 1ef50c2ffbd30a4b5af5a63c0c25cfbfdecce2db X-VCS-Branch: master Date: Wed, 14 Sep 2016 13:57:10 +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: 978ee40a-7f9c-4279-9890-cee780cdc7a2 X-Archives-Hash: 1c162ccbc8f8a2bfa6af1533bcf22308 commit: 1ef50c2ffbd30a4b5af5a63c0c25cfbfdecce2db Author: Michał Górny gentoo org> AuthorDate: Wed Sep 14 13:56:20 2016 +0000 Commit: Michał Górny gentoo org> CommitDate: Wed Sep 14 13:57:08 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1ef50c2f sys-libs/compiler-rt: Remove the patch applied upstream sys-libs/compiler-rt/compiler-rt-9999.ebuild | 7 ---- ...-cmake-Support-overriding-llvm-config-que.patch | 46 ---------------------- 2 files changed, 53 deletions(-) diff --git a/sys-libs/compiler-rt/compiler-rt-9999.ebuild b/sys-libs/compiler-rt/compiler-rt-9999.ebuild index 020748d..bc28ce4 100644 --- a/sys-libs/compiler-rt/compiler-rt-9999.ebuild +++ b/sys-libs/compiler-rt/compiler-rt-9999.ebuild @@ -47,13 +47,6 @@ src_unpack() { git-r3_checkout } -src_prepare() { - # Support setting LLVM_MAIN_SRC_DIR and other llvm-config overrides - eapply "${FILESDIR}"/9999/0001-compiler-rt-cmake-Support-overriding-llvm-config-que.patch - - default -} - src_configure() { # pre-set since we need to pass it to cmake BUILD_DIR=${WORKDIR}/${P}_build diff --git a/sys-libs/compiler-rt/files/9999/0001-compiler-rt-cmake-Support-overriding-llvm-config-que.patch b/sys-libs/compiler-rt/files/9999/0001-compiler-rt-cmake-Support-overriding-llvm-config-que.patch deleted file mode 100644 index 5ee5f81..00000000 --- a/sys-libs/compiler-rt/files/9999/0001-compiler-rt-cmake-Support-overriding-llvm-config-que.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 5c956f1867c268111ec05b443ab8fbe0e3b9d500 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= -Date: Mon, 29 Aug 2016 23:18:25 +0200 -Subject: [PATCH] [compiler-rt cmake] Support overriding llvm-config query - results - -Support overriding LLVM_* variables obtained from llvm-config when doing -stand-alone builds. The override of LLVM_MAIN_SRC_DIR is necessary to -provide LLVM sources when the initial directory used to build LLVM does -no longer exist when compiler-rt is built stand-alone. This is -especially the case when building the projects separately in temporary -directories with unpredictable names. - -The code is based on existing CMakeLists.txt from clang. Alike clang, it -extends the override to all queried variables. ---- - cmake/Modules/CompilerRTUtils.cmake | 13 +++++++++---- - 1 file changed, 9 insertions(+), 4 deletions(-) - -diff --git a/cmake/Modules/CompilerRTUtils.cmake b/cmake/Modules/CompilerRTUtils.cmake -index b2f27c0..5523c0a 100644 ---- a/cmake/Modules/CompilerRTUtils.cmake -+++ b/cmake/Modules/CompilerRTUtils.cmake -@@ -197,10 +197,15 @@ macro(load_llvm_config) - message(FATAL_ERROR "llvm-config failed with status ${HAD_ERROR}") - endif() - string(REGEX REPLACE "[ \t]*[\r\n]+[ \t]*" ";" CONFIG_OUTPUT ${CONFIG_OUTPUT}) -- list(GET CONFIG_OUTPUT 0 LLVM_BINARY_DIR) -- list(GET CONFIG_OUTPUT 1 LLVM_TOOLS_BINARY_DIR) -- list(GET CONFIG_OUTPUT 2 LLVM_LIBRARY_DIR) -- list(GET CONFIG_OUTPUT 3 LLVM_MAIN_SRC_DIR) -+ list(GET CONFIG_OUTPUT 0 LLVM_OBJ_ROOT) -+ list(GET CONFIG_OUTPUT 1 TOOLS_BINARY_DIR) -+ list(GET CONFIG_OUTPUT 2 LIBRARY_DIR) -+ list(GET CONFIG_OUTPUT 3 MAIN_SRC_DIR) -+ -+ set(LLVM_BINARY_DIR ${LLVM_OBJ_ROOT} CACHE PATH "Path to LLVM build tree") -+ set(LLVM_TOOLS_BINARY_DIR ${TOOLS_BINARY_DIR} CACHE PATH "Path to llvm/bin") -+ set(LLVM_LIBRARY_DIR ${LIBRARY_DIR} CACHE PATH "Path to llvm/lib") -+ set(LLVM_MAIN_SRC_DIR ${MAIN_SRC_DIR} CACHE PATH "Path to LLVM source tree") - - # Make use of LLVM CMake modules. - file(TO_CMAKE_PATH ${LLVM_BINARY_DIR} LLVM_BINARY_DIR_CMAKE_STYLE) --- -2.9.3 -