From 06cdfeaa136fd7a39ebeadea120e688bcb54e3ae Mon Sep 17 00:00:00 2001 From: Michał Górny Date: Wed, 11 Apr 2018 22:48:26 +0200 Subject: sys-libs/llvm-libunwind: Remove 3.9.1 (old) --- sys-libs/llvm-libunwind/Manifest | 1 - .../files/libunwind-3.9-cmake-static-lib.patch | 43 ------------------- .../llvm-libunwind/llvm-libunwind-3.9.1.ebuild | 49 ---------------------- 3 files changed, 93 deletions(-) delete mode 100644 sys-libs/llvm-libunwind/files/libunwind-3.9-cmake-static-lib.patch delete mode 100644 sys-libs/llvm-libunwind/llvm-libunwind-3.9.1.ebuild (limited to 'sys-libs') diff --git a/sys-libs/llvm-libunwind/Manifest b/sys-libs/llvm-libunwind/Manifest index 08e4c0ddfd08..e0ea350f06d4 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.9.1.src.tar.xz 61788 BLAKE2B bab410d714e2dc012273997bb3fb3c366f64608b712eae15f8c08a2b049b6bdba0660a1f4942906e2e9cd7b11563c8a5b3007b92b1485c32036ac84f55fe7053 SHA512 a80f5d0660e209f5bf709316b5df2ca63b9f0db49f5f74dfe9c9e580c654f61a15acc071a739fdb84baf5ffa9420b92498f8560331173642d80f6b74e1e2afb7 DIST libunwind-4.0.1.src.tar.xz 63388 BLAKE2B f49772beabaa8519a5f8dbbaef9c2d6554468a66b89a5f012946d59f772fe864809a5c95b726bcb4c059ca551a4eb023a88f4fa618756b34fef2058e272467e6 SHA512 8a0552a8ab830010d81420f4b778a3b831bff85b19bcce972958fc30e1ba5a2fa26a3deba499985a43dd7a103690775f6a20e7b3edda55f4eaff3541002d6b59 DIST libunwind-5.0.1.src.tar.xz 72180 BLAKE2B da1fbb92e9953d018a3c30290ceda9a2a18c21b5c908d9ff65979158bd06b8866eb74f078d12832e2aed7d0332c996262e3b2a1341844eb933ba3de5fb41ff98 SHA512 6c0f7a286c1ffa46769685ee36604cd90ed40470e1c3d3ef03c46bcc9e5f9e36e68a0a1f67b9b300823170b48c9b8d2db4625afd885f1d024905db1dffd9fc49 DIST libunwind-6.0.0.src.tar.xz 76600 BLAKE2B 7767f3564ef72b6049c5247881e09e6c56ccd24acc1b7a1742476c4d01b2be792afdc73c8138ca5b1549be9b83267e6a7860aa085514d86eac90545219dae835 SHA512 a35e992223f094bdac5f1565806fe485a878f9baf4502e7f3777276f5c11aeff4beee155512b1c687f4471f34acbd50c834e98120093cf2582007422cec7fb2e diff --git a/sys-libs/llvm-libunwind/files/libunwind-3.9-cmake-static-lib.patch b/sys-libs/llvm-libunwind/files/libunwind-3.9-cmake-static-lib.patch deleted file mode 100644 index 82beb4481410..000000000000 --- a/sys-libs/llvm-libunwind/files/libunwind-3.9-cmake-static-lib.patch +++ /dev/null @@ -1,43 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 806b825..4b330f9 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -104,6 +104,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) - option(LIBUNWIND_ENABLE_CROSS_UNWINDING "Enable cross-platform unwinding support." OFF) - option(LIBUNWIND_ENABLE_ARM_WMMX "Enable unwinding support for ARM WMMX registers." OFF) - -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index b7c2d63..7c453de 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -51,8 +51,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. -@@ -109,7 +111,9 @@ set_property(SOURCE ${LIBUNWIND_CXX_SOURCES} - set_property(SOURCE ${LIBUNWIND_C_SOURCES} - APPEND_STRING PROPERTY COMPILE_FLAGS " ${CMAKE_C_FLAGS} ${LIBUNWIND_C_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.9.1.ebuild b/sys-libs/llvm-libunwind/llvm-libunwind-3.9.1.ebuild deleted file mode 100644 index 6a132e567b55..000000000000 --- a/sys-libs/llvm-libunwind/llvm-libunwind-3.9.1.ebuild +++ /dev/null @@ -1,49 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -: ${CMAKE_MAKEFILE_GENERATOR:=ninja} -inherit cmake-multilib - -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 ~arm64 x86" -IUSE="debug +static-libs" - -RDEPEND="!sys-libs/libunwind" -# llvm-config and cmake files needed to get proper flags -# (3.9.0 needed because cmake file install path changed) -DEPEND=">=sys-devel/llvm-3.9.0[${MULTILIB_USEDEP}]" - -S="${WORKDIR}/${MY_P}.src" - -src_prepare() { - # add switch for static-libs; accepted upstream - eapply "${FILESDIR}/libunwind-3.9-cmake-static-lib.patch" - default -} - -multilib_src_configure() { - local libdir=$(get_libdir) - - local mycmakeargs=( - -DLLVM_LIBDIR_SUFFIX=${libdir#lib} - -DLIBUNWIND_ENABLE_ASSERTIONS=$(usex debug) - -DLIBUNWIND_ENABLE_STATIC=$(usex static-libs) - ) - - cmake-utils_src_configure -} - -multilib_src_install() { - cmake-utils_src_install - - # install headers like sys-libs/libunwind - doheader "${S}"/include/*.h -} -- cgit v1.2.3-65-gdbad