sys-libs/compiler-rt: Switch to patchsets

Signed-off-by: Michał Górny <mgorny@gentoo.org>

10 files changed, 12 insertions, 169 deletions

diff --git a/sys-libs/compiler-rt/Manifest b/sys-libs/compiler-rt/Manifest
index 09cfebc27697..88b3c48b1f10 100644
--- a/sys-libs/compiler-rt/Manifest
+++ b/sys-libs/compiler-rt/Manifest
@@ -1,3 +1,8 @@
+DIST llvm-gentoo-patchset-10.0.1-1.tar.xz 8320 BLAKE2B 1b7ea7669586e08fece0efcf02b392feed4b7f3e6e9cdd10ab7dcc30082cae5bb1daa6d3314a7b0329c4d70f3c736d0c57ed408c838601dc737d558d2a0a0f26 SHA512 75898a8d719657177bbf587d848be8e53135c09e50603660c19edab00f80b6c2f29e7b6fda2bef381b38df6e24a690d694029a38c525763408322573275fc9f0
+DIST llvm-gentoo-patchset-11.0.0-1.tar.xz 6100 BLAKE2B 6f8fc9b7daa703f04b1283caaeb3665d4bec56ff80b1c5db35917c578fdd92617222bd2d2b83020144b8abdeaa261142b68aa3dee24350133f6721e41a167b78 SHA512 debdd92e6aa3133f474dfbd79f267e76d9d979e4e5d464c8d4343c6e6816b46376ca8080a9ee916152861907af9d0645ce71cf3582ef3dc31ec4ca3410fde9f6
+DIST llvm-gentoo-patchset-11.1.0-1.tar.xz 4032 BLAKE2B e69138a422e315b31a3d9c11faa4ae1ddf1bf9092cee2db0de4d2adef81fd802973488293aab48b764402b51996893b17ca03249ef4620848a576d1f6cdb9698 SHA512 e1c5504dab6c5db9fdf4addfeb12316f22d0258717ba551a9b7b3ba37919491fb6011ac5cca1e793b7509d5c1c186bc6bc4213f7d6155d190612492b216f979b
+DIST llvm-gentoo-patchset-12.0.0-1.tar.xz 6364 BLAKE2B bcf96dad8300cdc3e1f416cb90935ae3b1359efc5687118b5a9bbee25de7087a266250f50c6f2abd18f4efeeec19354f59513c8fdd1d61c2cfc8cc2f0115e514 SHA512 76201e169f71a8d568365ffeafcfd37138e74b0536826f47eb6ce89c2280586f10426917e851f99bfb20477cd828cc40daa8cb7a62959981620fbd81e1b22ee1
+DIST llvm-gentoo-patchset-9999-1.tar.xz 4032 BLAKE2B b9413484dafed8ae0c68c2c164b45fd07bb8d5d0898f03abe118fd2120ffcb1fb6c949de9649a97c2e8105f24b9d131a725c67c0a502ca4d4d192c1a0d65f49d SHA512 e64449eeaf756c5bd945109937b84ba4bd8a015222bd792d39cf3947871e87571a4ca57814790e51544cb05ad4c2d1f044e818e4caaac7c2e2a02cb1aa290fcc
 DIST llvmorg-10.0.1.tar.gz 120880730 BLAKE2B 30f19f56c4d1f6abcda5fec76256219d1e3c8a6ff1a1f152f94bfe362c07884339fe571ff7fe903ed3b3deb150b2fa868c387887a0dea2930dc08b81db71a5b1 SHA512 48078fff9293a87f1a973f3348f79506f04c3da774295f5eb67d74dd2d1aa94f0973f8ced3f4ab9e8339902071f82c603b43d5608ad7227046c4da769c5d2151
 DIST llvmorg-11.0.0.tar.gz 122743665 BLAKE2B 3f95570240789fd68ddb747df817f5c6cdc9da40911bbe9ee3531c15ada9165e5002b1c2f778cf8735858485ea05a8754e3d3a5f4b15bdd6cb33d64a14692984 SHA512 b6d38871ccce0e086e27d35e42887618d68e57d8274735c59e3eabc42dee352412489296293f8d5169fe0044936345915ee7da61ebdc64ec10f7737f6ecd90f2
 DIST llvmorg-11.0.1.tar.gz 122790338 BLAKE2B 0130996b4a8c4d9f757136fd7fb318068c9bfdc565060dec0d4336480c4ab66c4ae3185a7fdb05f13cf9ee8fd4123b09df938881b75d6e5d3689595114b7e32a SHA512 f5e6ef0b3111aae08a89cd01adb2ff4abfa9ef779c68b9190421d0447efd25c2cc00e5aae9f4764805f5fa31434866043d1510ae7389817e28ae53a5442e2fdf
