[gentoo-commits] repo/gentoo:master commit in: gnustep-base/libobjc2/files/, gnustep-base/libobjc2/

public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed

* [gentoo-commits] repo/gentoo:master commit in: gnustep-base/libobjc2/files/, gnustep-base/libobjc2/
@ 2020-09-03  9:33 Bernard Cafarelli
  0 siblings, 0 replies; 3+ messages in thread
From: Bernard Cafarelli @ 2020-09-03  9:33 UTC (permalink / raw
  To: gentoo-commits

commit:     857dd9c2e19f23e46a0b3e9121eb417caa858693
Author:     Bernard Cafarelli <voyageur <AT> gentoo <DOT> org>
AuthorDate: Thu Sep  3 09:32:49 2020 +0000
Commit:     Bernard Cafarelli <voyageur <AT> gentoo <DOT> org>
CommitDate: Thu Sep  3 09:33:03 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=857dd9c2

gnustep-base/libobjc2: 2.1 bump

Fixes quite a few bugs
Migrated to cmake eclass
No longer depends on libcxx

Package-Manager: Portage-3.0.5, Repoman-3.0.1
Signed-off-by: Bernard Cafarelli <voyageur <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 ++++++++++++++++++++++
 4 files changed, 83 insertions(+)

diff --git a/gnustep-base/libobjc2/Manifest b/gnustep-base/libobjc2/Manifest
index a9afd544951..cfca9d8effe 100644
--- a/gnustep-base/libobjc2/Manifest
+++ b/gnustep-base/libobjc2/Manifest
@@ -1 +1,3 @@
+DIST 757de82.tar.gz 63372 BLAKE2B 74078c6c16d7ac1891ce63b21ae2f06c8759f3a95db74a6acef2d51d605a7631ac37b8c8698752699e5c30d2e95876b1967e6c2c429403f1094b6b99dd4d272c SHA512 732e7f5b4ec0dc18c0c7b2b567e4fd65727918db76863aabb4433db22630e1e3c5ba3063de6dcf32f099c0d8cfd70b0d811d59f73a2cda362f6bd7054d14f999
 DIST libobjc2-2.0.tar.gz 191800 BLAKE2B 71f54b1410e20bb638dce4cae8c2cc48ea07acf31a97f1994587a9f6401b725ac393abaef355e9476ef6a0622d80fb6fbe4b3c7f39294e7bedbba17cd4108278 SHA512 2b72506204b8fea6a76688ee96611613c4b7cf98942acc89905c531f4dc997ae0482ff10fa819c2471df6c06d5ebcd251167d8903a4f18d47507cd42baec3748
+DIST libobjc2-2.1.tar.gz 200290 BLAKE2B 67cd78238afad9afa4311669403be06ec8d001978e997128acc67cdba9c2b18482f66af4597c4a484556ce38bbfc4416b1b1cb8cde1d8f27f3b4d744d4581309 SHA512 a93c385f9ad53fce0f736088c3a18e72119c0128690725e435a35fe4250830d13e18899f98c7d80e6ea41cbfe1404f055d9d6c3d891ad7c770d47dcd0244fc7f

diff --git a/gnustep-base/libobjc2/files/libobjc2-2.1-eh_trampoline.patch b/gnustep-base/libobjc2/files/libobjc2-2.1-eh_trampoline.patch
new file mode 100644
index 00000000000..c956d15fbd5
--- /dev/null
+++ b/gnustep-base/libobjc2/files/libobjc2-2.1-eh_trampoline.patch
@@ -0,0 +1,27 @@
+From 4e07fb8457266b76311b2bf3dc5dbe8db790c0b5 Mon Sep 17 00:00:00 2001
+From: David Chisnall <github@theravensnest.org>
+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
new file mode 100644
index 00000000000..4d6f1d517db
--- /dev/null
+++ b/gnustep-base/libobjc2/files/libobjc2-2.1-pthread_link.patch
@@ -0,0 +1,12 @@
+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
new file mode 100644
index 00000000000..98b36a4a4fa
--- /dev/null
+++ b/gnustep-base/libobjc2/libobjc2-2.1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit cmake
+
+DESCRIPTION="GNUstep Objective-C runtime"
+HOMEPAGE="http://www.gnustep.org"
+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
+}


^ permalink raw reply related	[flat|nested] 3+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: gnustep-base/libobjc2/files/, gnustep-base/libobjc2/
@ 2020-09-03  9:33 Bernard Cafarelli
  0 siblings, 0 replies; 3+ messages in thread
