summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichał Górny <mgorny@gentoo.org>2017-07-25 09:53:02 +0200
committerMichał Górny <mgorny@gentoo.org>2017-07-25 09:57:52 +0200
commit49d533da7fc4d360c18592374aed5a0be8fb17fc (patch)
tree8a6d55632d24e2dedd9f12c65274cdf4e180e13f /sys-devel/lld
parentsys-devel/clang: Clean old up (diff)
downloadgentoo-49d533da7fc4d360c18592374aed5a0be8fb17fc.tar.gz
gentoo-49d533da7fc4d360c18592374aed5a0be8fb17fc.tar.bz2
gentoo-49d533da7fc4d360c18592374aed5a0be8fb17fc.zip
sys-devel/lld: Clean old up
Diffstat (limited to 'sys-devel/lld')
-rw-r--r--sys-devel/lld/Manifest2
-rw-r--r--sys-devel/lld/files/4.0.0/0001-cmake-Support-running-tests-in-stand-alone-builds.patch160
-rw-r--r--sys-devel/lld/lld-4.0.0.ebuild77
3 files changed, 0 insertions, 239 deletions
diff --git a/sys-devel/lld/Manifest b/sys-devel/lld/Manifest
index 415216e8d04..1fe9bde7087 100644
--- a/sys-devel/lld/Manifest
+++ b/sys-devel/lld/Manifest
@@ -1,4 +1,2 @@
-DIST lld-4.0.0.src.tar.xz 592728 SHA256 33e06457b9ce0563c89b11ccc7ccabf9cff71b83571985a5bf8684c9150e7502 SHA512 66b2c9cc57f5e94ad7e7da1b1bcc08cbbaee1b55c6efa64b2424b9d8776c70b842c2a31c188a99b447be6a8621ad1b1e70573bbfcf5d6b1aa986b03b3b3350f3 WHIRLPOOL 5bc86e7aa67a519939780e0d3792f4bebc69f1748b919c1919f1afc1715e21bbf7be2a0f771948dd551861186c3171589a1843f817de7cb9d8bac81b077e8844
DIST lld-4.0.1.src.tar.xz 593796 SHA256 63ce10e533276ca353941ce5ab5cc8e8dcd99dbdd9c4fa49f344a212f29d36ed SHA512 63bd0813094dc7fa9a95fdee93eb7b97026882a15548f819b5c67f3f0f9fa2a582d968af27ad8f802dbff1f6cd1b8c2fb26b3c7c80379488d05c4a4984d7af68 WHIRLPOOL e7adca75f7f5fbb6136d01544798e969cba69b86c5b76a7fdcf7918564aa13eb868f4fa41102d7a4c501f741664ae309d6842c821ac974503431722ae963f93f
-DIST llvm-4.0.0.src.tar.xz 21016340 SHA256 8d10511df96e73b8ff9e7abbfb4d4d432edbdbe965f1f4f07afaf370b8a533be SHA512 cf681f0626ef6d568d951cdc3e143471a1d7715a0ba11e52aa273cf5d8d421e1357ef2645cc85879eaefcd577e99e74d07b01566825b3d0461171ef2cbfc7704 WHIRLPOOL 9783e8f47306c1deb2e114d4b46a7db9b0260b4965076345c88765413c5fc8e73fab5f88ae4903adbdea31406022948b16d32ae47d98f5def074509d5d794579
DIST llvm-4.0.1.src.tar.xz 21065652 SHA256 da783db1f82d516791179fe103c71706046561f7972b18f0049242dee6712b51 SHA512 16adc39b34ddb628f81b171119a8e2a0e9138b25011e803ef0b688e2fbea116fc4953d3a1b61b90a98a75e33619f81566b7cb06a9a2ea4d04ac5e0eb303a2d1d WHIRLPOOL 1626ff270f7ce4801d02a0797b227fda9314ff5c0c01d653111599e9a4d2854c4d9edc3c698a7abee8d79d6bce8b18dc619fbced3c07ca610d44a248d65830cc
diff --git a/sys-devel/lld/files/4.0.0/0001-cmake-Support-running-tests-in-stand-alone-builds.patch b/sys-devel/lld/files/4.0.0/0001-cmake-Support-running-tests-in-stand-alone-builds.patch
deleted file mode 100644
index e61801a70d5..00000000000
--- a/sys-devel/lld/files/4.0.0/0001-cmake-Support-running-tests-in-stand-alone-builds.patch
+++ /dev/null
@@ -1,160 +0,0 @@
-From b06a494b5a8cbacfa3ce34106a8aaba10c0e7948 Mon Sep 17 00:00:00 2001
-From: Michal Gorny <mgorny@gentoo.org>
-Date: Tue, 31 Jan 2017 14:10:20 +0000
-Subject: [PATCH 1/3] [cmake] Support running tests in stand-alone builds
-
-Add the CMake bits necessary to run lld tests (and unittests) when
-building stand-alone. The code is based on the equivalent code in clang,
-and includes:
-
-1. checking for Python, searching for lit and necessary LLVM test tools
-(FileCount and not),
-
-2. building LLVM test tools (FileCount and not) from LLVM sources if
-they are not installed,
-
-3. building gtest libraries from LLVM sources,
-
-4. adjusting dependencies so that test targets depend only on those LLVM
-targets that are available for a particular variant of stand-alone
-build.
-
-With this patch, I am able to successfully run 1002 (+10 unsupported)
-lit tests on Gentoo using installed LLVM.
-
-Differential Revision: https://reviews.llvm.org/D28750
-
-git-svn-id: https://llvm.org/svn/llvm-project/lld/trunk@293630 91177308-0d34-0410-b5e6-96231b3b80d8
----
- CMakeLists.txt | 68 ++++++++++++++++++++++++++++++++++++++++++++++++++++-
- test/CMakeLists.txt | 16 ++++++++-----
- 2 files changed, 77 insertions(+), 7 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index be424efbb..7fcb1a748 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -11,8 +11,11 @@ if(CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR)
- message(FATAL_ERROR "llvm-config not found: specify LLVM_CONFIG_PATH")
- endif()
-
-- execute_process(COMMAND "${LLVM_CONFIG_PATH}" "--obj-root" "--includedir"
-+ execute_process(COMMAND "${LLVM_CONFIG_PATH}"
-+ "--obj-root"
-+ "--includedir"
- "--cmakedir"
-+ "--src-root"
- RESULT_VARIABLE HAD_ERROR
- OUTPUT_VARIABLE LLVM_CONFIG_OUTPUT
- OUTPUT_STRIP_TRAILING_WHITESPACE)
-@@ -25,9 +28,11 @@ if(CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR)
- list(GET LLVM_CONFIG_OUTPUT 0 OBJ_ROOT)
- list(GET LLVM_CONFIG_OUTPUT 1 MAIN_INCLUDE_DIR)
- list(GET LLVM_CONFIG_OUTPUT 2 LLVM_CMAKE_PATH)
-+ list(GET LLVM_CONFIG_OUTPUT 3 MAIN_SRC_DIR)
-
- set(LLVM_OBJ_ROOT ${OBJ_ROOT} CACHE PATH "path to LLVM build tree")
- set(LLVM_MAIN_INCLUDE_DIR ${MAIN_INCLUDE_DIR} CACHE PATH "path to llvm/include")
-+ set(LLVM_MAIN_SRC_DIR ${MAIN_SRC_DIR} CACHE PATH "Path to LLVM source tree")
-
- file(TO_CMAKE_PATH ${LLVM_OBJ_ROOT} LLVM_BINARY_DIR)
-
-@@ -49,6 +54,67 @@ if(CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR)
- include(AddLLVM)
- include(TableGen)
- include(HandleLLVMOptions)
-+
-+ if(LLVM_INCLUDE_TESTS)
-+ set(Python_ADDITIONAL_VERSIONS 2.7)
-+ include(FindPythonInterp)
-+ if(NOT PYTHONINTERP_FOUND)
-+ message(FATAL_ERROR
-+"Unable to find Python interpreter, required for testing.
-+
-+Please install Python or specify the PYTHON_EXECUTABLE CMake variable.")
-+ endif()
-+
-+ if(${PYTHON_VERSION_STRING} VERSION_LESS 2.7)
-+ message(FATAL_ERROR "Python 2.7 or newer is required")
-+ endif()
-+
-+ # Check prebuilt llvm/utils.
-+ if(EXISTS ${LLVM_TOOLS_BINARY_DIR}/FileCheck${CMAKE_EXECUTABLE_SUFFIX}
-+ AND EXISTS ${LLVM_TOOLS_BINARY_DIR}/not${CMAKE_EXECUTABLE_SUFFIX})
-+ set(LLVM_UTILS_PROVIDED ON)
-+ endif()
-+
-+ if(EXISTS ${LLVM_MAIN_SRC_DIR}/utils/lit/lit.py)
-+ # Note: path not really used, except for checking if lit was found
-+ set(LLVM_LIT ${LLVM_MAIN_SRC_DIR}/utils/lit/lit.py)
-+ if(NOT LLVM_UTILS_PROVIDED)
-+ add_subdirectory(${LLVM_MAIN_SRC_DIR}/utils/FileCheck utils/FileCheck)
-+ add_subdirectory(${LLVM_MAIN_SRC_DIR}/utils/not utils/not)
-+ set(LLVM_UTILS_PROVIDED ON)
-+ set(LLD_TEST_DEPS FileCheck not)
-+ endif()
-+ set(UNITTEST_DIR ${LLVM_MAIN_SRC_DIR}/utils/unittest)
-+ if(EXISTS ${UNITTEST_DIR}/googletest/include/gtest/gtest.h
-+ AND NOT EXISTS ${LLVM_LIBRARY_DIR}/${CMAKE_STATIC_LIBRARY_PREFIX}gtest${CMAKE_STATIC_LIBRARY_SUFFIX}
-+ AND EXISTS ${UNITTEST_DIR}/CMakeLists.txt)
-+ add_subdirectory(${UNITTEST_DIR} utils/unittest)
-+ endif()
-+ else()
-+ # Seek installed Lit.
-+ find_program(LLVM_LIT
-+ NAMES llvm-lit lit.py lit
-+ PATHS "${LLVM_MAIN_SRC_DIR}/utils/lit"
-+ DOC "Path to lit.py")
-+ endif()
-+
-+ if(LLVM_LIT)
-+ # Define the default arguments to use with 'lit', and an option for the user
-+ # to override.
-+ set(LIT_ARGS_DEFAULT "-sv")
-+ if (MSVC OR XCODE)
-+ set(LIT_ARGS_DEFAULT "${LIT_ARGS_DEFAULT} --no-progress-bar")
-+ endif()
-+ set(LLVM_LIT_ARGS "${LIT_ARGS_DEFAULT}" CACHE STRING "Default options for lit")
-+
-+ # On Win32 hosts, provide an option to specify the path to the GnuWin32 tools.
-+ if(WIN32 AND NOT CYGWIN)
-+ set(LLVM_LIT_TOOLS_DIR "" CACHE PATH "Path to GnuWin32 tools")
-+ endif()
-+ else()
-+ set(LLVM_INCLUDE_TESTS OFF)
-+ endif()
-+ endif()
- endif()
-
- set(LLD_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR})
-diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
-index 678880b7f..ede92c13d 100644
---- a/test/CMakeLists.txt
-+++ b/test/CMakeLists.txt
-@@ -19,13 +19,17 @@ configure_lit_site_cfg(
- ${CMAKE_CURRENT_BINARY_DIR}/Unit/lit.site.cfg
- )
-
--set(LLD_TEST_DEPS
-- FileCheck not llvm-ar llvm-as llvm-dis llvm-dwarfdump llvm-nm
-- llc lld llvm-config llvm-objdump llvm-readobj yaml2obj obj2yaml
-- llvm-mc llvm-lib llvm-pdbdump opt
-- )
-+set(LLD_TEST_DEPS lld)
-+if (NOT LLD_BUILT_STANDALONE)
-+ list(APPEND LLD_TEST_DEPS
-+ FileCheck not llvm-ar llvm-as llvm-dis llvm-dwarfdump llvm-nm
-+ llc llvm-config llvm-objdump llvm-readobj yaml2obj obj2yaml
-+ llvm-mc llvm-lib llvm-pdbdump opt
-+ )
-+endif()
-+
- if (LLVM_INCLUDE_TESTS)
-- set(LLD_TEST_DEPS ${LLD_TEST_DEPS} LLDUnitTests)
-+ list(APPEND LLD_TEST_DEPS LLDUnitTests)
- endif()
-
- set(LLD_TEST_PARAMS
---
-2.12.0
-
diff --git a/sys-devel/lld/lld-4.0.0.ebuild b/sys-devel/lld/lld-4.0.0.ebuild
deleted file mode 100644
index cba6ee33966..00000000000
--- a/sys-devel/lld/lld-4.0.0.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-: ${CMAKE_MAKEFILE_GENERATOR:=ninja}
-# (needed due to CMAKE_BUILD_TYPE != Gentoo)
-CMAKE_MIN_VERSION=3.7.0-r1
-PYTHON_COMPAT=( python2_7 )
-
-inherit cmake-utils llvm python-any-r1
-
-DESCRIPTION="The LLVM linker (link editor)"
-HOMEPAGE="https://llvm.org/"
-SRC_URI="https://releases.llvm.org/${PV/_//}/${P/_/}.src.tar.xz
- test? ( https://releases.llvm.org/${PV/_//}/llvm-${PV/_/}.src.tar.xz )"
-
-LICENSE="UoI-NCSA"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="test"
-
-RDEPEND="~sys-devel/llvm-${PV}"
-DEPEND="${RDEPEND}
- test? ( $(python_gen_any_dep "~dev-python/lit-${PV}[\${PYTHON_USEDEP}]") )"
-
-S=${WORKDIR}/${P/_/}.src
-
-# least intrusive of all
-CMAKE_BUILD_TYPE=RelWithDebInfo
-
-python_check_deps() {
- has_version "dev-python/lit[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
- LLVM_MAX_SLOT=${PV%%.*} llvm_pkg_setup
- use test && python-any-r1_pkg_setup
-}
-
-src_unpack() {
- default
-
- if use test; then
- mv llvm-* llvm || die
- fi
-}
-
-src_prepare() {
- # backport stand-alone build test fixes from master
- eapply "${FILESDIR}/4.0.0/0001-cmake-Support-running-tests-in-stand-alone-builds.patch"
- eapply "${FILESDIR}/4.0.1/0002-test-Use-LLD-specific-binary-library-dirs-when-build.patch"
- eapply "${FILESDIR}/4.0.1/0003-test-Fix-zlib-cond-when-building-stand-alone-clean-u.patch"
-
- eapply_user
-}
-
-src_configure() {
- local mycmakeargs=(
- -DBUILD_SHARED_LIBS=ON
-
- -DLLVM_INCLUDE_TESTS=$(usex test)
- # TODO: fix detecting pthread upstream in stand-alone build
- -DPTHREAD_LIB='-lpthread'
- )
- use test && mycmakeargs+=(
- -DLLVM_BUILD_TESTS=ON
- -DLLVM_MAIN_SRC_DIR="${WORKDIR}/llvm"
- -DLIT_COMMAND="${EPREFIX}/usr/bin/lit"
- )
-
- cmake-utils_src_configure
-}
-
-src_test() {
- cmake-utils_src_make check-lld
-}