pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/lang compiler-rt libunwind libcxx libcxxabi: updated t...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/bfd614b9c1fa
branches:  trunk
changeset: 455818:bfd614b9c1fa
user:      adam <adam%pkgsrc.org@localhost>
date:      Mon Jul 12 18:46:07 2021 +0000

description:
compiler-rt libunwind libcxx libcxxabi: updated to 12.0.1

What’s New in Libc++ 12.0.0?

New Features

Random device support has been made optional. It’s enabled by default and can be disabled by building libc++ with -DLIBCXX_ENABLE_RANDOM_DEVICE=OFF. Disabling random device support can be useful when 
building the library for platforms that don’t have a source of randomness, such as some embedded platforms. When this is not supported, most of <random> will still be available, but 
std::random_device will not.
Localization support has been made optional. It’s enabled by default and can be disabled by building libc++ with -DLIBCXX_ENABLE_LOCALIZATION=OFF. Disabling localization can be useful when porting to 
platforms that don’t support the C locale API (e.g. embedded). When localization is not supported, several parts of the library will be disabled: <iostream>, <regex>, <locale> will be completely 
unusable, and other parts may be only partly available.
If libc++ is compiled with a C++20 capable compiler it will be compiled in C++20 mode. Else libc++ will be compiled in C++17 mode.
Several unqualified lookups in libc++ have been changed to qualified lookups. This makes libc++ more ADL-proof.
The libc++ implementation status pages have been overhauled. Like other parts documentation they now use restructured text instead of html. Starting with libc++12 the status pages are part of 
libc++’s documentation.
More C++20 features have been implemented. libc++ C++20 Status has the full overview of libc++’s C++20 implementation status.
Work has started to implement new C++2b features. libc++ C++2b Status has the full overview of libc++’s C++2b implementation status.

API Changes

By default, libc++ will _not_ include the definition for new and delete, since those are provided in libc++abi. Vendors wishing to provide new and delete in libc++ can build the library with 
-DLIBCXX_ENABLE_NEW_DELETE_DEFINITIONS=ON to get back the old behavior. This was done to avoid providing new and delete in both libc++ and libc++abi, which is technically an ODR violation. Also note 
that we couldn’t decide to put the operators in libc++ only, because they are needed from libc++abi (which would create a circular dependency).
During the C++20 standardization process some new low-level bit functions have been renamed. Libc++ has renamed these functions to match the C++20 Standard. - ispow2 has been renamed to 
has_single_bit - ceil2 has been renamed to bit_ceil - floor2 has been renamed to bit_floor - log2p1 has been renamed to bit_width
In C++20 mode, std::filesystem::path::u8string() and generic_u8string() now return std::u8string according to P0428, while they return std::string in C++17. This can cause source incompatibility, 
which is discussed and acknowledged in P1423, but that paper doesn’t suggest any remediation for this incompatibility.

diffstat:

 lang/compiler-rt/Makefile                                                                    |   3 +-
 lang/compiler-rt/PLIST.Darwin                                                                |   3 +-
 lang/compiler-rt/PLIST.NetBSD                                                                |   3 +-
 lang/compiler-rt/PLIST.NetBSD-x86_64                                                         |  18 ---
 lang/compiler-rt/distinfo                                                                    |  14 +-
 lang/compiler-rt/patches/patch-cmake_config-ix.cmake                                         |  24 ++--
 lang/compiler-rt/patches/patch-lib_sanitizer__common_sanitizer__platform__limits__netbsd.cpp |  34 +-----
 lang/libcxx/Makefile                                                                         |  14 +-
 lang/libcxx/PLIST                                                                            |  49 ++++++---
 lang/libcxx/buildlink3.mk                                                                    |   4 +-
 lang/libcxx/distinfo                                                                         |  23 ++--
 lang/libcxx/patches/patch-src_experimental_memory__resource.cpp                              |  15 ---
 lang/libcxxabi/Makefile                                                                      |  14 +-
 lang/libcxxabi/buildlink3.mk                                                                 |   5 +-
 lang/libcxxabi/distinfo                                                                      |  22 ++-
 lang/libunwind/Makefile                                                                      |  19 ++-
 lang/libunwind/buildlink3.mk                                                                 |   4 +-
 lang/libunwind/distinfo                                                                      |  18 ++-
 18 files changed, 141 insertions(+), 145 deletions(-)

