compiler-rt-netbsd: Disable lsan

[Kamil Rytarowski <n54%gmx.com@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Kamil Rytarowski <n54%gmx.com@localhost>
Pushed By:	kamil
Date:		Tue Jul 4 15:57:07 2017 +0200
Changeset:	46156d940a94def82e9795de77d2d28358e503d3

Modified Files:
	compiler-rt-netbsd/PLIST
	compiler-rt-netbsd/distinfo
	compiler-rt-netbsd/patches/patch-cmake_config-ix.cmake
	compiler-rt-netbsd/patches/patch-lib_lsan_lsan__common.h
	compiler-rt-netbsd/patches/patch-lib_lsan_lsan__linux.cc

Log Message:
compiler-rt-netbsd: Disable lsan

Temporarily skip lsan.

Sponsored by <The NetBSD Foundation>

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

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

diffstat:
 compiler-rt-netbsd/PLIST                                 |  2 --
 compiler-rt-netbsd/distinfo                              |  6 +++---
 compiler-rt-netbsd/patches/patch-cmake_config-ix.cmake   | 12 ++----------
 compiler-rt-netbsd/patches/patch-lib_lsan_lsan__common.h | 11 -----------
 compiler-rt-netbsd/patches/patch-lib_lsan_lsan__linux.cc | 11 +----------
 5 files changed, 6 insertions(+), 36 deletions(-)

diffs:
diff --git a/compiler-rt-netbsd/PLIST b/compiler-rt-netbsd/PLIST
index 55f5d38253..54358e0667 100644
--- a/compiler-rt-netbsd/PLIST
+++ b/compiler-rt-netbsd/PLIST
@@ -27,8 +27,6 @@ lib/clang/${PKGVERSION}/lib/${COMPILER_RT_OS_DIR}/libclang_rt.builtins-i386.a
 lib/clang/${PKGVERSION}/lib/${COMPILER_RT_OS_DIR}/libclang_rt.builtins-x86_64.a
 lib/clang/${PKGVERSION}/lib/${COMPILER_RT_OS_DIR}/libclang_rt.dd-x86_64.a
 lib/clang/${PKGVERSION}/lib/${COMPILER_RT_OS_DIR}/libclang_rt.dyndd-x86_64.so
-lib/clang/${PKGVERSION}/lib/${COMPILER_RT_OS_DIR}/libclang_rt.lsan-i386.a
-lib/clang/${PKGVERSION}/lib/${COMPILER_RT_OS_DIR}/libclang_rt.lsan-x86_64.a
 lib/clang/${PKGVERSION}/lib/${COMPILER_RT_OS_DIR}/libclang_rt.msan-x86_64.a
 lib/clang/${PKGVERSION}/lib/${COMPILER_RT_OS_DIR}/libclang_rt.msan-x86_64.a.syms
 lib/clang/${PKGVERSION}/lib/${COMPILER_RT_OS_DIR}/libclang_rt.msan_cxx-x86_64.a
diff --git a/compiler-rt-netbsd/distinfo b/compiler-rt-netbsd/distinfo
index c0a1ad87a7..f021f28c17 100644
--- a/compiler-rt-netbsd/distinfo
+++ b/compiler-rt-netbsd/distinfo
@@ -12,7 +12,7 @@ Size (libcxx-3.6.2.src.tar.xz) = 944020 bytes
 SHA1 (llvm-3.6.2.src.tar.xz) = 7a00257eb2bc9431e4c77c3a36b033072c54bc7e
 RMD160 (llvm-3.6.2.src.tar.xz) = 521cbc5fe2925ea3c6e90c7a31f752a04045c972
 Size (llvm-3.6.2.src.tar.xz) = 12802380 bytes
-SHA1 (patch-cmake_config-ix.cmake) = 895b5f740bb1583ebcc7ad5e2dc1a87019618db4
+SHA1 (patch-cmake_config-ix.cmake) = bbe5cf5945995d58d500f265baaadaeb99f35237
 SHA1 (patch-lib_asan_asan__interceptors.cc) = 8711f7919ad676a2a9d323caf7f152afe8b0e545
 SHA1 (patch-lib_asan_asan__interceptors.h) = cca1e74041e37d366c512d23547063d6a4dee008
 SHA1 (patch-lib_asan_asan__linux.cc) = fcbf780af6bcd3b43c86d9e5e2c8a92e3a8885da
@@ -23,8 +23,8 @@ SHA1 (patch-lib_builtins_gcc__personality__v0.c) = 66c36733afc7043f662328303de25
 SHA1 (patch-lib_interception_interception.h) = f18c140feec3c88fec57ac7ba1fbedb03db2bac6
 SHA1 (patch-lib_interception_interception__linux.cc) = a7c8a898784eb8424ca17dd96cf8faac4b3057bb
 SHA1 (patch-lib_interception_interception__linux.h) = 2f37344082e935a99fc04203453d387fe78bd6d3
-SHA1 (patch-lib_lsan_lsan__common.h) = e2eecdcb084abe9c4f4dac4b22d85a5e50095580
-SHA1 (patch-lib_lsan_lsan__linux.cc) = 237e17c0992689d3fe37742861fc158ad5932b64
+SHA1 (patch-lib_lsan_lsan__common.h) = adc83b19e793491b1c6ea0fd8b46cd9f32e592fc
+SHA1 (patch-lib_lsan_lsan__linux.cc) = 1c2e4b088f1ac244f733f326a0cd9642e6c55c75
 SHA1 (patch-lib_msan_msan.h) = 255eb26b3e6c4b728376cd8b12f7efa3caccc7b5
 SHA1 (patch-lib_msan_msan__interceptors.cc) = aa4e4f78a25a51959787aaf54afa3fed35ed52bc
 SHA1 (patch-lib_msan_msan__linux.cc) = 059a26cbff5082a964b90314bccb0b994b323053
diff --git a/compiler-rt-netbsd/patches/patch-cmake_config-ix.cmake b/compiler-rt-netbsd/patches/patch-cmake_config-ix.cmake
index d4cbf3b8d9..82745899d9 100644
--- a/compiler-rt-netbsd/patches/patch-cmake_config-ix.cmake
+++ b/compiler-rt-netbsd/patches/patch-cmake_config-ix.cmake
@@ -1,6 +1,6 @@
 $NetBSD$
 
---- cmake/config-ix.cmake.orig	2017-06-19 18:04:05.000000000 +0000
+--- cmake/config-ix.cmake.orig	2017-07-04 05:53:17.000000000 +0000
 +++ cmake/config-ix.cmake
 @@ -441,7 +441,7 @@ set(COMPILER_RT_SANITIZERS_TO_BUILD ${AL
  list_replace(COMPILER_RT_SANITIZERS_TO_BUILD all "${ALL_SANITIZERS}")
@@ -20,15 +20,7 @@ $NetBSD$
    set(COMPILER_RT_ASAN_HAS_STATIC_RUNTIME TRUE)
  else()
    set(COMPILER_RT_ASAN_HAS_STATIC_RUNTIME FALSE)
-@@ -476,42 +476,42 @@ else()
- endif()
- 
- if (COMPILER_RT_HAS_SANITIZER_COMMON AND LSAN_SUPPORTED_ARCH AND
--    OS_NAME MATCHES "Darwin|Linux|FreeBSD")
-+    OS_NAME MATCHES "Darwin|Linux|FreeBSD|NetBSD")
-   set(COMPILER_RT_HAS_LSAN TRUE)
- else()
-   set(COMPILER_RT_HAS_LSAN FALSE)
+@@ -483,35 +483,35 @@ else()
  endif()
  
  if (COMPILER_RT_HAS_SANITIZER_COMMON AND MSAN_SUPPORTED_ARCH AND
diff --git a/compiler-rt-netbsd/patches/patch-lib_lsan_lsan__common.h b/compiler-rt-netbsd/patches/patch-lib_lsan_lsan__common.h
index bbd88649e0..afc76512f4 100644
--- a/compiler-rt-netbsd/patches/patch-lib_lsan_lsan__common.h
+++ b/compiler-rt-netbsd/patches/patch-lib_lsan_lsan__common.h
@@ -1,13 +1,2 @@
 $NetBSD$
 
---- lib/lsan/lsan_common.h.orig	2017-06-03 23:53:56.000000000 +0000
-+++ lib/lsan/lsan_common.h
-@@ -30,7 +30,7 @@
- // To enable LeakSanitizer on new architecture, one need to implement
- // internal_clone function as well as (probably) adjust TLS machinery for
- // new architecture inside sanitizer library.
--#if (SANITIZER_LINUX && !SANITIZER_ANDROID || SANITIZER_MAC) && \
-+#if (SANITIZER_LINUX && !SANITIZER_ANDROID || SANITIZER_MAC || SANITIZER_NETBSD) && \
-     (SANITIZER_WORDSIZE == 64) &&                               \
-     (defined(__x86_64__) || defined(__mips64) || defined(__aarch64__) || \
-      defined(__powerpc64__))
diff --git a/compiler-rt-netbsd/patches/patch-lib_lsan_lsan__linux.cc b/compiler-rt-netbsd/patches/patch-lib_lsan_lsan__linux.cc
index f6ce0373d9..e2a67300c3 100644
--- a/compiler-rt-netbsd/patches/patch-lib_lsan_lsan__linux.cc
+++ b/compiler-rt-netbsd/patches/patch-lib_lsan_lsan__linux.cc
@@ -1,16 +1,7 @@
 $NetBSD$
 
---- lib/lsan/lsan_linux.cc.orig	2017-06-03 23:53:56.000000000 +0000
+--- lib/lsan/lsan_linux.cc.orig	2017-07-04 05:53:20.000000000 +0000
 +++ lib/lsan/lsan_linux.cc
-@@ -13,7 +13,7 @@
- 
- #include "sanitizer_common/sanitizer_platform.h"
- 
--#if SANITIZER_LINUX
-+#if SANITIZER_LINUX || SANITIZER_NETBSD
- 
- #include "lsan_allocator.h"
- 
 @@ -30,4 +30,4 @@ void ReplaceSystemMalloc() {}
  
  } // namespace __lsan