libcxx: fix patches

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: libcxx: fix patches
From: pin <voidpin%protonmail.com@localhost>
Date: Thu, 07 Jul 2022 12:07:40 +0000
Module Name:	pkgsrc-wip
Committed By:	pin <voidpin%protonmail.com@localhost>
Pushed By:	pin
Date:		Thu Jul 7 14:07:40 2022 +0200
Changeset:	9d3e30598ecaea52af6147bc3e10ae2afa31bdde

Modified Files:
	libcxx/Makefile
	libcxx/distinfo
	libcxx/patches/patch-include_____config
	libcxx/patches/patch-src_support_solaris_xlocale.cpp
	libunwind/Makefile
Added Files:
	libcxx/patches/patch-src_filesystem_filesystem__common.h
Removed Files:
	libcxx/patches/patch-src_filesystem_directory__iterator.cpp

Log Message:
libcxx: fix patches

libunwind: needs to be built with gcc12, else libcxxabi fails to build.
libcxx: fix patches, so they apply.

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

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

diffstat:
 libcxx/Makefile                                    |  2 +-
 libcxx/distinfo                                    |  6 ++---
 libcxx/patches/patch-include_____config            | 12 +++++-----
 .../patch-src_filesystem_directory__iterator.cpp   | 28 ----------------------
 .../patch-src_filesystem_filesystem__common.h      | 28 ++++++++++++++++++++++
 .../patches/patch-src_support_solaris_xlocale.cpp  |  6 ++---
 libunwind/Makefile                                 |  2 +-
 7 files changed, 42 insertions(+), 42 deletions(-)

diffs:
diff --git a/libcxx/Makefile b/libcxx/Makefile
index e4aa7c2e63..9d0dd768e1 100644
--- a/libcxx/Makefile
+++ b/libcxx/Makefile
@@ -28,7 +28,7 @@ CMAKE_ARG_PATH=	${WRKSRC}
 
 USE_LANGUAGES=	c c++
 USE_CMAKE=	yes
-GCC_REQD+=	4.8
+GCC_REQD+=	12
 SSP_SUPPORTED=	no
 
 CMAKE_ARGS+=	-DCMAKE_BUILD_TYPE=Release
diff --git a/libcxx/distinfo b/libcxx/distinfo
index 18905cbf05..6f1504b110 100644
--- a/libcxx/distinfo
+++ b/libcxx/distinfo
@@ -9,6 +9,6 @@ Size (libcxxabi-14.0.6.src.tar.xz) = 561844 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
-SHA1 (patch-include_____config) = ff0d5a0fcc1431f21ce25667cbc01c2307542212
-SHA1 (patch-src_filesystem_directory__iterator.cpp) = 90ebbb80e4ec161405397d6d7c5d1d19a7284325
-SHA1 (patch-src_support_solaris_xlocale.cpp) = 8085adb5b2647151a162c620506b479f7c71c753
+SHA1 (patch-include_____config) = 01793dc2ec7db8f51d042fd0114649223036b089
+SHA1 (patch-src_filesystem_filesystem__common.h) = 7b088ae8e577b482e05906434b510daed40469ae
+SHA1 (patch-src_support_solaris_xlocale.cpp) = 027777a2945ce4aea89da59cb48426f2857d57d7
diff --git a/libcxx/patches/patch-include_____config b/libcxx/patches/patch-include_____config
index da0db3c648..007b1eeeaa 100644
--- a/libcxx/patches/patch-include_____config
+++ b/libcxx/patches/patch-include_____config
@@ -1,15 +1,15 @@
-$NetBSD: patch-include_____config,v 1.1 2021/07/23 09:39:34 jperkin Exp $
+$NetBSD$
 
 Avoid init_priority() on SunOS.
 
---- include/__config.orig	2021-06-28 16:23:38.000000000 +0000
+--- include/__config.orig	2022-06-22 16:46:24.000000000 +0000
 +++ include/__config
-@@ -1439,7 +1439,7 @@ extern "C" _LIBCPP_FUNC_VIS void __sanit
+@@ -1409,7 +1409,7 @@ extern "C" _LIBCPP_FUNC_VIS void __sanit
  #define _LIBCPP_HAS_NO_FGETPOS_FSETPOS
  #endif
  
 -#if __has_attribute(init_priority)
 +#if __has_attribute(init_priority) && !defined(__sun)