diffs (truncated from 620 to 300 lines):

diff -r ac8ce63593a5 -r bfd614b9c1fa lang/compiler-rt/Makefile
--- a/lang/compiler-rt/Makefile Mon Jul 12 18:45:07 2021 +0000
+++ b/lang/compiler-rt/Makefile Mon Jul 12 18:46:07 2021 +0000
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.16 2020/10/02 14:20:34 khorben Exp $
+# $NetBSD: Makefile,v 1.17 2021/07/12 18:46:07 adam Exp $
 
 .include "../../lang/llvm/version.mk"
 
 DISTNAME=      compiler-rt-${LLVM_VERSION}.src
 PKGNAME=       ${DISTNAME:S/.src//}
-PKGREVISION=   1
 CATEGORIES=    lang devel
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
diff -r ac8ce63593a5 -r bfd614b9c1fa lang/compiler-rt/PLIST.Darwin
--- a/lang/compiler-rt/PLIST.Darwin     Mon Jul 12 18:45:07 2021 +0000
+++ b/lang/compiler-rt/PLIST.Darwin     Mon Jul 12 18:46:07 2021 +0000
@@ -1,6 +1,7 @@
-@comment $NetBSD: PLIST.Darwin,v 1.3 2019/06/02 08:35:56 adam Exp $
+@comment $NetBSD: PLIST.Darwin,v 1.4 2021/07/12 18:46:07 adam Exp $
 lib/clang/${PKGVERSION}/lib/${COMPILER_RT_OS_DIR}/libclang_rt.asan_osx_dynamic.dylib
 lib/clang/${PKGVERSION}/lib/${COMPILER_RT_OS_DIR}/libclang_rt.cc_kext.a
+lib/clang/${PKGVERSION}/lib/${COMPILER_RT_OS_DIR}/libclang_rt.fuzzer_interceptors_osx.a
 lib/clang/${PKGVERSION}/lib/${COMPILER_RT_OS_DIR}/libclang_rt.fuzzer_no_main_osx.a
 lib/clang/${PKGVERSION}/lib/${COMPILER_RT_OS_DIR}/libclang_rt.fuzzer_osx.a
 lib/clang/${PKGVERSION}/lib/${COMPILER_RT_OS_DIR}/libclang_rt.lsan_osx_dynamic.dylib
diff -r ac8ce63593a5 -r bfd614b9c1fa lang/compiler-rt/PLIST.NetBSD
--- a/lang/compiler-rt/PLIST.NetBSD     Mon Jul 12 18:45:07 2021 +0000
+++ b/lang/compiler-rt/PLIST.NetBSD     Mon Jul 12 18:46:07 2021 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.NetBSD,v 1.3 2019/08/05 19:06:50 adam Exp $
+@comment $NetBSD: PLIST.NetBSD,v 1.4 2021/07/12 18:46:07 adam Exp $
 lib/clang/${PKGVERSION}/lib/netbsd/libclang_rt.asan-${MACHINE_ARCH}.a
 lib/clang/${PKGVERSION}/lib/netbsd/libclang_rt.asan-${MACHINE_ARCH}.a.syms
 lib/clang/${PKGVERSION}/lib/netbsd/libclang_rt.asan-${MACHINE_ARCH}.so
@@ -11,6 +11,7 @@
 lib/clang/${PKGVERSION}/lib/netbsd/libclang_rt.dd-${MACHINE_ARCH}.a
 lib/clang/${PKGVERSION}/lib/netbsd/libclang_rt.dyndd-${MACHINE_ARCH}.so
 lib/clang/${PKGVERSION}/lib/netbsd/libclang_rt.fuzzer-${MACHINE_ARCH}.a
+lib/clang/${PKGVERSION}/lib/netbsd/libclang_rt.fuzzer_interceptors-${MACHINE_ARCH}.a
 lib/clang/${PKGVERSION}/lib/netbsd/libclang_rt.fuzzer_no_main-${MACHINE_ARCH}.a
 lib/clang/${PKGVERSION}/lib/netbsd/libclang_rt.lsan-${MACHINE_ARCH}.a
 lib/clang/${PKGVERSION}/lib/netbsd/libclang_rt.msan-${MACHINE_ARCH}.a
diff -r ac8ce63593a5 -r bfd614b9c1fa lang/compiler-rt/PLIST.NetBSD-x86_64
--- a/lang/compiler-rt/PLIST.NetBSD-x86_64      Mon Jul 12 18:45:07 2021 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,18 +0,0 @@
-@comment $NetBSD: PLIST.NetBSD-x86_64,v 1.1 2020/09/26 02:08:10 khorben Exp $
-lib/clang/${PKGVERSION}/lib/netbsd/libclang_rt.asan-i386.a
-lib/clang/${PKGVERSION}/lib/netbsd/libclang_rt.asan-i386.so
-lib/clang/${PKGVERSION}/lib/netbsd/libclang_rt.asan-preinit-i386.a
-lib/clang/${PKGVERSION}/lib/netbsd/libclang_rt.asan_cxx-i386.a
-lib/clang/${PKGVERSION}/lib/netbsd/libclang_rt.builtins-i386.a
-lib/clang/${PKGVERSION}/lib/netbsd/libclang_rt.cfi-i386.a
-lib/clang/${PKGVERSION}/lib/netbsd/libclang_rt.cfi_diag-i386.a
-lib/clang/${PKGVERSION}/lib/netbsd/libclang_rt.lsan-i386.a
-lib/clang/${PKGVERSION}/lib/netbsd/libclang_rt.profile-i386.a
-lib/clang/${PKGVERSION}/lib/netbsd/libclang_rt.safestack-i386.a
-lib/clang/${PKGVERSION}/lib/netbsd/libclang_rt.stats-i386.a
-lib/clang/${PKGVERSION}/lib/netbsd/libclang_rt.stats_client-i386.a
-lib/clang/${PKGVERSION}/lib/netbsd/libclang_rt.ubsan_minimal-i386.a
-lib/clang/${PKGVERSION}/lib/netbsd/libclang_rt.ubsan_minimal-i386.so
-lib/clang/${PKGVERSION}/lib/netbsd/libclang_rt.ubsan_standalone-i386.a
-lib/clang/${PKGVERSION}/lib/netbsd/libclang_rt.ubsan_standalone-i386.so
-lib/clang/${PKGVERSION}/lib/netbsd/libclang_rt.ubsan_standalone_cxx-i386.a
diff -r ac8ce63593a5 -r bfd614b9c1fa lang/compiler-rt/distinfo
--- a/lang/compiler-rt/distinfo Mon Jul 12 18:45:07 2021 +0000
+++ b/lang/compiler-rt/distinfo Mon Jul 12 18:46:07 2021 +0000
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.11 2020/10/02 14:20:34 khorben Exp $
+$NetBSD: distinfo,v 1.12 2021/07/12 18:46:07 adam Exp $
 
-SHA1 (compiler-rt-10.0.1.src.tar.xz) = ee6077b4728b3c750e476938cead11cea45b49ff
-RMD160 (compiler-rt-10.0.1.src.tar.xz) = 7912cb7c636894f0682b91d04ea0dfe512f01124
-SHA512 (compiler-rt-10.0.1.src.tar.xz) = a1d2e3f5ad529a04f87059903b31fc3c9803cd86f44aed1aebd87ce7e423d8dd2b6776be12e85a0374a6215f581420438d224c130aad5e6355920af32c02aa7b
-Size (compiler-rt-10.0.1.src.tar.xz) = 2085712 bytes
-SHA1 (patch-cmake_config-ix.cmake) = e950d8781f00638310b523b6933889a9d15611c5
-SHA1 (patch-lib_sanitizer__common_sanitizer__platform__limits__netbsd.cpp) = 53c60eb4a1e7be5a60c7b4fff2d245daef54653d
+SHA1 (compiler-rt-12.0.1.src.tar.xz) = d33af648dc9b901c6c9f6c5872af2f59203f1a25
+RMD160 (compiler-rt-12.0.1.src.tar.xz) = e89dd1b4d976618117529a0ee22d2da111fac79a
+SHA512 (compiler-rt-12.0.1.src.tar.xz) = 708780aa47ef289a9700eb76c17cc1f3bab19b8245174e612b5f684c48448030263a72eeef1021b10bdffa6ace2df489adcbba9e7a790ccbcd5fe72056f63f92
+Size (compiler-rt-12.0.1.src.tar.xz) = 2201284 bytes
+SHA1 (patch-cmake_config-ix.cmake) = 50e38807363e9d4f18106bb2ff71f5247a24d764
+SHA1 (patch-lib_sanitizer__common_sanitizer__platform__limits__netbsd.cpp) = 8a09da1e6e4476f50cfd5e8034060c6a87bfa92c
diff -r ac8ce63593a5 -r bfd614b9c1fa lang/compiler-rt/patches/patch-cmake_config-ix.cmake
--- a/lang/compiler-rt/patches/patch-cmake_config-ix.cmake      Mon Jul 12 18:45:07 2021 +0000
+++ b/lang/compiler-rt/patches/patch-cmake_config-ix.cmake      Mon Jul 12 18:46:07 2021 +0000
@@ -1,19 +1,19 @@
-$NetBSD: patch-cmake_config-ix.cmake,v 1.3 2019/06/02 08:35:56 adam Exp $
+$NetBSD: patch-cmake_config-ix.cmake,v 1.4 2021/07/12 18:46:07 adam Exp $
 
 Disable components that aren't ready for SunOS yet.
 
---- cmake/config-ix.cmake.orig 2019-01-25 22:55:41.000000000 +0000
+--- cmake/config-ix.cmake.orig 2021-04-06 16:38:18.000000000 +0000
 +++ cmake/config-ix.cmake
-@@ -529,7 +529,7 @@ set(COMPILER_RT_SANITIZERS_TO_BUILD all 
+@@ -646,7 +646,7 @@ set(COMPILER_RT_SANITIZERS_TO_BUILD all 
  list_replace(COMPILER_RT_SANITIZERS_TO_BUILD all "${ALL_SANITIZERS}")
  
  if (SANITIZER_COMMON_SUPPORTED_ARCH AND NOT LLVM_USE_SANITIZER AND
--    (OS_NAME MATCHES "Android|Darwin|Linux|FreeBSD|NetBSD|OpenBSD|Fuchsia|SunOS" OR
-+    (OS_NAME MATCHES "Android|Darwin|Linux|FreeBSD|NetBSD|OpenBSD|Fuchsia" OR
+-    (OS_NAME MATCHES "Android|Darwin|Linux|FreeBSD|NetBSD|Fuchsia|SunOS" OR
++    (OS_NAME MATCHES "Android|Darwin|Linux|FreeBSD|NetBSD|Fuchsia" OR
      (OS_NAME MATCHES "Windows" AND NOT CYGWIN AND
          (NOT MINGW OR CMAKE_CXX_COMPILER_ID MATCHES "Clang"))))
    set(COMPILER_RT_HAS_SANITIZER_COMMON TRUE)
-@@ -550,7 +550,7 @@ else()
+@@ -666,7 +666,7 @@ else()
    set(COMPILER_RT_HAS_ASAN FALSE)
  endif()
  
@@ -22,21 +22,21 @@
    set(COMPILER_RT_ASAN_HAS_STATIC_RUNTIME TRUE)
  else()
    set(COMPILER_RT_ASAN_HAS_STATIC_RUNTIME FALSE)
-@@ -587,7 +587,7 @@ else()
+@@ -716,7 +716,7 @@ else()
  endif()
  
  if (PROFILE_SUPPORTED_ARCH AND NOT LLVM_USE_SANITIZER AND
--    OS_NAME MATCHES "Darwin|Linux|FreeBSD|Windows|Android|Fuchsia|SunOS|NetBSD")
-+    OS_NAME MATCHES "Darwin|Linux|FreeBSD|Windows|Android|Fuchsia|NetBSD")
+-    OS_NAME MATCHES "Darwin|Linux|FreeBSD|Windows|Android|Fuchsia|SunOS|NetBSD|AIX")
++    OS_NAME MATCHES "Darwin|Linux|FreeBSD|Windows|Android|Fuchsia|NetBSD|AIX")
    set(COMPILER_RT_HAS_PROFILE TRUE)
  else()
    set(COMPILER_RT_HAS_PROFILE FALSE)
-@@ -601,7 +601,7 @@ else()
+@@ -730,7 +730,7 @@ else()
  endif()
  
  if (COMPILER_RT_HAS_SANITIZER_COMMON AND UBSAN_SUPPORTED_ARCH AND
--    OS_NAME MATCHES "Darwin|Linux|FreeBSD|NetBSD|OpenBSD|Windows|Android|Fuchsia|SunOS")
-+    OS_NAME MATCHES "Darwin|Linux|FreeBSD|NetBSD|OpenBSD|Windows|Android|Fuchsia")
+-    OS_NAME MATCHES "Darwin|Linux|FreeBSD|NetBSD|Windows|Android|Fuchsia|SunOS")
++    OS_NAME MATCHES "Darwin|Linux|FreeBSD|NetBSD|Windows|Android|Fuchsia")
    set(COMPILER_RT_HAS_UBSAN TRUE)
  else()
    set(COMPILER_RT_HAS_UBSAN FALSE)
diff -r ac8ce63593a5 -r bfd614b9c1fa lang/compiler-rt/patches/patch-lib_sanitizer__common_sanitizer__platform__limits__netbsd.cpp
--- a/lang/compiler-rt/patches/patch-lib_sanitizer__common_sanitizer__platform__limits__netbsd.cpp      Mon Jul 12 18:45:07 2021 +0000
+++ b/lang/compiler-rt/patches/patch-lib_sanitizer__common_sanitizer__platform__limits__netbsd.cpp      Mon Jul 12 18:46:07 2021 +0000
@@ -1,30 +1,10 @@
-$NetBSD: patch-lib_sanitizer__common_sanitizer__platform__limits__netbsd.cpp,v 1.2 2020/07/26 19:20:13 adam Exp $
+$NetBSD: patch-lib_sanitizer__common_sanitizer__platform__limits__netbsd.cpp,v 1.3 2021/07/12 18:46:07 adam Exp $
 
 urio and smb have been removed from NetBSD.
 
---- lib/sanitizer_common/sanitizer_platform_limits_netbsd.cpp.orig     2020-07-07 16:21:37.000000000 +0000
+--- lib/sanitizer_common/sanitizer_platform_limits_netbsd.cpp.orig     2020-10-07 10:10:48.000000000 +0000
 +++ lib/sanitizer_common/sanitizer_platform_limits_netbsd.cpp
-@@ -166,7 +166,9 @@
- #include <netinet/ip_proxy.h>
- #include <netinet6/in6_var.h>
- #include <netinet6/nd6.h>
-+#if __NetBSD_Version__ < 999000000
- #include <netsmb/smb_dev.h>
-+#endif
- #include <dev/biovar.h>
- #include <dev/bluetooth/btdev.h>
- #include <dev/bluetooth/btsco.h>
-@@ -190,7 +192,9 @@
- #include <dev/sun/vuid_event.h>
- #include <dev/tc/sticio.h>
- #include <dev/usb/ukyopon.h>
-+#if __NetBSD_Version__ < 999000000
- #include <dev/usb/urio.h>
-+#endif
- #include <dev/usb/usb.h>
- #include <dev/usb/utoppy.h>
- #include <dev/vme/xio.h>
-@@ -672,12 +676,14 @@ unsigned struct_session_op_sz = sizeof(s
+@@ -803,12 +803,14 @@ unsigned struct_session_op_sz = sizeof(s
  unsigned struct_sgttyb_sz = sizeof(sgttyb);
  unsigned struct_sioc_sg_req_sz = sizeof(sioc_sg_req);
  unsigned struct_sioc_vif_req_sz = sizeof(sioc_vif_req);
@@ -39,7 +19,7 @@
  unsigned struct_spppauthcfg_sz = sizeof(spppauthcfg);
  unsigned struct_spppauthfailuresettings_sz = sizeof(spppauthfailuresettings);
  unsigned struct_spppauthfailurestats_sz = sizeof(spppauthfailurestats);
-@@ -702,7 +708,9 @@ unsigned struct_twe_drivecommand_sz = si
+@@ -833,7 +835,9 @@ unsigned struct_twe_drivecommand_sz = si
  unsigned struct_twe_paramcommand_sz = sizeof(twe_paramcommand);
  unsigned struct_twe_usercommand_sz = sizeof(twe_usercommand);
  unsigned struct_ukyopon_identify_sz = sizeof(ukyopon_identify);
@@ -49,7 +29,7 @@
  unsigned struct_usb_alt_interface_sz = sizeof(usb_alt_interface);
  unsigned struct_usb_bulk_ra_wb_opt_sz = sizeof(usb_bulk_ra_wb_opt);
  unsigned struct_usb_config_desc_sz = sizeof(usb_config_desc);
-@@ -1291,8 +1299,10 @@ unsigned IOCTL_STICIO_RESET = STICIO_RES
+@@ -1422,8 +1426,10 @@ unsigned IOCTL_STICIO_RESET = STICIO_RES
  unsigned IOCTL_STICIO_STARTQ = STICIO_STARTQ;
  unsigned IOCTL_STICIO_STOPQ = STICIO_STOPQ;
  unsigned IOCTL_UKYOPON_IDENTIFY = UKYOPON_IDENTIFY;
@@ -60,7 +40,7 @@
  unsigned IOCTL_USB_REQUEST = USB_REQUEST;
  unsigned IOCTL_USB_SETDEBUG = USB_SETDEBUG;
  unsigned IOCTL_USB_DISCOVER = USB_DISCOVER;
-@@ -1677,6 +1687,7 @@ unsigned IOCTL_SIOCCONNECTXDEL = SIOCCON
+@@ -1808,6 +1814,7 @@ unsigned IOCTL_SIOCCONNECTXDEL = SIOCCON
  unsigned IOCTL_SIOCSIFINFO_FLAGS = SIOCSIFINFO_FLAGS;
  unsigned IOCTL_SIOCAADDRCTL_POLICY = SIOCAADDRCTL_POLICY;
  unsigned IOCTL_SIOCDADDRCTL_POLICY = SIOCDADDRCTL_POLICY;
@@ -68,7 +48,7 @@
  unsigned IOCTL_SMBIOC_OPENSESSION = SMBIOC_OPENSESSION;
  unsigned IOCTL_SMBIOC_OPENSHARE = SMBIOC_OPENSHARE;
  unsigned IOCTL_SMBIOC_REQUEST = SMBIOC_REQUEST;
-@@ -1684,6 +1695,7 @@ unsigned IOCTL_SMBIOC_SETFLAGS = SMBIOC_
+@@ -1815,6 +1822,7 @@ unsigned IOCTL_SMBIOC_SETFLAGS = SMBIOC_
  unsigned IOCTL_SMBIOC_LOOKUP = SMBIOC_LOOKUP;
  unsigned IOCTL_SMBIOC_READ = SMBIOC_READ;
  unsigned IOCTL_SMBIOC_WRITE = SMBIOC_WRITE;
diff -r ac8ce63593a5 -r bfd614b9c1fa lang/libcxx/Makefile
--- a/lang/libcxx/Makefile      Mon Jul 12 18:45:07 2021 +0000
+++ b/lang/libcxx/Makefile      Mon Jul 12 18:46:07 2021 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2020/01/26 17:31:29 rillig Exp $
+# $NetBSD: Makefile,v 1.11 2021/07/12 18:46:07 adam Exp $
 
 .include "../../lang/llvm/version.mk"
 
@@ -15,9 +15,11 @@
 # 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.
-LIBCXXABI=             ${DISTNAME:S/cxx/cxxabi/}
-_EXTRA_DIST=           ${LIBCXXABI}${EXTRACT_SUFX}
-SITES.${_EXTRA_DIST}=  ${MASTER_SITES:=${GITHUB_PROJECT}/releases/download/${GITHUB_RELEASE}/}
+LIBCXXABI=     libcxxabi-${LLVM_VERSION}.src
+LLVMDIST=      llvm-${LLVM_VERSION}.src
+_EXTRA_DIST=   ${LIBCXXABI}${EXTRACT_SUFX} ${LLVMDIST}${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}/}
 
 DISTFILES=     ${DEFAULT_DISTFILES} ${_EXTRA_DIST}
 
@@ -35,6 +37,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=ON
 CMAKE_ARGS+=   -DLIBCXX_ENABLE_ABI_LINKER_SCRIPT=OFF
 
 # avoid conflict with stddef.h
@@ -42,7 +45,8 @@
 
 post-extract:
        ${MKDIR} ${WRKDIR}/build
+       ${LN} -f -s ${WRKDIR}/${LIBCXXABI} ${WRKDIR}/libcxxabi
+       ${LN} -f -s ${WRKDIR}/${LLVMDIST} ${WRKDIR}/llvm
 
 .include "../../lang/libcxxabi/buildlink3.mk"
-.include "../../lang/llvm/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r ac8ce63593a5 -r bfd614b9c1fa lang/libcxx/PLIST
--- a/lang/libcxx/PLIST Mon Jul 12 18:45:07 2021 +0000
+++ b/lang/libcxx/PLIST Mon Jul 12 18:46:07 2021 +0000
@@ -1,5 +1,7 @@
-@comment $NetBSD: PLIST,v 1.5 2020/04/18 08:03:06 adam Exp $
+@comment $NetBSD: PLIST,v 1.6 2021/07/12 18:46:07 adam Exp $
+include/c++/v1/__availability
 include/c++/v1/__bit_reference
+include/c++/v1/__bits
 include/c++/v1/__bsd_locale_defaults.h
 include/c++/v1/__bsd_locale_fallbacks.h
 include/c++/v1/__config
@@ -12,6 +14,10 @@
 include/c++/v1/__hash_table
 include/c++/v1/__libcpp_version
 include/c++/v1/__locale
+include/c++/v1/__memory/allocator_traits.h
+include/c++/v1/__memory/base.h
+include/c++/v1/__memory/pointer_traits.h
+include/c++/v1/__memory/utilities.h
 include/c++/v1/__mutex_base
 include/c++/v1/__node_handle
 include/c++/v1/__nullptr
@@ -19,6 +25,25 @@
 include/c++/v1/__sso_allocator
 include/c++/v1/__std_stream
 include/c++/v1/__string
+include/c++/v1/__support/android/locale_bionic.h
+include/c++/v1/__support/fuchsia/xlocale.h
+include/c++/v1/__support/ibm/limits.h
+include/c++/v1/__support/ibm/locale_mgmt_aix.h
+include/c++/v1/__support/ibm/nanosleep.h
+include/c++/v1/__support/ibm/support.h
+include/c++/v1/__support/ibm/xlocale.h
+include/c++/v1/__support/musl/xlocale.h
+include/c++/v1/__support/newlib/xlocale.h
+include/c++/v1/__support/nuttx/xlocale.h
+include/c++/v1/__support/openbsd/xlocale.h
+include/c++/v1/__support/solaris/floatingpoint.h
+include/c++/v1/__support/solaris/wchar.h
+include/c++/v1/__support/solaris/xlocale.h
+include/c++/v1/__support/win32/limits_msvc_win32.h
+include/c++/v1/__support/win32/locale_win32.h


Home | Main Index | Thread Index | Old Index