commit: b02998898847086488f018f869aea0ec35e2279c Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Tue Mar 26 11:13:20 2024 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Tue Mar 26 19:58:45 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b0299889
gnustep-base/libobjc2: drop 2.1 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> gnustep-base/libobjc2/Manifest | 2 -- .../files/libobjc2-2.1-eh_trampoline.patch | 27 -------------- .../libobjc2/files/libobjc2-2.1-pthread_link.patch | 12 ------- gnustep-base/libobjc2/libobjc2-2.1.ebuild | 42 ---------------------- gnustep-base/libobjc2/metadata.xml | 4 --- 5 files changed, 87 deletions(-) diff --git a/gnustep-base/libobjc2/Manifest b/gnustep-base/libobjc2/Manifest index 3944d474ac36..b82c56d4e4f9 100644 --- a/gnustep-base/libobjc2/Manifest +++ b/gnustep-base/libobjc2/Manifest @@ -1,3 +1 @@ -DIST 757de82.tar.gz 63372 BLAKE2B 74078c6c16d7ac1891ce63b21ae2f06c8759f3a95db74a6acef2d51d605a7631ac37b8c8698752699e5c30d2e95876b1967e6c2c429403f1094b6b99dd4d272c SHA512 732e7f5b4ec0dc18c0c7b2b567e4fd65727918db76863aabb4433db22630e1e3c5ba3063de6dcf32f099c0d8cfd70b0d811d59f73a2cda362f6bd7054d14f999 -DIST libobjc2-2.1.tar.gz 200290 BLAKE2B 67cd78238afad9afa4311669403be06ec8d001978e997128acc67cdba9c2b18482f66af4597c4a484556ce38bbfc4416b1b1cb8cde1d8f27f3b4d744d4581309 SHA512 a93c385f9ad53fce0f736088c3a18e72119c0128690725e435a35fe4250830d13e18899f98c7d80e6ea41cbfe1404f055d9d6c3d891ad7c770d47dcd0244fc7f DIST libobjc2-2.2.tar.gz 203442 BLAKE2B 87a1a50e97f27f347ea9edfbaed1e7938f9fd090e1726d5564215326a607b59cc763729396f4de7634a2f199ada822e8244950f6f77f501e59d1d2423cf75076 SHA512 4e49dc00be5a9282678b7cd4793ef1c4202e4a7f26dba2a170f0ff77b0f311c0f44eb72093a01367be34f12156ffd07fec40067162b9c0e4f561ec0784ab0643 diff --git a/gnustep-base/libobjc2/files/libobjc2-2.1-eh_trampoline.patch b/gnustep-base/libobjc2/files/libobjc2-2.1-eh_trampoline.patch deleted file mode 100644 index c956d15fbd59..000000000000 --- a/gnustep-base/libobjc2/files/libobjc2-2.1-eh_trampoline.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 4e07fb8457266b76311b2bf3dc5dbe8db790c0b5 Mon Sep 17 00:00:00 2001 -From: David Chisnall <[email protected]> -Date: Wed, 26 Aug 2020 16:37:06 +0100 -Subject: [PATCH] Don't use CXXFLAGS when compiling eh_trampoline.cc - -The way that we were doing this didn't handle multiple flags and we -actually don't want the user to override these flags because that file -needs to be compiled in a very specific way. - -Fixes #177 ---- - CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index e2746e9..80b7dfe 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -317,7 +317,7 @@ if (ENABLE_OBJCXX) - endif() - endif () - add_custom_command(OUTPUT eh_trampoline.s -- COMMAND ${CMAKE_CXX_COMPILER} ${CMAKE_CXX_FLAGS} -fPIC -S "${CMAKE_SOURCE_DIR}/eh_trampoline.cc" -o - -fexceptions -fno-inline | sed "s/__gxx_personality_v0/test_eh_personality/g" > "${CMAKE_BINARY_DIR}/eh_trampoline.s" -+ COMMAND ${CMAKE_CXX_COMPILER} -fPIC -S "${CMAKE_SOURCE_DIR}/eh_trampoline.cc" -o - -fexceptions -fno-inline | sed "s/__gxx_personality_v0/test_eh_personality/g" > "${CMAKE_BINARY_DIR}/eh_trampoline.s" - MAIN_DEPENDENCY eh_trampoline.cc) - list(APPEND libobjc_ASM_SRCS eh_trampoline.s) - list(APPEND libobjc_CXX_SRCS objcxx_eh.cc) diff --git a/gnustep-base/libobjc2/files/libobjc2-2.1-pthread_link.patch b/gnustep-base/libobjc2/files/libobjc2-2.1-pthread_link.patch deleted file mode 100644 index 4d6f1d517db1..000000000000 --- a/gnustep-base/libobjc2/files/libobjc2-2.1-pthread_link.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naur libobjc2-2.1.orig/CMakeLists.txt libobjc2-2.1/CMakeLists.txt ---- libobjc2-2.1.orig/CMakeLists.txt 2020-08-23 17:10:20.000000000 +0200 -+++ libobjc2-2.1/CMakeLists.txt 2020-09-03 10:51:38.716078009 +0200 -@@ -344,7 +344,7 @@ - # threading implementation (we do for everything except thread-local storage) - set(CMAKE_THREAD_PREFER_PTHREAD) - include(FindThreads) --set(objc_LINK_FLAGS "${objc_LINK_FLAGS} ${CMAKE_THREAD_LIBS_INIT}") -+target_link_libraries(objc Threads::Threads) - - - diff --git a/gnustep-base/libobjc2/libobjc2-2.1.ebuild b/gnustep-base/libobjc2/libobjc2-2.1.ebuild deleted file mode 100644 index cb88bdb54a2e..000000000000 --- a/gnustep-base/libobjc2/libobjc2-2.1.ebuild +++ /dev/null @@ -1,42 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit cmake - -DESCRIPTION="GNUstep Objective-C runtime" -HOMEPAGE="https://gnustep.github.io"; -SRC_URI="https://github.com/gnustep/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz - https://github.com/Tessil/robin-map/archive/757de82.tar.gz"; - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="boehm-gc test" -RESTRICT="!test? ( test )" - -RDEPEND="boehm-gc? ( dev-libs/boehm-gc )" -BDEPEND="${RDEPEND} - sys-devel/clang" - -PATCHES=( - "${FILESDIR}"/${P}-eh_trampoline.patch - "${FILESDIR}"/${P}-pthread_link.patch -) - -src_prepare() { - cmake_src_prepare - cp -a "${WORKDIR}"/robin-map-757de829927489bee55ab02147484850c687b620/* \ - "${S}"/third_party/robin-map || die -} - -src_configure() { - export CC="clang" - export CXX="clang++" - local mycmakeargs=( - -DGNUSTEP_CONFIG=GNUSTEP_CONFIG-NOTFOUND - -DBOEHM_GC="$(usex boehm-gc)" - -DTESTS="$(usex test)" - ) - cmake_src_configure -} diff --git a/gnustep-base/libobjc2/metadata.xml b/gnustep-base/libobjc2/metadata.xml index 2d0a8b5d7a51..2fd045d0260c 100644 --- a/gnustep-base/libobjc2/metadata.xml +++ b/gnustep-base/libobjc2/metadata.xml @@ -23,10 +23,6 @@ - Efficient support for @synchronized() - Type-dependent dispatch, eliminating stack corruption from mismatched selectors. </longdescription> - <use> - <flag name="boehm-gc">Enable Hans Boehm's garbage collector - (<pkg>dev-libs/boehm-gc</pkg>). Not recommended by upstream</flag> - </use> <upstream> <remote-id type="github">gnustep/libobjc2</remote-id> </upstream>
