Remove leftovers from llvm update

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: Remove leftovers from llvm update
From: pin <voidpin%protonmail.com@localhost>
Date: Tue, 15 Nov 2022 12:07:42 +0000
Module Name:	pkgsrc-wip
Committed By:	pin <voidpin%protonmail.com@localhost>
Pushed By:	pin
Date:		Tue Nov 15 13:07:42 2022 +0100
Changeset:	3f81a8edb33549f204ba2384d127d8d49f0062a5

Modified Files:
	Makefile
Removed Files:
	libcxxabi/DESCR
	libcxxabi/Makefile
	libcxxabi/PLIST
	libcxxabi/buildlink3.mk
	libcxxabi/distinfo
	libcxxabi/patches/patch-src_CMakeLists.txt
	libunwind/DESCR
	libunwind/Makefile
	libunwind/PLIST
	libunwind/buildlink3.mk
	libunwind/distinfo

Log Message:
Remove leftovers from llvm update

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=3f81a8edb33549f204ba2384d127d8d49f0062a5

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 Makefile                                   |  2 -
 libcxxabi/DESCR                            |  7 ----
 libcxxabi/Makefile                         | 67 ------------------------------
 libcxxabi/PLIST                            |  7 ----
 libcxxabi/buildlink3.mk                    | 15 -------
 libcxxabi/distinfo                         | 15 -------
 libcxxabi/patches/patch-src_CMakeLists.txt | 29 -------------
 libunwind/DESCR                            |  1 -
 libunwind/Makefile                         | 56 -------------------------
 libunwind/PLIST                            | 12 ------
 libunwind/buildlink3.mk                    | 13 ------
 libunwind/distinfo                         | 14 -------
 12 files changed, 238 deletions(-)

diffs:
diff --git a/Makefile b/Makefile
index 0acd9ba54f..7483dd6af9 100644
--- a/Makefile
+++ b/Makefile
@@ -2065,7 +2065,6 @@ SUBDIR+=	libcsplit
 SUBDIR+=	libcthreads
 SUBDIR+=	libcuba
 SUBDIR+=	libcue
-SUBDIR+=	libcxxabi
 SUBDIR+=	libdbglog
 SUBDIR+=	libdbh2
 SUBDIR+=	libdialog
@@ -2225,7 +2224,6 @@ SUBDIR+=	libucl
 SUBDIR+=	libudev
 SUBDIR+=	libuna
 SUBDIR+=	libunit
-SUBDIR+=	libunwind
 SUBDIR+=	libunwind-git
 SUBDIR+=	libusbmuxd
 SUBDIR+=	libvalhalla