From: Bernard Cafarelli @ 2020-09-03  9:33 UTC (permalink / raw
  To: gentoo-commits

commit:     f5d24ca24b89454e75c26959c97e2eb03f1b76d7
Author:     Bernard Cafarelli <voyageur <AT> gentoo <DOT> org>
AuthorDate: Thu Sep  3 07:57:06 2020 +0000
Commit:     Bernard Cafarelli <voyageur <AT> gentoo <DOT> org>
CommitDate: Thu Sep  3 09:33:03 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f5d24ca2

gnustep-base/libobjc2: drop old

Package-Manager: Portage-3.0.5, Repoman-3.0.1
Signed-off-by: Bernard Cafarelli <voyageur <AT> gentoo.org>

 gnustep-base/libobjc2/Manifest                     |  2 -
 .../libobjc2/files/libobjc2-1.7-fix_soname.patch   | 58 ----------------------
 gnustep-base/libobjc2/libobjc2-1.8.1.ebuild        | 45 -----------------
 gnustep-base/libobjc2/libobjc2-1.8.ebuild          | 45 -----------------
 4 files changed, 150 deletions(-)

diff --git a/gnustep-base/libobjc2/Manifest b/gnustep-base/libobjc2/Manifest
index 8de99af580c..a9afd544951 100644
--- a/gnustep-base/libobjc2/Manifest
+++ b/gnustep-base/libobjc2/Manifest
@@ -1,3 +1 @@
-DIST libobjc2-1.8.1.tar.gz 173635 BLAKE2B 1ed9df6ee934a56dd8565904f9a402f5687bac6f876bcef538fed60c4ebd34af8f35921bdabbdf1ad97fb371e591aea3e47170afaffe65056af07c88e01f0b37 SHA512 518f36e96a82a076fc67fe384226bd97310cd10a53c7b0951db9f3658aa534582b245d5cb97956fe91c38338c3fc8f1e569dd8af36f6d12e32bf1460251d02eb
-DIST libobjc2-1.8.tar.gz 173512 BLAKE2B ba494dd2db2bfdcc2cfce906014d75146368f049ebe4ea6b83024705af2b78f916252a084b95be43c245c5fd6574d00db75853d291193ea70cc48a6b5dbeab93 SHA512 1562e42dc43a24c1655d02db7aa101a48a7b026bec23252c8eec3893fbac0d67368685291df0954ee79f07b92ecc13c68ee7c7b0f351428a31e99ed05ed2230d
 DIST libobjc2-2.0.tar.gz 191800 BLAKE2B 71f54b1410e20bb638dce4cae8c2cc48ea07acf31a97f1994587a9f6401b725ac393abaef355e9476ef6a0622d80fb6fbe4b3c7f39294e7bedbba17cd4108278 SHA512 2b72506204b8fea6a76688ee96611613c4b7cf98942acc89905c531f4dc997ae0482ff10fa819c2471df6c06d5ebcd251167d8903a4f18d47507cd42baec3748

diff --git a/gnustep-base/libobjc2/files/libobjc2-1.7-fix_soname.patch b/gnustep-base/libobjc2/files/libobjc2-1.7-fix_soname.patch
deleted file mode 100644
index ba1aa8ecea9..00000000000
--- a/gnustep-base/libobjc2/files/libobjc2-1.7-fix_soname.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-diff -Naur libobjc2-1.7.orig/CMakeLists.txt libobjc2-1.7/CMakeLists.txt
---- libobjc2-1.7.orig/CMakeLists.txt	2013-06-27 13:30:41.000000000 +0200
-+++ libobjc2-1.7/CMakeLists.txt	2015-05-20 13:20:55.214244088 +0200
-@@ -8,7 +8,8 @@
- set(CMAKE_C_FLAGS_RELEASE "-O3 ${CMAKE_C_FLAGS_RELEASE}")
- set(CMAKE_C_FLAGS "-std=gnu99 ${CMAKE_C_FLAGS}")
- 
--set(libobjc_VERSION 4.6)
-+set(libobjc_SOVERSION 4)
-+set(libobjc_VERSION 4.6.0)
- 
- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fexceptions")
- # Build configuration
-@@ -204,7 +205,8 @@
- 			add_library(objcxx SHARED ${libobjcxx_CXX_SRCS})
- 			set_target_properties(objcxx PROPERTIES
- 				LINKER_LANGUAGE C
--				SOVERSION ${libobjc_VERSION}
-+            SOVERSION ${libobjc_SOVERSION}
-+            VERSION ${libobjc_VERSION}
- 				)
- 			target_link_libraries(objcxx ${CXX_RUNTIME})
- 			set(CXX_RUNTIME "")
-@@ -220,7 +222,8 @@
- 		add_library(objcxx SHARED ${libobjcxx_CXX_SRCS})
- 		set_target_properties(objcxx PROPERTIES
- 			LINKER_LANGUAGE C
--			SOVERSION ${libobjc_VERSION}
-+         SOVERSION ${libobjc_SOVERSION}
-+         VERSION ${libobjc_VERSION}
- 			)
- 		set(CXX_RUNTIME "")
- 		list(APPEND INSTALL_TARGETS objcxx)
-@@ -241,7 +244,8 @@
- 
- set_target_properties(objc PROPERTIES
- 	LINKER_LANGUAGE C
--	SOVERSION ${libobjc_VERSION}
-+   SOVERSION ${libobjc_SOVERSION}
-+   VERSION ${libobjc_VERSION}
- 	OUTPUT_NAME ${LIBOBJC_NAME}
- 	LINK_FLAGS "${objc_LINK_FLAGS}"
- 	)
-@@ -349,3 +353,14 @@
- 	add_subdirectory(Test)
- endif (TESTS)
- 
-+
-+MESSAGE(STATUS "<<< Gentoo configuration >>>
-+Build type      ${CMAKE_BUILD_TYPE}
-+Install path    ${CMAKE_INSTALL_PREFIX}
-+Compiler flags:
-+C               ${CMAKE_C_FLAGS}
-+C++             ${CMAKE_CXX_FLAGS}
-+Linker flags:
-+Executable      ${CMAKE_EXE_LINKER_FLAGS}
-+Module          ${CMAKE_MODULE_LINKER_FLAGS}
-+Shared          ${CMAKE_SHARED_LINKER_FLAGS}\n")

diff --git a/gnustep-base/libobjc2/libobjc2-1.8.1.ebuild b/gnustep-base/libobjc2/libobjc2-1.8.1.ebuild
deleted file mode 100644
index 5f701cd27c0..00000000000
--- a/gnustep-base/libobjc2/libobjc2-1.8.1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit cmake-utils eutils
-
-DESCRIPTION="GNUstep Objective-C runtime"
-HOMEPAGE="http://www.gnustep.org"
-SRC_URI="https://github.com/gnustep/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="boehm-gc cxx test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="boehm-gc? ( dev-libs/boehm-gc )
-	cxx? ( sys-libs/libcxx )"
-DEPEND="${DEPEND}
-	>=sys-devel/clang-2.9"
-
-PATCHES=( "${FILESDIR}"/${PN}-1.7-fix_soname.patch )
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	if ! use cxx;
-	then
-		sed -e 's/addtest_flags(CXXExceptions.*//' \
-			-i Test/CMakeLists.txt || die "test sed failed"
-	fi
-}
-
-src_configure() {
-	export CC=clang
-	export CXX=clang++
-
-	local mycmakeargs=(
-		-DGNUSTEP_CONFIG=GNUSTEP_CONFIG-NOTFOUND
-		$(cmake-utils_use boehm-gc BOEHM_GC)
-		$(cmake-utils_use_enable cxx OBJCXX)
-		$(cmake-utils_use test TESTS)
-	)
-	cmake-utils_src_configure
-}

diff --git a/gnustep-base/libobjc2/libobjc2-1.8.ebuild b/gnustep-base/libobjc2/libobjc2-1.8.ebuild
deleted file mode 100644
index 5f701cd27c0..00000000000
--- a/gnustep-base/libobjc2/libobjc2-1.8.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit cmake-utils eutils
-
-DESCRIPTION="GNUstep Objective-C runtime"
-HOMEPAGE="http://www.gnustep.org"
-SRC_URI="https://github.com/gnustep/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="boehm-gc cxx test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="boehm-gc? ( dev-libs/boehm-gc )
-	cxx? ( sys-libs/libcxx )"
-DEPEND="${DEPEND}
-	>=sys-devel/clang-2.9"
-
-PATCHES=( "${FILESDIR}"/${PN}-1.7-fix_soname.patch )
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	if ! use cxx;
-	then
-		sed -e 's/addtest_flags(CXXExceptions.*//' \
-			-i Test/CMakeLists.txt || die "test sed failed"
-	fi
-}
-
-src_configure() {
-	export CC=clang
-	export CXX=clang++
-
-	local mycmakeargs=(
-		-DGNUSTEP_CONFIG=GNUSTEP_CONFIG-NOTFOUND
-		$(cmake-utils_use boehm-gc BOEHM_GC)
-		$(cmake-utils_use_enable cxx OBJCXX)
-		$(cmake-utils_use test TESTS)
-	)
-	cmake-utils_src_configure
-}


^ permalink raw reply related	[flat|nested] 3+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: gnustep-base/libobjc2/files/, gnustep-base/libobjc2/
@ 2024-03-26 20:00 Andreas Sturmlechner
  0 siblings, 0 replies; 3+ messages in thread
From: Andreas Sturmlechner @ 2024-03-26 20:00 UTC (permalink / raw
  To: gentoo-commits

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 <github@theravensnest.org>
-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>


^ permalink raw reply related	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2024-03-26 20:00 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-03-26 20:00 [gentoo-commits] repo/gentoo:master commit in: gnustep-base/libobjc2/files/, gnustep-base/libobjc2/ Andreas Sturmlechner
  -- strict thread matches above, loose matches on Subject: below --
2020-09-03  9:33 Bernard Cafarelli
2020-09-03  9:33 Bernard Cafarelli

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox