wasi-compiler-rt: move patch to compiler-rt

[Adam Ciarciński <aciarcinski%teonite.com@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Adam Ciarciński <aciarcinski%teonite.com@localhost>
Pushed By:	adam
Date:		Mon Jul 3 10:58:02 2023 +0200
Changeset:	7fb88ea84d654b96094124c2d5955ede170413e5

Modified Files:
	compiler-rt/distinfo
Added Files:
	compiler-rt/patches/patch-CMakeLists.txt
Removed Files:
	wasi-compiler-rt/patches/patch-CMakeLists.txt

Log Message:
wasi-compiler-rt: move patch to compiler-rt

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

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

diffstat:
 compiler-rt/distinfo                          |  1 +
 compiler-rt/patches/patch-CMakeLists.txt      | 20 ++++++++++++++++++++
 wasi-compiler-rt/patches/patch-CMakeLists.txt | 20 --------------------
 3 files changed, 21 insertions(+), 20 deletions(-)

diffs:
diff --git a/compiler-rt/distinfo b/compiler-rt/distinfo
index 60cf3a4559..5ffebf2f3d 100644
--- a/compiler-rt/distinfo
+++ b/compiler-rt/distinfo
@@ -6,6 +6,7 @@ Size (cmake-16.0.6.src.tar.xz) = 9008 bytes
 BLAKE2s (compiler-rt-16.0.6.src.tar.xz) = 347c0c1e7d13ab026bc18d21a892047cf75039f940f58d32a2b365f51f5f3aa6
 SHA512 (compiler-rt-16.0.6.src.tar.xz) = 852e2105facb12ea0943aa24e0c220f76671ad76dfe7d07b8164c3a1d8360670ca565a2b6dd590722b974e16a2adf3c466fdabdfd3bb3ebbd005162c8ac4406c
 Size (compiler-rt-16.0.6.src.tar.xz) = 2358240 bytes
+SHA1 (patch-CMakeLists.txt) = f8b0a0ad43481ec0c2923ec19c3c4f2ce81a4c82
 SHA1 (patch-cmake_config-ix.cmake) = 40ee86393c0f9e26eeaa493c5312d2cabf4c2a58
 SHA1 (patch-lib_asan_CMakeLists.txt) = f91335b88c8c28a25d7dfada85769f799660f82a
 SHA1 (patch-lib_sanitizer__common_sanitizer__platform__limits__netbsd.cpp) = 708b4def299a1cc47fca3c48f70745f8528c0fb8
diff --git a/compiler-rt/patches/patch-CMakeLists.txt b/compiler-rt/patches/patch-CMakeLists.txt
new file mode 100644
index 0000000000..c6e81b520c
--- /dev/null
+++ b/compiler-rt/patches/patch-CMakeLists.txt
@@ -0,0 +1,20 @@
+$NetBSD$
+
+Fix build for Darwin.
+
+--- CMakeLists.txt.orig	2023-06-04 18:50:42.000000000 +0000
++++ CMakeLists.txt
+@@ -471,13 +471,6 @@ if(MSVC)
+     string(REGEX REPLACE "(^| )/Z[i7I]($| )" " /Z7 "
+            "${var_to_update}" "${${var_to_update}}")
+   endforeach()
+-elseif(APPLE)
+-  # On Apple platforms use full debug info (i.e. not `-gline-tables-only`)
+-  # for all build types so that the runtime can be debugged.
+-  if(NOT COMPILER_RT_HAS_G_FLAG)
+-    message(FATAL_ERROR "-g is not supported by host compiler")
+-  endif()
+-  list(APPEND SANITIZER_COMMON_CFLAGS -g)
+ elseif(COMPILER_RT_HAS_GLINE_TABLES_ONLY_FLAG AND NOT COMPILER_RT_DEBUG)
+   list(APPEND SANITIZER_COMMON_CFLAGS -gline-tables-only)
+ elseif(COMPILER_RT_HAS_G_FLAG)
diff --git a/wasi-compiler-rt/patches/patch-CMakeLists.txt b/wasi-compiler-rt/patches/patch-CMakeLists.txt
deleted file mode 100644
index c6e81b520c..0000000000
--- a/wasi-compiler-rt/patches/patch-CMakeLists.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD$
-
-Fix build for Darwin.
-
---- CMakeLists.txt.orig	2023-06-04 18:50:42.000000000 +0000
-+++ CMakeLists.txt
-@@ -471,13 +471,6 @@ if(MSVC)
-     string(REGEX REPLACE "(^| )/Z[i7I]($| )" " /Z7 "
-            "${var_to_update}" "${${var_to_update}}")
-   endforeach()
--elseif(APPLE)
--  # On Apple platforms use full debug info (i.e. not `-gline-tables-only`)
--  # for all build types so that the runtime can be debugged.
--  if(NOT COMPILER_RT_HAS_G_FLAG)
--    message(FATAL_ERROR "-g is not supported by host compiler")
--  endif()
--  list(APPEND SANITIZER_COMMON_CFLAGS -g)
- elseif(COMPILER_RT_HAS_GLINE_TABLES_ONLY_FLAG AND NOT COMPILER_RT_DEBUG)
-   list(APPEND SANITIZER_COMMON_CFLAGS -gline-tables-only)
- elseif(COMPILER_RT_HAS_G_FLAG)