diff --git a/libcxxabi/DESCR b/libcxxabi/DESCR
deleted file mode 100644
index 7b53a18eda..0000000000
--- a/libcxxabi/DESCR
+++ /dev/null
@@ -1,7 +0,0 @@
-libc++abi is a new implementation of low level support for a standard
-C++ library.
-
-Features and Goals
- * Correctness as defined by the C++11 standard.
- * Provide a portable sublayer to ease the porting of libc++
- * On Mac OS X, be ABI compatible with the existing low-level support.
diff --git a/libcxxabi/Makefile b/libcxxabi/Makefile
deleted file mode 100644
index 6fb77a960c..0000000000
--- a/libcxxabi/Makefile
+++ /dev/null
@@ -1,67 +0,0 @@
-# $NetBSD: Makefile,v 1.15 2022/08/14 13:52:26 tnn Exp $
-
-.include "../../wip/llvm/version.mk"
-
-DISTNAME=	libcxxabi-${LLVM_VERSION}.src
-PKGNAME=	${DISTNAME:S/.src//}
-CATEGORIES=	lang devel
-
-MAINTAINER=	pkgsrc-users%NetBSD.org@localhost
-HOMEPAGE=	https://libcxxabi.llvm.org/
-COMMENT=	C++ Standard Library
-LICENSE=	apache-2.0
-
-# libcxx requires libcxxabi's cxxabi.h to build, but libcxxabi requires
-# libcxx's includes to build, so we have this unholy extra distfiles thing
-# in both of them to get them to build against each other without causing
-# circular dependencies.  This must be kept in sync with libcxxabi/Makefile.
-# As of v15.0.0 libcxxabi requires cmake source code to build
-LIBCXX=		libcxx-${LLVM_VERSION}.src
-LLVMDIST=	llvm-${LLVM_VERSION}.src
-CMAKE=		cmake-${LLVM_VERSION}.src
-EXTRA_DIST=	${LIBCXX}${EXTRACT_SUFX} ${LLVMDIST}${EXTRACT_SUFX} ${CMAKE}${EXTRACT_SUFX}
-
-SITES.${LIBCXX}${EXTRACT_SUFX}=	\
-	${MASTER_SITES:=${GITHUB_PROJECT}/releases/download/${GITHUB_RELEASE}/}
-SITES.${LLLVMDIST}${EXTRACT_SUFX}=	\
-	${MASTER_SITES:=${GITHUB_PROJECT}/releases/download/${GITHUB_RELEASE}/}
-SITES.${CMAKE}${EXTRACT_SUFX}=	\
-	${MASTER_SITES:=${GITHUB_PROJECT}/releases/download/${GITHUB_RELEASE}/}
-
-DISTFILES=	${DEFAULT_DISTFILES} ${EXTRA_DIST}
-
-CONFIGURE_DIRS=	build
-CMAKE_ARG_PATH=	${WRKSRC}
-
-USE_LANGUAGES=	c c++17
-USE_CMAKE=	yes
-SSP_SUPPORTED=	no
-GCC_REQD+=	12	# must be in sync with libcxx
-
-CMAKE_ARGS+=	-DCMAKE_BUILD_TYPE=Release
-CMAKE_ARGS+=	-DCMAKE_C_COMPILER=${CC:Q}
-CMAKE_ARGS+=	-DCMAKE_CXX_COMPILER=${CXX:Q}
-CMAKE_ARGS+=	-DLIBCXXABI_LIBCXX_INCLUDES=${WRKDIR}/${LIBCXX}/include
-CMAKE_ARGS+=	-DLIBCXXABI_USE_LLVM_UNWINDER=ON
-
-# avoid conflict with stddef.h
-CXXFLAGS.NetBSD+=	-D__DEFINED_max_align_t=1
-
-.include "../../mk/compiler.mk"
-
-.if !empty(CC_VERSION:Mgcc-[0-9].*) || !empty(CC_VERSION:Mgcc-10.*)
-# Avoid GCC < 11 error https://github.com/llvm/llvm-project/issues/54018
-CXXFLAGS+=		-std=c++17 -D_LIBCPP_STD_VER=17
-.endif
-
-post-extract:
-	${MKDIR} ${WRKSRC}/build
-	${LN} -f -s ${WRKDIR}/${LIBCXX} ${WRKDIR}/libcxx
-	${LN} -f -s ${WRKDIR}/${LLVMDIST} ${WRKDIR}/llvm
-	${LN} -f -s ${WRKDIR}/${CMAKE} ${WRKDIR}/cmake
-# TODO: not sure what should create this and with which contents
-	${TOUCH} ${WRKDIR}/${LIBCXX}/include/__config_site
-
-.include "../../wip/libunwind/buildlink3.mk"
-.include "../../wip/llvm/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/libcxxabi/PLIST b/libcxxabi/PLIST
deleted file mode 100644
index c9924a5b37..0000000000
--- a/libcxxabi/PLIST
+++ /dev/null
@@ -1,7 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1 2018/08/09 14:13:25 jperkin Exp $
-include/c++/v1/__cxxabi_config.h
-include/c++/v1/cxxabi.h
-lib/libc++abi.a
-lib/libc++abi.so
-lib/libc++abi.so.1
-lib/libc++abi.so.1.0
diff --git a/libcxxabi/buildlink3.mk b/libcxxabi/buildlink3.mk
deleted file mode 100644
index 58a5ec462e..0000000000
--- a/libcxxabi/buildlink3.mk
+++ /dev/null
@@ -1,15 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.6 2022/08/12 08:41:58 pin Exp $
-
-BUILDLINK_TREE+=	libcxxabi
-
-.if !defined(LIBCXXABI_BUILDLINK3_MK)
-LIBCXXABI_BUILDLINK3_MK:=
-
-BUILDLINK_API_DEPENDS.libcxxabi+=	libcxxabi>=15.0.1
-BUILDLINK_PKGSRCDIR.libcxxabi?=		../../wip/libcxxabi
-
-.include "../../wip/llvm/buildlink3.mk"
-.include "../../wip/libunwind/buildlink3.mk"
-.endif	# LIBCXXABI_BUILDLINK3_MK
-
-BUILDLINK_TREE+=	-libcxxabi
diff --git a/libcxxabi/distinfo b/libcxxabi/distinfo
deleted file mode 100644
index 4281c64394..0000000000
--- a/libcxxabi/distinfo
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: distinfo,v 1.15 2022/08/12 08:41:58 pin Exp $
-
-BLAKE2s (cmake-15.0.1.src.tar.xz) = 1f7fb68a1c7c05b82a72137f3edf4a9b8dfb9e2fae277af1643e4bc545db6f75
-SHA512 (cmake-15.0.1.src.tar.xz) = fbb29395a337be4e591567cc0f990857a2663cb2335b5ef30945c6b516dbc65e86f022ef3acc1dc572cf6791e1cd20f6754256e00b60cdbf579c04ed74460522
-Size (cmake-15.0.1.src.tar.xz) = 6976 bytes
-BLAKE2s (libcxx-15.0.1.src.tar.xz) = 990ed1b196ec72548326496613b39a460f3836b34ec1e99443ec06d85096295e
-SHA512 (libcxx-15.0.1.src.tar.xz) = 1438b689bb11b25a0b77c83c8fc0dbe98f729186aa2718119c42f4efe42fca9ec33a79a0fac036d6617d0452dcfd76463a8adbc55b0552a0a4e72757d841fdf0
-Size (libcxx-15.0.1.src.tar.xz) = 3345100 bytes
-BLAKE2s (libcxxabi-15.0.1.src.tar.xz) = 009d90b6ebd8b53f08debb6a76218cc3624ddecbe6552563cfd5da4ab9f2b2cb
-SHA512 (libcxxabi-15.0.1.src.tar.xz) = ef765a897a1099933773b62a67e4c1e9b074ce50939e6723d0f8a8a1ce1f6761c37f35ecb6c837ff06eeb47a926a4b4c0755fb5da316f5b37e605e9f75312976
-Size (libcxxabi-15.0.1.src.tar.xz) = 568756 bytes
-BLAKE2s (llvm-15.0.1.src.tar.xz) = ed1e687e9fc2c529180f7352d3f8dcaa9a0de1bf4edc9c128f1fb85575afe31f
-SHA512 (llvm-15.0.1.src.tar.xz) = ec61b6d061ba71e00f6e9c1042705ab3512ff71a823e18ce75a3b8fd2ef40efff186b42d4be6ef948019e5bb5b3fb28f0c615ebb7872ec89f7643261eadf276a
-Size (llvm-15.0.1.src.tar.xz) = 53522984 bytes
-SHA1 (patch-src_CMakeLists.txt) = 76371daae97355fc9ee1bba8fb7e8e8879535f84
diff --git a/libcxxabi/patches/patch-src_CMakeLists.txt b/libcxxabi/patches/patch-src_CMakeLists.txt
deleted file mode 100644
index 0096928fc9..0000000000
--- a/libcxxabi/patches/patch-src_CMakeLists.txt
+++ /dev/null
@@ -1,29 +0,0 @@
-$NetBSD$
-
-Make sure that libcxx headers are found, they are normally found
-using the target cxx-headers but, it does not exist since libcxxabi
-it's built alone, so have to create it.
-
-Link to -lunwind since the target unwind_shared does not exist
-due to that libcxxabi it's build alone.
-
---- src/CMakeLists.txt.orig	2022-09-20 06:05:50.000000000 +0000
-+++ src/CMakeLists.txt
-@@ -58,6 +58,8 @@ endif()
- 
- # Some files depend on libc++ internals.
- include_directories("${LIBCXXABI_LIBCXX_PATH}/src")
-+add_library(cxx-headers INTERFACE)
-+target_include_directories(cxx-headers INTERFACE "${LIBCXXABI_LIBCXX_INCLUDES}")
- 
- if (LIBCXXABI_HAS_CXA_THREAD_ATEXIT_IMPL)
-   add_definitions(-DHAVE___CXA_THREAD_ATEXIT_IMPL)
-@@ -165,7 +167,7 @@ if (LIBCXXABI_USE_LLVM_UNWINDER)
-     target_link_libraries(cxxabi_shared_objects PUBLIC unwind_shared_objects) # propagate usage requirements
-     target_sources(cxxabi_shared_objects PUBLIC $<TARGET_OBJECTS:unwind_shared_objects>)
-   else()
--    target_link_libraries(cxxabi_shared_objects PUBLIC unwind_shared)
-+    target_link_libraries(cxxabi_shared_objects PUBLIC unwind)
-   endif()
- endif()
- target_link_libraries(cxxabi_shared_objects PRIVATE cxx-headers ${LIBCXXABI_BUILTINS_LIBRARY} ${LIBCXXABI_SHARED_LIBRARIES} ${LIBCXXABI_LIBRARIES})
diff --git a/libunwind/DESCR b/libunwind/DESCR
deleted file mode 100644
index 93d20deb5d..0000000000
--- a/libunwind/DESCR
+++ /dev/null
@@ -1 +0,0 @@
-LLVM libunwind
diff --git a/libunwind/Makefile b/libunwind/Makefile
deleted file mode 100644
index d8abb966db..0000000000
--- a/libunwind/Makefile
+++ /dev/null
@@ -1,56 +0,0 @@
-# $NetBSD: Makefile,v 1.28 2022/08/14 13:52:27 tnn Exp $
-
-.include "../../wip/llvm/version.mk"
-
-DISTNAME=	libunwind-${LLVM_VERSION}.src
-PKGNAME=	${DISTNAME:S/.src//}
-CATEGORIES=	lang devel
-
-MAINTAINER=	pkgsrc-users%NetBSD.org@localhost
-#HOMEPAGE=	http://libunwind.llvm.org/
-COMMENT=	LLVM libunwind
-LICENSE=	apache-2.0
-
-# libunwind requires llvm and libcxx source code to build
-# As of v15.0.0 it also requires cmake source code
-LIBCXX=		libcxx-${LLVM_VERSION}.src
-LLVMDIST=	llvm-${LLVM_VERSION}.src
-CMAKE=		cmake-${LLVM_VERSION}.src
-EXTRA_DIST=	${LIBCXX}${EXTRACT_SUFX} ${LLVMDIST}${EXTRACT_SUFX} ${CMAKE}${EXTRACT_SUFX}
-
-SITES.${LIBCXX}${EXTRACT_SUFX}=	\
-	${MASTER_SITES:=${GITHUB_PROJECT}/releases/download/${GITHUB_RELEASE}/}
-SITES.${LLLVMDIST}${EXTRACT_SUFX}=	\
-	${MASTER_SITES:=${GITHUB_PROJECT}/releases/download/${GITHUB_RELEASE}/}
-SITES.${CMAKE}${EXTRACT_SUFX}=	\
-	${MASTER_SITES:=${GITHUB_PROJECT}/releases/download/${GITHUB_RELEASE}/}
-
-DISTFILES=	${DEFAULT_DISTFILES} ${EXTRA_DIST}
-
-CONFIGURE_DIRS=	build
-CMAKE_ARG_PATH=	${WRKSRC}
-
-USE_CMAKE=		yes
-USE_LANGUAGES=		c c++11
-USE_TOOLS+=		pax
-SSP_SUPPORTED=		no
-GCC_REQD+=		10	# must be in sync with libcxx
-
-CMAKE_ARGS+=	-DCMAKE_BUILD_TYPE=Release
-CMAKE_ARGS+=	-DCMAKE_C_COMPILER=${CC:Q}
-CMAKE_ARGS+=	-DCMAKE_CXX_COMPILER=${CXX:Q}
-
-INSTALLATION_DIRS=	include
-
-post-extract:
-	${MKDIR} ${WRKSRC}/build
-	${LN} -f -s ${WRKDIR}/${LIBCXX} ${WRKDIR}/libcxx
-	${LN} -f -s ${WRKDIR}/${LLVMDIST} ${WRKDIR}/llvm
-	${LN} -f -s ${WRKDIR}/${CMAKE} ${WRKDIR}/cmake
-
-post-install:
-	cd ${WRKSRC}/include && ${PAX} -rw . ${DESTDIR}${PREFIX}/include
-
-BUILDLINK_DEPMETHOD.llvm=	build
-.include "../../wip/llvm/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/libunwind/PLIST b/libunwind/PLIST
deleted file mode 100644
index 627da16bd2..0000000000
--- a/libunwind/PLIST
+++ /dev/null
@@ -1,12 +0,0 @@
-@comment $NetBSD: PLIST,v 1.3 2022/08/12 08:39:56 pin Exp $
-include/CMakeLists.txt
-include/__libunwind_config.h
-include/libunwind.h
-include/mach-o/compact_unwind_encoding.h
-include/unwind.h
-include/unwind_arm_ehabi.h
-include/unwind_itanium.h
-lib/libunwind.a
-lib/libunwind.so
-lib/libunwind.so.1
-lib/libunwind.so.1.0
diff --git a/libunwind/buildlink3.mk b/libunwind/buildlink3.mk
deleted file mode 100644
index 37d2b95f03..0000000000
--- a/libunwind/buildlink3.mk
+++ /dev/null
@@ -1,13 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.11 2022/08/12 08:39:56 pin Exp $
-
-BUILDLINK_TREE+=	libunwind
-
-.if !defined(LIBUNWIND_BUILDLINK3_MK)
-LIBUNWIND_BUILDLINK3_MK:=
-
-BUILDLINK_API_DEPENDS.libunwind+=	libunwind>=15.0.1
-BUILDLINK_PKGSRCDIR.libunwind?=		../../wip/libunwind
-
-.endif	# LIBUNWIND_BUILDLINK3_MK
-
-BUILDLINK_TREE+=	-libunwind
diff --git a/libunwind/distinfo b/libunwind/distinfo
deleted file mode 100644
index 5d40857981..0000000000
--- a/libunwind/distinfo
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: distinfo,v 1.25 2022/08/12 08:39:56 pin Exp $
-
-BLAKE2s (cmake-15.0.1.src.tar.xz) = 1f7fb68a1c7c05b82a72137f3edf4a9b8dfb9e2fae277af1643e4bc545db6f75
-SHA512 (cmake-15.0.1.src.tar.xz) = fbb29395a337be4e591567cc0f990857a2663cb2335b5ef30945c6b516dbc65e86f022ef3acc1dc572cf6791e1cd20f6754256e00b60cdbf579c04ed74460522
-Size (cmake-15.0.1.src.tar.xz) = 6976 bytes
-BLAKE2s (libcxx-15.0.1.src.tar.xz) = 990ed1b196ec72548326496613b39a460f3836b34ec1e99443ec06d85096295e
-SHA512 (libcxx-15.0.1.src.tar.xz) = 1438b689bb11b25a0b77c83c8fc0dbe98f729186aa2718119c42f4efe42fca9ec33a79a0fac036d6617d0452dcfd76463a8adbc55b0552a0a4e72757d841fdf0
-Size (libcxx-15.0.1.src.tar.xz) = 3345100 bytes
-BLAKE2s (libunwind-15.0.1.src.tar.xz) = 9a2720e3a01da911d528011470dd6a4c110f11be7f69a8b120305dccdebe61a1
-SHA512 (libunwind-15.0.1.src.tar.xz) = 2ff2d84f62c41724caf3c121a515facd6a7eaf6f65658f4a04b268cb839861d4561b5ab11557474c41b59c42c00a4381cf5d561bf612251044b4774883888b59
-Size (libunwind-15.0.1.src.tar.xz) = 113356 bytes
-BLAKE2s (llvm-15.0.1.src.tar.xz) = ed1e687e9fc2c529180f7352d3f8dcaa9a0de1bf4edc9c128f1fb85575afe31f
-SHA512 (llvm-15.0.1.src.tar.xz) = ec61b6d061ba71e00f6e9c1042705ab3512ff71a823e18ce75a3b8fd2ef40efff186b42d4be6ef948019e5bb5b3fb28f0c615ebb7872ec89f7643261eadf276a
-Size (llvm-15.0.1.src.tar.xz) = 53522984 bytes
Prev by Date: llvm*: remove; llvm moved to base, others are 8 too old
Next by Date: *unit*: remove, pkgsrc version is the same
Previous by Thread: llvm*: remove; llvm moved to base, others are 8 too old
Next by Thread: *unit*: remove, pkgsrc version is the same
Indexes:
Home | Main Index | Thread Index | Old Index