- # define _LIBCPP_INIT_PRIORITY_MAX __attribute__((init_priority(101)))
- #else
- # define _LIBCPP_INIT_PRIORITY_MAX
+     // TODO: Remove this once we drop support for building libc++ with old Clangs
+ #   if (defined(_LIBCPP_CLANG_VER) && _LIBCPP_CLANG_VER < 1200) || \
+        (defined(__apple_build_version__) && __apple_build_version__ < 13000000)
diff --git a/libcxx/patches/patch-src_filesystem_directory__iterator.cpp b/libcxx/patches/patch-src_filesystem_directory__iterator.cpp
deleted file mode 100644
index 60989c6b8c..0000000000
--- a/libcxx/patches/patch-src_filesystem_directory__iterator.cpp
+++ /dev/null
@@ -1,28 +0,0 @@
-$NetBSD: patch-src_filesystem_directory__iterator.cpp,v 1.2 2019/10/19 13:59:07 adam Exp $
-
-Support POSIX file modes.
-
---- src/filesystem/directory_iterator.cpp.orig	2019-02-01 23:52:17.000000000 +0000
-+++ src/filesystem/directory_iterator.cpp
-@@ -28,7 +28,21 @@ namespace {
- #if defined(DT_BLK)
- template <class DirEntT, class = decltype(DirEntT::d_type)>
- static file_type get_file_type(DirEntT* ent, int) {
-+#ifdef __sun
-+#define DT_BLK		S_IFBLK
-+#define DT_CHR		S_IFCHR
-+#define DT_DIR		S_IFDIR
-+#define DT_FIFO		S_IFIFO
-+#define DT_LNK		S_IFLNK
-+#define DT_REG		S_IFREG
-+#define DT_SOCK		S_IFSOCK
-+#define DT_UNKNOWN	0
-+  struct stat s;
-+  stat(ent->d_name, &s);
-+  switch (s.st_mode & 0xF000) {
-+#else
-   switch (ent->d_type) {
-+#endif
-   case DT_BLK:
-     return file_type::block;
-   case DT_CHR:
diff --git a/libcxx/patches/patch-src_filesystem_filesystem__common.h b/libcxx/patches/patch-src_filesystem_filesystem__common.h
new file mode 100644
index 0000000000..83595092d6
--- /dev/null
+++ b/libcxx/patches/patch-src_filesystem_filesystem__common.h
@@ -0,0 +1,28 @@
+$NetBSD$
+
+Support POSIX file modes.
+
+--- src/filesystem/filesystem_common.h.orig	2022-06-22 16:46:24.000000000 +0000
++++ src/filesystem/filesystem_common.h
+@@ -538,7 +538,21 @@ bool set_file_times(const path& p, std::
+ #if defined(DT_BLK)
+ template <class DirEntT, class = decltype(DirEntT::d_type)>
+ static file_type get_file_type(DirEntT* ent, int) {
++#ifdef __sun
++#define DT_BLK		S_IFBLK
++#define DT_CHR		S_IFCHR
++#define DT_DIR		S_IFDIR
++#define DT_FIFO		S_IFIFO
++#define DT_LNK		S_IFLNK
++#define DT_REG		S_IFREG
++#define DT_SOCK		S_IFSOCK
++#define DT_UNKNOWN	0
++  struct stat s;
++  stat(ent->d_name, &s);
++  switch (s.st_mode & 0xF000) {
++#else
+   switch (ent->d_type) {
++#endif
+   case DT_BLK:
+     return file_type::block;
+   case DT_CHR:
diff --git a/libcxx/patches/patch-src_support_solaris_xlocale.cpp b/libcxx/patches/patch-src_support_solaris_xlocale.cpp
index dac5e7f5be..1ca9b2588b 100644
--- a/libcxx/patches/patch-src_support_solaris_xlocale.cpp
+++ b/libcxx/patches/patch-src_support_solaris_xlocale.cpp
@@ -1,18 +1,18 @@
-$NetBSD: patch-src_support_solaris_xlocale.cpp,v 1.1 2022/01/09 23:20:59 tnn Exp $
+$NetBSD$
 
 don't try to use sys/localedef.h on SunOS if nonexistent
 OpenIndiana doesn't seem to ship the header.
 Userland shouldn't use it, according to Garrett D'Amore:
 https://illumos.topicbox.com/groups/developer/T6cfd2e6cd87f3485-M30dac0cb6fffae62ef45b9a8
 
---- src/support/solaris/xlocale.cpp.orig	2021-09-24 16:18:10.000000000 +0000
+--- src/support/solaris/xlocale.cpp.orig	2022-06-22 16:46:24.000000000 +0000
 +++ src/support/solaris/xlocale.cpp
 @@ -6,7 +6,7 @@
  //
  //===----------------------------------------------------------------------===//
  
 -#ifdef __sun__
-+#if defined(__sun__) && __has_include(<sys/localedef.h>)
++#ifdef(__sun__) && __has_include(<sys/localedef.h>)
  
  #include "__support/solaris/xlocale.h"
  #include <stdarg.h>
diff --git a/libunwind/Makefile b/libunwind/Makefile
index a0fac7421d..19ec39d43e 100644
--- a/libunwind/Makefile
+++ b/libunwind/Makefile
@@ -26,7 +26,7 @@ CMAKE_ARG_PATH=	${WRKSRC}
 USE_CMAKE=		yes
 USE_LANGUAGES=		c c++11
 USE_TOOLS+=		pax
-GCC_REQD+=		4.8
+GCC_REQD+=		12
 SSP_SUPPORTED=		no
 
 CMAKE_ARGS+=	-DCMAKE_BUILD_TYPE=Release
Prev by Date: zabbix62-*: Update to 6.2.0 release
Next by Date: libcxx: document failure
Previous by Thread: zabbix62-*: Update to 6.2.0 release
Next by Thread: libcxx: document failure
Indexes:
Home | Main Index | Thread Index | Old Index