[pkgsrc/trunk]: pkgsrc/lang/compiler-rt compiler-rt: remove patch fixing buil...

[khorben <khorben%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/4857c969dd4b
branches:  trunk
changeset: 440081:4857c969dd4b
user:      khorben <khorben%pkgsrc.org@localhost>
date:      Fri Oct 02 14:20:34 2020 +0000

description:
compiler-rt: remove patch fixing build on NetBSD

One of the two patches fixing the build on NetBSD was wrong; I had modified it
to build again but it turns out it was not necessary at all in the first place.
I just confirmed it on netbsd-9/amd64.

Bumps PKGREVISION for safety, since it built again after modifying the original
patch.

Coordinated with kamil@ (who upstreams for us)

diffstat:

 lang/compiler-rt/Makefile                                                          |   3 +-
 lang/compiler-rt/distinfo                                                          |   3 +-
 lang/compiler-rt/patches/patch-lib_sanitizer__common_sanitizer__linux__libcdep.cpp |  23 ----------
 3 files changed, 3 insertions(+), 26 deletions(-)

diffs (56 lines):

diff -r 84eabdc6b91a -r 4857c969dd4b lang/compiler-rt/Makefile
--- a/lang/compiler-rt/Makefile Fri Oct 02 13:26:09 2020 +0000
+++ b/lang/compiler-rt/Makefile Fri Oct 02 14:20:34 2020 +0000
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.15 2020/01/26 17:31:27 rillig Exp $
+# $NetBSD: Makefile,v 1.16 2020/10/02 14:20:34 khorben Exp $
 
 .include "../../lang/llvm/version.mk"
 
 DISTNAME=      compiler-rt-${LLVM_VERSION}.src
 PKGNAME=       ${DISTNAME:S/.src//}
+PKGREVISION=   1
 CATEGORIES=    lang devel
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
diff -r 84eabdc6b91a -r 4857c969dd4b lang/compiler-rt/distinfo
--- a/lang/compiler-rt/distinfo Fri Oct 02 13:26:09 2020 +0000
+++ b/lang/compiler-rt/distinfo Fri Oct 02 14:20:34 2020 +0000
@@ -1,9 +1,8 @@
-$NetBSD: distinfo,v 1.10 2020/09/26 02:08:10 khorben Exp $
+$NetBSD: distinfo,v 1.11 2020/10/02 14:20:34 khorben Exp $
 
 SHA1 (compiler-rt-10.0.1.src.tar.xz) = ee6077b4728b3c750e476938cead11cea45b49ff
 RMD160 (compiler-rt-10.0.1.src.tar.xz) = 7912cb7c636894f0682b91d04ea0dfe512f01124
 SHA512 (compiler-rt-10.0.1.src.tar.xz) = a1d2e3f5ad529a04f87059903b31fc3c9803cd86f44aed1aebd87ce7e423d8dd2b6776be12e85a0374a6215f581420438d224c130aad5e6355920af32c02aa7b
 Size (compiler-rt-10.0.1.src.tar.xz) = 2085712 bytes
 SHA1 (patch-cmake_config-ix.cmake) = e950d8781f00638310b523b6933889a9d15611c5
-SHA1 (patch-lib_sanitizer__common_sanitizer__linux__libcdep.cpp) = f812d5a5f6870e1ed2fe31d0bca1f79d8c16fa9a
 SHA1 (patch-lib_sanitizer__common_sanitizer__platform__limits__netbsd.cpp) = 53c60eb4a1e7be5a60c7b4fff2d245daef54653d
diff -r 84eabdc6b91a -r 4857c969dd4b lang/compiler-rt/patches/patch-lib_sanitizer__common_sanitizer__linux__libcdep.cpp
--- a/lang/compiler-rt/patches/patch-lib_sanitizer__common_sanitizer__linux__libcdep.cpp        Fri Oct 02 13:26:09 2020 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,23 +0,0 @@
-$NetBSD: patch-lib_sanitizer__common_sanitizer__linux__libcdep.cpp,v 1.2 2020/09/26 02:08:10 khorben Exp $
-
-Fix building on NetBSD.
-
---- lib/sanitizer_common/sanitizer_linux_libcdep.cpp.orig      2020-03-23 15:01:02.000000000 +0000
-+++ lib/sanitizer_common/sanitizer_linux_libcdep.cpp
-@@ -520,13 +520,13 @@ void GetThreadStackAndTls(bool main, upt
- #endif
- }
- 
--#if !SANITIZER_FREEBSD && !SANITIZER_OPENBSD
-+#if !SANITIZER_FREEBSD && !SANITIZER_NETBSD && !SANITIZER_OPENBSD
- typedef ElfW(Phdr) Elf_Phdr;
--#elif SANITIZER_WORDSIZE == 32 && __FreeBSD_version <= 902001 // v9.2
-+#elif SANITIZER_WORDSIZE == 32 && SANITIZER_FREEBSD && __FreeBSD_version <= 902001 // v9.2
- #define Elf_Phdr XElf32_Phdr
- #define dl_phdr_info xdl_phdr_info
- #define dl_iterate_phdr(c, b) xdl_iterate_phdr((c), (b))
--#endif // !SANITIZER_FREEBSD && !SANITIZER_OPENBSD
-+#endif // !SANITIZER_FREEBSD && !SANITIZER_NETBSD && !SANITIZER_OPENBSD
- 
- struct DlIteratePhdrData {
-   InternalMmapVectorNoCtor<LoadedModule> *modules;