libcxx: re-enable UNWIND option

[pin <voidpin%protonmail.com@localhost>]

Module Name:	pkgsrc-wip
Committed By:	pin <voidpin%protonmail.com@localhost>
Pushed By:	pin
Date:		Mon Aug 8 10:46:02 2022 +0200
Changeset:	d6e4ebb9c1a9b0bfd7ef468377e1e0a173a0c9c2

Modified Files:
	libcxx/Makefile
	libcxx/distinfo

Log Message:
libcxx: re-enable UNWIND option

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

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

diffstat:
 libcxx/Makefile | 6 ++++--
 libcxx/distinfo | 3 +++
 2 files changed, 7 insertions(+), 2 deletions(-)

diffs:
diff --git a/libcxx/Makefile b/libcxx/Makefile
index b051ba8518..69796981db 100644
--- a/libcxx/Makefile
+++ b/libcxx/Makefile
@@ -15,9 +15,11 @@ LICENSE=	apache-2.0
 # 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.
+# Since llvm-14, libunwind also needs to be present.
 LIBCXXABI=				libcxxabi-${LLVM_VERSION}.src
 LLVMDIST=				llvm-${LLVM_VERSION}.src
-_EXTRA_DIST=				${LIBCXXABI}${EXTRACT_SUFX} ${LLVMDIST}${EXTRACT_SUFX} # ${LIBUNWIND}${EXTRACT_SUFX}
+LIBUNWIND=				libunwind-${LLVM_VERSION}.src
+_EXTRA_DIST=				${LIBCXXABI}${EXTRACT_SUFX} ${LLVMDIST}${EXTRACT_SUFX} ${LIBUNWIND}${EXTRACT_SUFX}
 SITES.${LIBCXXABI}${EXTRACT_SUFX}=	${MASTER_SITES:=${GITHUB_PROJECT}/releases/download/${GITHUB_RELEASE}/}
 SITES.${LLLVMDIST}${EXTRACT_SUFX}=	${MASTER_SITES:=${GITHUB_PROJECT}/releases/download/${GITHUB_RELEASE}/}
 
@@ -38,7 +40,7 @@ CMAKE_ARGS+=	-DCMAKE_CXX_LINK_FLAGS=${LDFLAGS:Q}
 CMAKE_ARGS+=	-DLIBCXX_CXX_ABI=libcxxabi
 CMAKE_ARGS+=	-DLIBCXX_CXX_ABI_INCLUDE_PATHS=${WRKDIR}/${LIBCXXABI}/include
 CMAKE_ARGS+=	-DLIBCXXABI_USE_LLVM_UNWINDER=OFF
-CMAKE_ARGS+=	-DLIBCXX_ENABLE_ABI_LINKER_SCRIPT=OFF
+CMAKE_ARGS+=	-DLIBCXX_ENABLE_ABI_LINKER_SCRIPT=ON
 
 # avoid conflict with stddef.h
 CXXFLAGS.NetBSD+=	-D__DEFINED_max_align_t=1
diff --git a/libcxx/distinfo b/libcxx/distinfo
index 6f1504b110..88558e605a 100644
--- a/libcxx/distinfo
+++ b/libcxx/distinfo
@@ -6,6 +6,9 @@ Size (libcxx-14.0.6.src.tar.xz) = 3065120 bytes
 BLAKE2s (libcxxabi-14.0.6.src.tar.xz) = c2bc894a75176b7f24517b6c045ddaccc61375453d56331f51dc9d03821804cc
 SHA512 (libcxxabi-14.0.6.src.tar.xz) = f61926ce9c8bf4d704d9ee03a795ebd23730099d56c385e3cbd1f8b588b337c1394d6548f55e1452df5040117a80765c977ba256547d53cd21895e91ef0fffa6
 Size (libcxxabi-14.0.6.src.tar.xz) = 561844 bytes
+BLAKE2s (libunwind-14.0.6.src.tar.xz) = 21da632762db6524a46c1f721908b233265afe83728c1de5dd7757c662db0d99
+SHA512 (libunwind-14.0.6.src.tar.xz) = c8f3804c47ac33273238899e5682f9cb52465dcceff0e0ecf9925469620c6c9a62cc2c708a35a0e156b666e1198df52c5fff1da9d5ee3194605dfd62c296b058
+Size (libunwind-14.0.6.src.tar.xz) = 108680 bytes
 BLAKE2s (llvm-14.0.6.src.tar.xz) = 2d44946453add45426569fd4187654f83881341c5c0109e4ffacc60e8f73af60
 SHA512 (llvm-14.0.6.src.tar.xz) = 6461bdde27aac17fa44c3e99a85ec47ffb181d0d4e5c3ef1c4286a59583e3b0c51af3c8081a300f45b99524340773a3011380059e3b3a571c3b0a8733e96fc1d
 Size (llvm-14.0.6.src.tar.xz) = 49660136 bytes