From 280ed82613d57c42e7c9cf9ecbcbc728e4783a4f Mon Sep 17 00:00:00 2001 From: Tom Stellard Date: Mon, 9 Aug 2021 18:31:50 +0000 Subject: [PATCH] 13.0.0-rc1 Release --- .gitignore | 2 ++ ...Include-refstring.h-from-system-incl.patch | 28 +++++++++---------- ...ibcxxabi-Remove-monorepo-requirement.patch | 8 +++--- libcxxabi.spec | 9 ++++-- sources | 4 +-- 5 files changed, 28 insertions(+), 23 deletions(-) diff --git a/.gitignore b/.gitignore index 1cae0fc..357a6bc 100644 --- a/.gitignore +++ b/.gitignore @@ -70,3 +70,5 @@ /libcxxabi-12.0.1rc3.src.tar.xz.sig /libcxxabi-12.0.1.src.tar.xz /libcxxabi-12.0.1.src.tar.xz.sig +/libcxxabi-13.0.0rc1.src.tar.xz +/libcxxabi-13.0.0rc1.src.tar.xz.sig diff --git a/0001-PATCH-libcxxabi-Include-refstring.h-from-system-incl.patch b/0001-PATCH-libcxxabi-Include-refstring.h-from-system-incl.patch index 728d487..60ef77b 100644 --- a/0001-PATCH-libcxxabi-Include-refstring.h-from-system-incl.patch +++ b/0001-PATCH-libcxxabi-Include-refstring.h-from-system-incl.patch @@ -1,26 +1,26 @@ -From d3eda1ebfd4f127e53880bbc588d703293552ef3 Mon Sep 17 00:00:00 2001 +From 2586ab946f1e22891345c86e7f673bb11989e427 Mon Sep 17 00:00:00 2001 From: Tom Stellard Date: Wed, 17 Feb 2021 12:50:08 -0800 -Subject: [PATCH 1/2] [PATCH][libcxxabi] Include refstring.h from system - includedir +Subject: [PATCH 1/2] Include refstring.h from system includedir --- - libcxxabi/src/stdlib_stdexcept.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) + libcxxabi/src/stdlib_stdexcept.cpp | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/libcxxabi/src/stdlib_stdexcept.cpp b/libcxxabi/src/stdlib_stdexcept.cpp -index 4a464e4..c3d14b2 100644 +index 0ca378dcde01..d2daf40173c0 100644 --- a/libcxxabi/src/stdlib_stdexcept.cpp +++ b/libcxxabi/src/stdlib_stdexcept.cpp -@@ -6,7 +6,7 @@ - // - //===----------------------------------------------------------------------===// +@@ -13,8 +13,7 @@ + #include + #include --#include "../../libcxx/src/include/refstring.h" +-// This includes an implementation file from libc++. +-#include "src/include/refstring.h" +#include - #include "stdexcept" - #include "new" - #include + + static_assert(sizeof(std::__libcpp_refstring) == sizeof(const char *), ""); + -- -1.8.3.1 +2.27.0 diff --git a/0002-PATCH-libcxxabi-Remove-monorepo-requirement.patch b/0002-PATCH-libcxxabi-Remove-monorepo-requirement.patch index f90e519..1fa2090 100644 --- a/0002-PATCH-libcxxabi-Remove-monorepo-requirement.patch +++ b/0002-PATCH-libcxxabi-Remove-monorepo-requirement.patch @@ -1,14 +1,14 @@ -From b2aeba2b86445ceca13c90561dbb26075a6eab67 Mon Sep 17 00:00:00 2001 +From 4462799ee3c9e29a2eb2396d065c1c3caf1a3d0e Mon Sep 17 00:00:00 2001 From: Tom Stellard Date: Tue, 11 Aug 2020 08:27:41 -0700 -Subject: [PATCH 2/2] [PATCH][libcxxabi] Remove monorepo requirement +Subject: [PATCH 2/2] libcxxabi: Remove monorepo requirement --- libcxxabi/CMakeLists.txt | 6 ------ 1 file changed, 6 deletions(-) diff --git a/libcxxabi/CMakeLists.txt b/libcxxabi/CMakeLists.txt -index 426c855..8ad0475 100644 +index 9fb35860d483..abbdbfe7efaa 100644 --- a/libcxxabi/CMakeLists.txt +++ b/libcxxabi/CMakeLists.txt @@ -1,9 +1,5 @@ @@ -31,5 +31,5 @@ index 426c855..8ad0475 100644 if (LIBCXXABI_STANDALONE_BUILD) -- -1.8.3.1 +2.27.0 diff --git a/libcxxabi.spec b/libcxxabi.spec index 8095273..4998600 100644 --- a/libcxxabi.spec +++ b/libcxxabi.spec @@ -1,12 +1,12 @@ %global toolchain clang -#global rc_ver 3 -%global libcxxabi_version 12.0.1 +%global rc_ver 1 +%global libcxxabi_version 13.0.0 %global libcxxabi_srcdir libcxxabi-%{libcxxabi_version}%{?rc_ver:rc%{rc_ver}}.src Name: libcxxabi Version: %{libcxxabi_version}%{?rc_ver:~rc%{rc_ver}} -Release: 2%{?dist} +Release: 1%{?dist} Summary: Low level support for a standard C++ library License: MIT or NCSA URL: http://libcxxabi.llvm.org/ @@ -101,6 +101,9 @@ cp -a include/* %{buildroot}%{_includedir} %{_libdir}/libc++abi.a %changelog +* Mon Aug 09 2021 Tom Stellard - 13.0.0~rc1-1 +- 13.0.0-rc1 Release + * Thu Jul 22 2021 Fedora Release Engineering - 12.0.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild diff --git a/sources b/sources index 59cf87f..5c9012d 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (libcxxabi-12.0.1.src.tar.xz) = c7b236e9afe8d6bba297e1eca12ca0e03fbd1b028b9627154186d27eb2e035cd33eddb72511a38d0827de347a487e180c32c1798759c4283b9fbbf338a015bb9 -SHA512 (libcxxabi-12.0.1.src.tar.xz.sig) = d729c70fe931bbe7a68db1d5b0bcadd3493ff6a80f5cee6f782c75f17c6cbd3f9811dfe9b79b2a2e1e947f705babed53e7e3357579638107bf96d92f223e94dc +SHA512 (libcxxabi-13.0.0rc1.src.tar.xz) = 4ae215c4625b599e3b0f54ca7e4547a3a642f02505af973c21d1951aa8f5fbc2a29a35dc09909b9c4191ef0979fe956cfd978be3f77de97bbbf48cbba1fafbfa +SHA512 (libcxxabi-13.0.0rc1.src.tar.xz.sig) = be3603a3453c4236f08f374be3b89bfad4d0bbf7517c42fde3afd377799166845d264967635a6a12431a916ffd3977a39fa1501b5bc2f08f3bb3c61aba9708ec