diff --git a/sys-libs/compiler-rt/compiler-rt-10.0.1.ebuild b/sys-libs/compiler-rt/compiler-rt-10.0.1.ebuild
index 11bb6907be3a..bcd5f4b351d2 100644
--- a/sys-libs/compiler-rt/compiler-rt-10.0.1.ebuild
+++ b/sys-libs/compiler-rt/compiler-rt-10.0.1.ebuild
@@ -9,6 +9,7 @@ inherit cmake flag-o-matic llvm llvm.org python-any-r1 toolchain-funcs
 DESCRIPTION="Compiler runtime library for clang (built-in part)"
 HOMEPAGE="https://llvm.org/"
 LLVM_COMPONENTS=( compiler-rt )
+LLVM_PATCHSET=10.0.1-1
 llvm.org_set_globals
 
 LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
diff --git a/sys-libs/compiler-rt/compiler-rt-11.0.0.ebuild b/sys-libs/compiler-rt/compiler-rt-11.0.0.ebuild
index 5b81358551df..dce4982904c3 100644
--- a/sys-libs/compiler-rt/compiler-rt-11.0.0.ebuild
+++ b/sys-libs/compiler-rt/compiler-rt-11.0.0.ebuild
@@ -9,6 +9,7 @@ inherit cmake flag-o-matic llvm llvm.org python-any-r1 toolchain-funcs
 DESCRIPTION="Compiler runtime library for clang (built-in part)"
 HOMEPAGE="https://llvm.org/"
 LLVM_COMPONENTS=( compiler-rt )
+LLVM_PATCHSET=11.0.0-1
 llvm.org_set_globals
 
 LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
@@ -29,10 +30,6 @@ BDEPEND="
 		=sys-devel/clang-${PV%_*}*:${CLANG_SLOT} )
 	${PYTHON_DEPS}"
 
