commit: b08ca3454471ee79ac30f58b0ddfec87c85fc699 Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Sun Mar 13 17:57:56 2022 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Sun Mar 13 17:58:01 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b08ca345
sys-libs/tapi: drop 1.30 Clean up as much as we can, anyway, while last-rites pend. Bug: https://bugs.gentoo.org/834306 Signed-off-by: Sam James <sam <AT> gentoo.org> sys-libs/tapi/Manifest | 1 - .../tapi/files/tapi-1.30-allow-all-clients.patch | 17 ------ sys-libs/tapi/files/tapi-1.30-llvm-config.patch | 11 ---- .../tapi/files/tapi-1.30-llvm-new-error-api.patch | 65 ---------------------- .../tapi/files/tapi-1.30-llvm-out-of-tree.patch | 10 ---- sys-libs/tapi/tapi-1.30.ebuild | 37 ------------ 6 files changed, 141 deletions(-) diff --git a/sys-libs/tapi/Manifest b/sys-libs/tapi/Manifest index cf5af5026f16..f039ef639cc4 100644 --- a/sys-libs/tapi/Manifest +++ b/sys-libs/tapi/Manifest @@ -1,5 +1,4 @@ DIST cfe-5.0.1.src.tar.xz 11483036 BLAKE2B c4eb54cd8271b62cf7a2219db0b599b68c00b6e574d1946220efbd1633e841796e6717d6eeb35e84a6db32a731a3285b59cedeb3b1a8f3c3c502b799fdd0a720 SHA512 6619177a2ff9934fe8b15d6aa229abb8e34d0b1a75228d9efba9393daf71d6419a7256de57b31e2f9f829f71f842118556f996e86ee076f1e0a7cd394dfd31a2 DIST clang-800.0.42.1.tar.gz 41165807 BLAKE2B 89e3ddc0268c2302f6679089648163a1b7457c3133f8f07de12c5980a66b6b7efdfa65966f5d9425ca20bd622cb1739bc009fe45edb4f0986ffd36af77a2480e SHA512 7fec6236996e4647043697f0f62d2eddb064a4604a7c64c11d2df2ff89aff95f4eb9fe1c2e604c0e276296927dd06b8a7794e0343bf0352cf65400dde40aab41 DIST llvm-5.0.1.src.tar.xz 23428720 BLAKE2B 3db4d33df21018d17eef0042c0d8d82a8412bd5daa99cfb5405a6ec83c5774178fa76b220e8731c2a9a64dabf898aa90fe29c685327bd63a4f078e8e94a9a77e SHA512 bee1d45fca15ce725b1f2b1339b13eb6f750a3a321cfd099075477ec25835a8ca55b5366172c4aad46592dfd8afe372349ecf264f581463d017f9cee2d63c1cb -DIST tapi-1.30.tar.gz 29071 BLAKE2B e5eb4f2eea6500d4f06c490c8b7f70070fe2ba31579133b92c1d162c33afb3c422c2fba1249734a5749455185a4fc3d79b1eb00820387990cc65fe0fc69ac55a SHA512 fa495da150c6b6ff9e0bf667a9a06f0b932363297b75379fd59a5c728168a3ac103a656d1a59fa1b0c0012a18c9874439237bbf2a3c26f9bdf202b4d78e31520 DIST tapi-2.0.0.tar.gz 195080 BLAKE2B 28c31f4cb119525edb1a755895d8a3a05c9a606610fbf0c135790c0caf85a26d3b7e7fbbf856d001c26641a755e0d836f2f697a5856153d9dfc7c258e28427a1 SHA512 fc7209556ff75285a99ce64225831d53f9d959f7d6d9562cbfe91b019591860a00196c93de2258bbdaba02301af38990557b7e241ad3f66d09eb9440f4edf5ab diff --git a/sys-libs/tapi/files/tapi-1.30-allow-all-clients.patch b/sys-libs/tapi/files/tapi-1.30-allow-all-clients.patch deleted file mode 100644 index 98309132cf70..000000000000 --- a/sys-libs/tapi/files/tapi-1.30-allow-all-clients.patch +++ /dev/null @@ -1,17 +0,0 @@ -libtapi is by default limited to be linked to binaries called ld only. When -trying to link it into e.g. our ld64 we get: - -ld: cannot link directly with ${EPREFIX}/usr/lib/libtapi.dylib for architecture -x86_64 - -Drop that limitation in order to be able to use the library. - ---- libtapi-1.30/tools/libtapi/CMakeLists.txt.orig 2017-02-12 17:35:55.000000000 +0100 -+++ libtapi-1.30/tools/libtapi/CMakeLists.txt 2017-02-12 17:36:17.000000000 +0100 -@@ -18,5 +18,5 @@ - - set_property(TARGET libtapi APPEND_STRING - PROPERTY -- LINK_FLAGS " -current_version ${TAPI_VERSION_MAJOR}.${TAPI_VERSION_MINOR}.${TAPI_VERSION_PATCH} -compatibility_version 1 -allowable_client ld" -+ LINK_FLAGS " -current_version ${TAPI_VERSION_MAJOR}.${TAPI_VERSION_MINOR}.${TAPI_VERSION_PATCH} -compatibility_version 1" - ) diff --git a/sys-libs/tapi/files/tapi-1.30-llvm-config.patch b/sys-libs/tapi/files/tapi-1.30-llvm-config.patch deleted file mode 100644 index ea5a462c025b..000000000000 --- a/sys-libs/tapi/files/tapi-1.30-llvm-config.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- libtapi-1.30/lib/Core/Symbol.cpp.orig 2017-02-11 21:51:53.000000000 +0100 -+++ libtapi-1.30/lib/Core/Symbol.cpp 2017-02-11 21:52:00.000000000 +0100 -@@ -9,7 +9,7 @@ - - #include "tapi/Core/Symbol.h" - #include "tapi/Core/LLVM.h" --#include "llvm/Config/config.h" -+#include "llvm/Config/llvm-config.h" - #include "llvm/Support/raw_ostream.h" - - #if HAVE_CXXABI_H diff --git a/sys-libs/tapi/files/tapi-1.30-llvm-new-error-api.patch b/sys-libs/tapi/files/tapi-1.30-llvm-new-error-api.patch deleted file mode 100644 index 814ca30879a0..000000000000 --- a/sys-libs/tapi/files/tapi-1.30-llvm-new-error-api.patch +++ /dev/null @@ -1,65 +0,0 @@ ---- libtapi-1.30/lib/Core/MachODylibReader.cpp.orig 2017-02-11 21:36:40.000000000 +0100 -+++ libtapi-1.30/lib/Core/MachODylibReader.cpp 2017-02-11 21:48:25.000000000 +0100 -@@ -37,7 +37,11 @@ - } - - auto binaryOrErr = createBinary(bufferRef); -+#if LLVM_NEW_ERROR_API -+ if (binaryOrErr.takeError()) -+#else - if (binaryOrErr.getError()) -+#endif - return FileType::Invalid; - - Binary &bin = *binaryOrErr.get(); -@@ -49,7 +53,11 @@ - for (auto OI = UB->begin_objects(), OE = UB->end_objects(); OI != OE; ++OI) { - auto objOrErr = OI->getAsObjectFile(); - // Ignore archives. -+#if LLVM_NEW_ERROR_API -+ if (objOrErr.takeError()) -+#else - if (objOrErr.getError()) -+#endif - continue; - - auto &obj = *objOrErr.get(); -@@ -228,7 +236,11 @@ - ? SymbolFlags::WeakReferenced - : SymbolFlags::None; - auto symbolName = symbol.getName(); -+#if LLVM_NEW_ERROR_API -+ if (symbolName.takeError()) -+#else - if (symbolName.getError()) -+#endif - continue; - - StringRef name; -@@ -244,8 +256,14 @@ - file->setPath(memBuffer.getBufferIdentifier()); - - auto binaryOrErr = createBinary(memBuffer); -+// no way to figure this out from the headers :-( -+#if LLVM_NEW_ERROR_API -+ if (auto ec = binaryOrErr.takeError()) { -+ file->setErrorCode(llvm::errorToErrorCode(std::move(ec))); -+#else - if (auto ec = binaryOrErr.getError()) { - file->setErrorCode(ec); -+#endif - return std::move(file); - } - -@@ -263,7 +281,11 @@ - auto objOrErr = OI->getAsObjectFile(); - - // Ignore archives. -+#if LLVM_NEW_ERROR_API -+ if (objOrErr.takeError()) -+#else - if (objOrErr.getError()) -+#endif - continue; - - auto &object = *objOrErr.get(); diff --git a/sys-libs/tapi/files/tapi-1.30-llvm-out-of-tree.patch b/sys-libs/tapi/files/tapi-1.30-llvm-out-of-tree.patch deleted file mode 100644 index 56386476994a..000000000000 --- a/sys-libs/tapi/files/tapi-1.30-llvm-out-of-tree.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- libtapi-1.30/CMakeLists.txt.orig 2017-02-11 21:04:56.000000000 +0100 -+++ libtapi-1.30/CMakeLists.txt 2017-02-11 21:05:12.000000000 +0100 -@@ -34,6 +34,7 @@ - ${CMAKE_CURRENT_SOURCE_DIR}/include/tapi/Version.inc.in - ${CMAKE_CURRENT_BINARY_DIR}/include/tapi/Version.inc) - -+include(AddLLVM) - macro(add_tapi_library name) - cmake_parse_arguments(ARG - "SHARED" diff --git a/sys-libs/tapi/tapi-1.30.ebuild b/sys-libs/tapi/tapi-1.30.ebuild deleted file mode 100644 index 1b087540133b..000000000000 --- a/sys-libs/tapi/tapi-1.30.ebuild +++ /dev/null @@ -1,37 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit cmake-utils flag-o-matic - -DESCRIPTION="Text-based Application Programming Interface" -HOMEPAGE="https://opensource.apple.com/source/tapi"; -SRC_URI="https://opensource.apple.com/tarballs/${PN}/${P}.tar.gz"; -S="${WORKDIR}/lib${P}" - -LICENSE="|| ( UoI-NCSA MIT )" -SLOT="0" -KEYWORDS="~x64-macos" - -DOCS=( Readme.md ) - -PATCHES=( - "${FILESDIR}"/${PN}-1.30-llvm-out-of-tree.patch - "${FILESDIR}"/${PN}-1.30-llvm-new-error-api.patch - "${FILESDIR}"/${PN}-1.30-llvm-config.patch - "${FILESDIR}"/${PN}-1.30-allow-all-clients.patch -) - -src_configure() { - local mycmakeargs=( - -DCMAKE_MODULE_PATH="${EPREFIX}/usr/lib/cmake/llvm;${EPREFIX}/usr/share/llvm/cmake" - ) - - # poor man's configure - [ -f "${EPREFIX}"/usr/include/llvm/Support/Error.h ] && \ - append-cxxflags -DLLVM_NEW_ERROR_API=1 - - append-cxxflags -std=c++11 - cmake-utils_src_configure -}
