From fde4ffb85a83781aa7c9cc1c241f2da656cff4db Mon Sep 17 00:00:00 2001 From: serge-sans-paille Date: Thu, 25 Feb 2021 15:24:21 +0100 Subject: [PATCH] Cleanup, rename and normalize patch serie --- ...-libcxxabi-Include-refstring.h-from-system-incl.patch | 9 +++++---- ...002-PATCH-libcxxabi-Remove-monorepo-requirement.patch | 8 ++++---- libcxxabi.spec | 4 ++-- 3 files changed, 11 insertions(+), 10 deletions(-) rename 0001-Include-refstring.h-from-system-includedir.patch => 0001-PATCH-libcxxabi-Include-refstring.h-from-system-incl.patch (76%) rename 0001-libcxxabi-Remove-monorepo-requirement.patch => 0002-PATCH-libcxxabi-Remove-monorepo-requirement.patch (86%) diff --git a/0001-Include-refstring.h-from-system-includedir.patch b/0001-PATCH-libcxxabi-Include-refstring.h-from-system-incl.patch similarity index 76% rename from 0001-Include-refstring.h-from-system-includedir.patch rename to 0001-PATCH-libcxxabi-Include-refstring.h-from-system-incl.patch index 616d5c6..728d487 100644 --- a/0001-Include-refstring.h-from-system-includedir.patch +++ b/0001-PATCH-libcxxabi-Include-refstring.h-from-system-incl.patch @@ -1,14 +1,15 @@ -From d216fcd05862fd7e4bb9395e2c96a0f24e63a548 Mon Sep 17 00:00:00 2001 +From d3eda1ebfd4f127e53880bbc588d703293552ef3 Mon Sep 17 00:00:00 2001 From: Tom Stellard Date: Wed, 17 Feb 2021 12:50:08 -0800 -Subject: [PATCH] Include refstring.h from system includedir +Subject: [PATCH 1/2] [PATCH][libcxxabi] Include refstring.h from system + includedir --- libcxxabi/src/stdlib_stdexcept.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libcxxabi/src/stdlib_stdexcept.cpp b/libcxxabi/src/stdlib_stdexcept.cpp -index 4a464e48893d..c3d14b224186 100644 +index 4a464e4..c3d14b2 100644 --- a/libcxxabi/src/stdlib_stdexcept.cpp +++ b/libcxxabi/src/stdlib_stdexcept.cpp @@ -6,7 +6,7 @@ @@ -21,5 +22,5 @@ index 4a464e48893d..c3d14b224186 100644 #include "new" #include -- -2.27.0 +1.8.3.1 diff --git a/0001-libcxxabi-Remove-monorepo-requirement.patch b/0002-PATCH-libcxxabi-Remove-monorepo-requirement.patch similarity index 86% rename from 0001-libcxxabi-Remove-monorepo-requirement.patch rename to 0002-PATCH-libcxxabi-Remove-monorepo-requirement.patch index 0bd8f7b..f90e519 100644 --- a/0001-libcxxabi-Remove-monorepo-requirement.patch +++ b/0002-PATCH-libcxxabi-Remove-monorepo-requirement.patch @@ -1,14 +1,14 @@ -From d19bf09163a54984160eda55a43b93703f8d46b5 Mon Sep 17 00:00:00 2001 +From b2aeba2b86445ceca13c90561dbb26075a6eab67 Mon Sep 17 00:00:00 2001 From: Tom Stellard Date: Tue, 11 Aug 2020 08:27:41 -0700 -Subject: [PATCH] libcxxabi: Remove monorepo requirement +Subject: [PATCH 2/2] [PATCH][libcxxabi] Remove monorepo requirement --- libcxxabi/CMakeLists.txt | 6 ------ 1 file changed, 6 deletions(-) diff --git a/libcxxabi/CMakeLists.txt b/libcxxabi/CMakeLists.txt -index 426c855288fc..8ad0475dc65e 100644 +index 426c855..8ad0475 100644 --- a/libcxxabi/CMakeLists.txt +++ b/libcxxabi/CMakeLists.txt @@ -1,9 +1,5 @@ @@ -31,5 +31,5 @@ index 426c855288fc..8ad0475dc65e 100644 if (LIBCXXABI_STANDALONE_BUILD) -- -2.27.0 +1.8.3.1 diff --git a/libcxxabi.spec b/libcxxabi.spec index e11ccc5..eadbf64 100644 --- a/libcxxabi.spec +++ b/libcxxabi.spec @@ -14,8 +14,8 @@ Source0: https://github.com/llvm/llvm-project/releases/download/llvmorg-%{versio Source1: https://github.com/llvm/llvm-project/releases/download/llvmorg-%{version}%{?rc_ver:-rc%{rc_ver}}/%{libcxxabi_srcdir}.tar.xz.sig Source2: tstellar-gpg-key.asc -Patch0: 0001-libcxxabi-Remove-monorepo-requirement.patch -Patch1: 0001-Include-refstring.h-from-system-includedir.patch +Patch0: 0001-PATCH-libcxxabi-Include-refstring.h-from-system-incl.patch +Patch1: 0002-PATCH-libcxxabi-Remove-monorepo-requirement.patch BuildRequires: clang llvm-devel cmake llvm-static ninja-build BuildRequires: libcxx-devel >= %{version}