[gentoo-commits] repo/gentoo:master commit in: sys-libs/llvm-libunwind/, sys-libs/llvm-libunwind/files/

["Michał Górny" <mgorny@gentoo.org>]

commit:     1e8a318bd667c51f64bc29048cf553888bdb6325
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Apr  4 11:46:56 2018 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Apr  4 12:01:49 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1e8a318b

sys-libs/llvm-libunwind: Drop old 3.8.1

 sys-libs/llvm-libunwind/Manifest                   |  1 -
 .../llvm-libunwind/files/libunwind-3.8-cmake.patch | 82 ----------------------
 .../llvm-libunwind/llvm-libunwind-3.8.1.ebuild     | 41 -----------
 3 files changed, 124 deletions(-)

diff --git a/sys-libs/llvm-libunwind/Manifest b/sys-libs/llvm-libunwind/Manifest
index 98f7ad1e00f..58dce7b5bf5 100644
--- a/sys-libs/llvm-libunwind/Manifest
+++ b/sys-libs/llvm-libunwind/Manifest
@@ -1,6 +1,5 @@
 DIST libcxx-6.0.0.src.tar.xz 1549328 BLAKE2B 93adb339b0e849fca1850d379c8e74b407b0db8220f3a05f888db70d83ad07c3200dbd2a7827f92c60a2ba91d3395e4d1b4434ba70479c29a95aceda6c213e02 SHA512 3d93910f85a778f36c5f7a4429639008acba5713a2c8ac79a9de09463af6f9a388af45d39af23423a7223660701697ba067f3391f25d5a970973691dd88635e3
 DIST libcxxabi-6.0.0.src.tar.xz 529212 BLAKE2B ae020e8831a6ae71d59d71e294bbb0aa6dbedf1b3036b2536d9456db8c51f21e57d082c5abf5e00921a14876328bdfafab3c04b4d761cb76d52e35ff97107510 SHA512 c5e4cc05105770b42b20595fdbda5e1483be4582bc94335da1a15531ba43a0ecf30e1e0a252f62d4d0e6c79cda9d44ff5fdbe69a0a295b2431fd6de158410e2e
-DIST libunwind-3.8.1.src.tar.xz 60596 BLAKE2B e200beab1388dc73a4ed6b1be0c4931124e48e21a3d5cc0bf01ac2ce57bbc2295bd0f72acb8fc08556aed963f0cb220bd3e47c3c953f570cf2860ae822a270c7 SHA512 2a60d7c4b0aee6c58f50089ac9fa2b756ab1d74faaee32f7436ddace4510589c7ffdd20478919966ed2fa8a23ee1b5d1b26115dbd8ee2834b00b5bcd61d00b14
 DIST libunwind-3.9.0.src.tar.xz 61764 BLAKE2B 215aa7cabf9e5d8d3e3dfc3bad50f0aad1b4d2d6bef96ac4c14d987b6aa4afd0a1c0f186d63d84edcc822fd8495a000b2a24899e61176831e0ddfabea1d5c3c2 SHA512 dce384bea99ed61b363b847e20946fc9d70377389a227cc7054fbaa916e7cb5ba0b9d89f0df6ed33409dbf38beefd3654c18c1abcf0e50b5d0315ce0135a1d25
 DIST libunwind-3.9.1.src.tar.xz 61788 BLAKE2B bab410d714e2dc012273997bb3fb3c366f64608b712eae15f8c08a2b049b6bdba0660a1f4942906e2e9cd7b11563c8a5b3007b92b1485c32036ac84f55fe7053 SHA512 a80f5d0660e209f5bf709316b5df2ca63b9f0db49f5f74dfe9c9e580c654f61a15acc071a739fdb84baf5ffa9420b92498f8560331173642d80f6b74e1e2afb7
 DIST libunwind-4.0.1.src.tar.xz 63388 BLAKE2B f49772beabaa8519a5f8dbbaef9c2d6554468a66b89a5f012946d59f772fe864809a5c95b726bcb4c059ca551a4eb023a88f4fa618756b34fef2058e272467e6 SHA512 8a0552a8ab830010d81420f4b778a3b831bff85b19bcce972958fc30e1ba5a2fa26a3deba499985a43dd7a103690775f6a20e7b3edda55f4eaff3541002d6b59

diff --git a/sys-libs/llvm-libunwind/files/libunwind-3.8-cmake.patch b/sys-libs/llvm-libunwind/files/libunwind-3.8-cmake.patch
deleted file mode 100644
index 5f995be5051..00000000000
--- a/sys-libs/llvm-libunwind/files/libunwind-3.8-cmake.patch
+++ /dev/null
@@ -1,82 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index d9b2367..b6bb5fd 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -43,7 +43,7 @@ if (CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR)
-     set(LLVM_MAIN_SRC_DIR ${MAIN_SRC_DIR} CACHE PATH "Path to LLVM source tree")
-     set(LLVM_CMAKE_PATH "${LLVM_BINARY_DIR}/share/llvm/cmake")
-     set(LLVM_LIT_PATH "${LLVM_PATH}/utils/lit/lit.py")
--  else ()
-+  elseif (NOT LIBUNWIND_BUILT_STANDALONE)
-     message(FATAL_ERROR "llvm-config not found and LLVM_MAIN_SRC_DIR not defined. "
-                         "Reconfigure with -DLLVM_CONFIG=path/to/llvm-config "
-                         "or -DLLVM_PATH=path/to/llvm-source-root.")
-@@ -53,7 +53,7 @@ if (CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR)
-     list(APPEND CMAKE_MODULE_PATH "${LLVM_CMAKE_PATH}")
-     include("${LLVM_CMAKE_PATH}/AddLLVM.cmake")
-     include("${LLVM_CMAKE_PATH}/HandleLLVMOptions.cmake")
--  else ()
-+  elseif (NOT LIBUNWIND_BUILT_STANDALONE)
-     message(FATAL_ERROR "Not found: ${LLVM_CMAKE_PATH}")
-   endif ()
- 
-@@ -103,6 +103,7 @@ option(LIBUNWIND_ENABLE_ASSERTIONS "Enable assertions independent of build mode.
- option(LIBUNWIND_ENABLE_PEDANTIC "Compile with pedantic enabled." ON)
- option(LIBUNWIND_ENABLE_WERROR "Fail and stop if a warning is triggered." OFF)
- option(LIBUNWIND_ENABLE_SHARED "Build libunwind as a shared library." ON)
-+option(LIBUNWIND_ENABLE_STATIC "Build libunwind as a static library." OFF)
- 
- set(LIBUNWIND_GCC_TOOLCHAIN "" CACHE STRING "GCC toolchain for cross compiling.")
- set(LIBUNWIND_SYSROOT "" CACHE STRING "Sysroot for cross compiling.")
-@@ -136,9 +137,9 @@ macro(append_if list condition var)
- endmacro()
- 
- set(LIBUNWIND_C_FLAGS "")
--set(LIBUNWIND_CXX_FLAGS "")
-+set(LIBUNWIND_CXX_FLAGS "-std=c++11")
- set(LIBUNWIND_COMPILE_FLAGS "")
--set(LIBUNWIND_LINK_FLAGS "")
-+set(LIBUNWIND_LINK_FLAGS "-Wl,-z,noexecstack")
- 
- append_if(LIBUNWIND_COMPILE_FLAGS LIBUNWIND_HAS_WERROR_FLAG -Werror=return-type)
- 
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index ee01e9a..c66673e 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -18,7 +18,8 @@ set(LIBUNWIND_ASM_SOURCES
-     UnwindRegistersSave.S)
- set_source_files_properties(${LIBUNWIND_ASM_SOURCES}
-                             PROPERTIES
--                              LANGUAGE C)
-+                              LANGUAGE C
-+                              COMPILE_FLAGS "-Wa,--noexecstack")
- 
- set(LIBUNWIND_HEADERS
-     AddressSpace.hpp
-@@ -51,8 +52,10 @@ set(LIBUNWIND_SOURCES
- 
- if (LIBUNWIND_ENABLE_SHARED)
-   add_library(unwind SHARED ${LIBUNWIND_SOURCES} ${LIBUNWIND_HEADERS})
--else()
--  add_library(unwind STATIC ${LIBUNWIND_SOURCES} ${LIBUNWIND_HEADERS})
-+endif ()
-+if (LIBUNWIND_ENABLE_STATIC)
-+  add_library(unwind_static STATIC ${LIBUNWIND_SOURCES} ${LIBUNWIND_HEADERS})
-+  set_target_properties(unwind_static PROPERTIES OUTPUT_NAME unwind)
- endif ()
- 
- # Generate library list.
-@@ -106,7 +109,10 @@ set_target_properties(unwind
- set_property(SOURCE ${LIBUNWIND_CXX_SOURCES}
-              APPEND_STRING PROPERTY COMPILE_FLAGS "${LIBUNWIND_CXX_FLAGS}")
- 
--install(TARGETS unwind
--        LIBRARY DESTINATION lib${LLVM_LIBDIR_SUFFIX}
--        ARCHIVE DESTINATION lib${LLVM_LIBDIR_SUFFIX})
-+if (LIBUNWIND_ENABLE_SHARED)
-+  install(TARGETS unwind LIBRARY DESTINATION lib${LLVM_LIBDIR_SUFFIX})
-+endif ()
-+if (LIBUNWIND_ENABLE_STATIC)
-+  install(TARGETS unwind_static ARCHIVE DESTINATION lib${LLVM_LIBDIR_SUFFIX})
-+endif ()

diff --git a/sys-libs/llvm-libunwind/llvm-libunwind-3.8.1.ebuild b/sys-libs/llvm-libunwind/llvm-libunwind-3.8.1.ebuild
deleted file mode 100644
index 617dedb1156..00000000000
--- a/sys-libs/llvm-libunwind/llvm-libunwind-3.8.1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils
-
-MY_P="libunwind-${PV}"
-DESCRIPTION="C++ runtime stack unwinder from LLVM"
-HOMEPAGE="https://github.com/llvm-mirror/libunwind"
-SRC_URI="https://llvm.org/releases/${PV}/${MY_P}.src.tar.xz"
-
-LICENSE="|| ( UoI-NCSA MIT )"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="+static-libs"
-
-DEPEND=""
-RDEPEND="!sys-libs/libunwind"
-
-S="${WORKDIR}/${MY_P}.src"
-
-src_prepare() {
-	default
-	eapply "${FILESDIR}/libunwind-3.8-cmake.patch"
-}
-
-src_configure() {
-	local libdir=$(get_libdir)
-
-	local mycmakeargs=(
-		# work-around attempting to use llvm-config to get llvm sources
-		# (that are not needed at all)
-		-DLLVM_CONFIG=OFF
-		-DLLVM_LIBDIR_SUFFIX=${libdir#lib}
-		-DLIBUNWIND_BUILT_STANDALONE=ON
-		-DLIBUNWIND_ENABLE_STATIC=$(usex static-libs)
-	)
-
-	cmake-utils_src_configure
-}