-PATCHES=(
-	"${FILESDIR}/11.1.0/${PN}-prefix-paths.patch"
-)
-
 python_check_deps() {
 	use test || return 0
 	has_version "dev-python/lit[${PYTHON_USEDEP}]"
diff --git a/sys-libs/compiler-rt/compiler-rt-11.0.1.ebuild b/sys-libs/compiler-rt/compiler-rt-11.0.1.ebuild
index 31085e5f5a71..1041a4553f3c 100644
--- a/sys-libs/compiler-rt/compiler-rt-11.0.1.ebuild
+++ b/sys-libs/compiler-rt/compiler-rt-11.0.1.ebuild
@@ -29,12 +29,9 @@ BDEPEND="
 	${PYTHON_DEPS}"
 
 LLVM_COMPONENTS=( compiler-rt )
+LLVM_PATCHSET=11.1.0-1
 llvm.org_set_globals
 
-PATCHES=(
-	"${FILESDIR}/11.1.0/${PN}-prefix-paths.patch"
-)
-
 python_check_deps() {
 	use test || return 0
 	has_version "dev-python/lit[${PYTHON_USEDEP}]"
diff --git a/sys-libs/compiler-rt/compiler-rt-11.1.0.ebuild b/sys-libs/compiler-rt/compiler-rt-11.1.0.ebuild
index 31085e5f5a71..1041a4553f3c 100644
--- a/sys-libs/compiler-rt/compiler-rt-11.1.0.ebuild
+++ b/sys-libs/compiler-rt/compiler-rt-11.1.0.ebuild
@@ -29,12 +29,9 @@ BDEPEND="
 	${PYTHON_DEPS}"
 
 LLVM_COMPONENTS=( compiler-rt )
+LLVM_PATCHSET=11.1.0-1
 llvm.org_set_globals
 
-PATCHES=(
-	"${FILESDIR}/11.1.0/${PN}-prefix-paths.patch"
-)
-
 python_check_deps() {
 	use test || return 0
 	has_version "dev-python/lit[${PYTHON_USEDEP}]"
diff --git a/sys-libs/compiler-rt/compiler-rt-12.0.0.9999.ebuild b/sys-libs/compiler-rt/compiler-rt-12.0.0.9999.ebuild
index e66cf796efb1..caf0b9268efd 100644
--- a/sys-libs/compiler-rt/compiler-rt-12.0.0.9999.ebuild
+++ b/sys-libs/compiler-rt/compiler-rt-12.0.0.9999.ebuild
@@ -29,12 +29,9 @@ BDEPEND="
 	${PYTHON_DEPS}"
 
 LLVM_COMPONENTS=( compiler-rt )
+LLVM_PATCHSET=9999-1
 llvm.org_set_globals
 
-PATCHES=(
-	"${FILESDIR}/9999/${PN}-prefix-paths.patch"
-)
-
 python_check_deps() {
 	use test || return 0
 	has_version "dev-python/lit[${PYTHON_USEDEP}]"
diff --git a/sys-libs/compiler-rt/compiler-rt-12.0.0.ebuild b/sys-libs/compiler-rt/compiler-rt-12.0.0.ebuild
index 05f5a914edd7..bf024de10f4d 100644
--- a/sys-libs/compiler-rt/compiler-rt-12.0.0.ebuild
+++ b/sys-libs/compiler-rt/compiler-rt-12.0.0.ebuild
@@ -29,12 +29,9 @@ BDEPEND="
 	${PYTHON_DEPS}"
 
 LLVM_COMPONENTS=( compiler-rt )
+LLVM_PATCHSET=12.0.0-1
 llvm.org_set_globals
 
-PATCHES=(
-	"${FILESDIR}/9999/${PN}-prefix-paths.patch"
-)
-
 python_check_deps() {
 	use test || return 0
 	has_version "dev-python/lit[${PYTHON_USEDEP}]"
diff --git a/sys-libs/compiler-rt/compiler-rt-13.0.0.9999.ebuild b/sys-libs/compiler-rt/compiler-rt-13.0.0.9999.ebuild
index e66cf796efb1..caf0b9268efd 100644
--- a/sys-libs/compiler-rt/compiler-rt-13.0.0.9999.ebuild
+++ b/sys-libs/compiler-rt/compiler-rt-13.0.0.9999.ebuild
@@ -29,12 +29,9 @@ BDEPEND="
 	${PYTHON_DEPS}"
 
 LLVM_COMPONENTS=( compiler-rt )
+LLVM_PATCHSET=9999-1
 llvm.org_set_globals
 
-PATCHES=(
-	"${FILESDIR}/9999/${PN}-prefix-paths.patch"
-)
-
 python_check_deps() {
 	use test || return 0
 	has_version "dev-python/lit[${PYTHON_USEDEP}]"
diff --git a/sys-libs/compiler-rt/files/11.1.0/compiler-rt-prefix-paths.patch b/sys-libs/compiler-rt/files/11.1.0/compiler-rt-prefix-paths.patch
deleted file mode 100644
index c27e3c44f684..000000000000
--- a/sys-libs/compiler-rt/files/11.1.0/compiler-rt-prefix-paths.patch
+++ /dev/null
@@ -1,79 +0,0 @@
---- a/compiler-rt/cmake/config-ix.cmake	2020-10-07 05:10:48.000000000 -0500
-+++ b/compiler-rt/cmake/config-ix.cmake	2020-12-13 16:17:43.000000000 -0600
-@@ -424,10 +424,7 @@
-     ${DARWIN_COMMON_LINK_FLAGS}
-     ${DARWIN_osx_MIN_VER_FLAG}=${SANITIZER_MIN_OSX_VERSION})
- 
--  if(DARWIN_osx_SYSROOT)
--    list(APPEND DARWIN_osx_CFLAGS -isysroot ${DARWIN_osx_SYSROOT})
--    list(APPEND DARWIN_osx_LINK_FLAGS -isysroot ${DARWIN_osx_SYSROOT})
--  endif()
-+  # Do not add -isysroot flag on Gentoo Prefix (search paths handled by cmake)
- 
-   # Figure out which arches to use for each OS
-   darwin_get_toolchain_supported_archs(toolchain_arches)
---- a/compiler-rt/cmake/base-config-ix.cmake	2020-12-13 16:17:13.000000000 -0600
-+++ b/compiler-rt/cmake/base-config-ix.cmake	2020-12-13 16:18:59.000000000 -0600
-@@ -102,23 +102,8 @@
- endif()
- 
- if(APPLE)
--  # On Darwin if /usr/include/c++ doesn't exist, the user probably has Xcode but
--  # not the command line tools (or is using macOS 10.14 or newer). If this is
--  # the case, we need to find the OS X sysroot to pass to clang.
--  if(NOT EXISTS /usr/include/c++)
--    execute_process(COMMAND xcrun -sdk macosx --show-sdk-path
--       OUTPUT_VARIABLE OSX_SYSROOT
--       ERROR_QUIET
--       OUTPUT_STRIP_TRAILING_WHITESPACE)
--    if (NOT OSX_SYSROOT OR NOT EXISTS ${OSX_SYSROOT})
--      message(WARNING "Detected OSX_SYSROOT ${OSX_SYSROOT} does not exist")
--    else()
--      message(STATUS "Found OSX_SYSROOT: ${OSX_SYSROOT}")
--      set(OSX_SYSROOT_FLAG "-isysroot${OSX_SYSROOT}")
--    endif()
--  else()
--    set(OSX_SYSROOT_FLAG "")
--  endif()
-+  # Do not add -isysroot flag on Gentoo Prefix (search paths handled by cmake)
-+  set(OSX_SYSROOT_FLAG "")
- 
-   option(COMPILER_RT_ENABLE_IOS "Enable building for iOS" On)
-   option(COMPILER_RT_ENABLE_WATCHOS "Enable building for watchOS - Experimental" Off)
---- a/compiler-rt/cmake/Modules/CompilerRTDarwinUtils.cmake	2020-10-07 05:10:48.000000000 -0500
-+++ b/compiler-rt/cmake/Modules/CompilerRTDarwinUtils.cmake	2020-12-13 16:21:32.000000000 -0600
-@@ -273,7 +273,8 @@
-     ${ARGN})
-   set(libname "${name}.${suffix}_${LIB_ARCH}_${LIB_OS}")
-   add_library(${libname} STATIC ${LIB_SOURCES})
--  if(DARWIN_${LIB_OS}_SYSROOT)
-+  # Do not add -isysroot flag on Gentoo Prefix (search paths handled by cmake)
-+  if(DARWIN_${LIB_OS}_SYSROOT AND NOT "${LIB_OS}" STREQUAL "osx")
-     set(sysroot_flag -isysroot ${DARWIN_${LIB_OS}_SYSROOT})
-   endif()
-
---- a/compiler-rt/cmake/Modules/AddCompilerRT.cmake	2020-10-07 05:10:48.000000000 -0500
-+++ b/compiler-rt/cmake/Modules/AddCompilerRT.cmake	2020-12-13 18:12:27.000000000 -0600
-@@ -277,9 +277,10 @@
-       if(CMAKE_C_COMPILER_ID MATCHES Clang AND CMAKE_C_COMPILER_TARGET)
-         list(APPEND extra_cflags_${libname} "--target=${CMAKE_C_COMPILER_TARGET}")
-       endif()
-+      # Do not add --sysroot flag on Gentoo Prefix (search paths handled by cmake)
--      if(CMAKE_SYSROOT)
-+      if(CMAKE_SYSROOT AND NOT APPLE)
-         list(APPEND extra_cflags_${libname} "--sysroot=${CMAKE_SYSROOT}")
-       endif()
-       string(REPLACE ";" " " extra_cflags_${libname} "${extra_cflags_${libname}}")
-       string(REGEX MATCHALL "<[A-Za-z0-9_]*>" substitutions
-              ${CMAKE_C_COMPILE_OBJECT})
---- a/compiler-rt/lib/tsan/CMakeLists.txt	2020-12-13 19:42:02.000000000 -0600
-+++ b/compiler-rt/lib/tsan/CMakeLists.txt	2020-12-13 19:42:38.000000000 -0600
-@@ -244,6 +244,7 @@
- # and Clang's versions. As a workaround do not use --sysroot=. on FreeBSD/NetBSD
- # until this is addressed.
- if(COMPILER_RT_HAS_SYSROOT_FLAG AND NOT CMAKE_SYSTEM_NAME MATCHES "FreeBSD"
-+   AND NOT CMAKE_SYSTEM_NAME MATCHES "Darwin"
-    AND NOT CMAKE_SYSTEM_NAME MATCHES "NetBSD")
-   file(GLOB _tsan_generic_sources rtl/tsan*)
-   file(GLOB _tsan_platform_sources rtl/tsan*posix* rtl/tsan*mac*
-
diff --git a/sys-libs/compiler-rt/files/9999/compiler-rt-prefix-paths.patch b/sys-libs/compiler-rt/files/9999/compiler-rt-prefix-paths.patch
deleted file mode 100644
index 0f1bbb863269..000000000000
--- a/sys-libs/compiler-rt/files/9999/compiler-rt-prefix-paths.patch
+++ /dev/null
@@ -1,66 +0,0 @@
---- a/compiler-rt/cmake/config-ix.cmake.ORIG	2021-01-29 09:54:20.880593534 +0100
-+++ b/compiler-rt/cmake/config-ix.cmake	2021-01-29 09:58:49.595603555 +0100
-@@ -444,10 +444,7 @@
-     ${DARWIN_COMMON_LINK_FLAGS}
-     ${DARWIN_osx_MIN_VER_FLAG}=${SANITIZER_MIN_OSX_VERSION})
- 
--  if(DARWIN_osx_SYSROOT)
--    list(APPEND DARWIN_osx_CFLAGS -isysroot ${DARWIN_osx_SYSROOT})
--    list(APPEND DARWIN_osx_LINK_FLAGS -isysroot ${DARWIN_osx_SYSROOT})
--  endif()
-+  # Do not add -isysroot flag on Gentoo Prefix (search paths handled by cmake)
- 
-   # Figure out which arches to use for each OS
-   darwin_get_toolchain_supported_archs(toolchain_arches)
---- a/compiler-rt/cmake/base-config-ix.cmakeORIG	2021-01-29 09:54:20.880593534 +0100
-+++ b/compiler-rt/cmake/base-config-ix.cmake	2021-01-29 09:59:41.087605475 +0100
-@@ -101,23 +101,8 @@
- endif()
- 
- if(APPLE)
--  # On Darwin if /usr/include/c++ doesn't exist, the user probably has Xcode but
--  # not the command line tools (or is using macOS 10.14 or newer). If this is
--  # the case, we need to find the OS X sysroot to pass to clang.
--  if(NOT EXISTS /usr/include/c++)
--    execute_process(COMMAND xcrun -sdk macosx --show-sdk-path
--       OUTPUT_VARIABLE OSX_SYSROOT
--       ERROR_QUIET
--       OUTPUT_STRIP_TRAILING_WHITESPACE)
--    if (NOT OSX_SYSROOT OR NOT EXISTS ${OSX_SYSROOT})
--      message(WARNING "Detected OSX_SYSROOT ${OSX_SYSROOT} does not exist")
--    else()
--      message(STATUS "Found OSX_SYSROOT: ${OSX_SYSROOT}")
--      set(OSX_SYSROOT_FLAG "-isysroot${OSX_SYSROOT}")
--    endif()
--  else()
--    set(OSX_SYSROOT_FLAG "")
--  endif()
-+  # Do not add -isysroot flag on Gentoo Prefix (search paths handled by cmake)
-+  set(OSX_SYSROOT_FLAG "")
- 
-   option(COMPILER_RT_ENABLE_IOS "Enable building for iOS" On)
-   option(COMPILER_RT_ENABLE_WATCHOS "Enable building for watchOS - Experimental" Off)
---- a/compiler-rt/cmake/Modules/CompilerRTDarwinUtils.cmake.ORIG	2021-01-29 09:54:20.879593534 +0100
-+++ b/compiler-rt/cmake/Modules/CompilerRTDarwinUtils.cmake	2021-01-29 10:00:45.701607884 +0100
-@@ -273,7 +273,8 @@
-     ${ARGN})
-   set(libname "${name}.${suffix}_${LIB_ARCH}_${LIB_OS}")
-   add_library(${libname} STATIC ${LIB_SOURCES})
--  if(DARWIN_${LIB_OS}_SYSROOT)
-+  # Do not add -isysroot flag on Gentoo Prefix (search paths handled by cmake)
-+  if(DARWIN_${LIB_OS}_SYSROOT AND NOT "${LIB_OS}" STREQUAL "osx")
-     set(sysroot_flag -isysroot ${DARWIN_${LIB_OS}_SYSROOT})
-   endif()
- 
---- a/compiler-rt/cmake/Modules/AddCompilerRT.cmake.ORIG	2021-01-29 09:54:20.879593534 +0100
-+++ b/compiler-rt/cmake/Modules/AddCompilerRT.cmake	2021-01-29 10:01:40.267609919 +0100
-@@ -278,7 +278,8 @@
-       if(CMAKE_C_COMPILER_ID MATCHES Clang AND CMAKE_C_COMPILER_TARGET)
-         list(APPEND extra_cflags_${libname} "--target=${CMAKE_C_COMPILER_TARGET}")
-       endif()
--      if(CMAKE_SYSROOT)
-+      # Do not add --sysroot flag on Gentoo Prefix (search paths handled by cmake)
-+      if(CMAKE_SYSROOT AND NOT APPLE)
-         list(APPEND extra_cflags_${libname} "--sysroot=${CMAKE_SYSROOT}")
-       endif()
-       string(REPLACE ";" " " extra_cflags_${libname} "${extra_cflags_${libname}}")