tech-pkg archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

Re: netbsd 9/amd64 is looking pretty good!



On 23/09/2020 14:38, Greg Troxel wrote:
 From a bulk report just posted by Makoto, only 304 packages are failing
(and not marked BROKEN). [...]

I have a partial fix for building lang/compiler-rt on netbsd-9/amd64. (attached)

I am still having trouble merging the PLIST. (result of "make print-PLIST" attached)

Any hints?
Should I commit the build fix even though the PLIST is still wrong?

Cheers & HTH,
--
khorben
Index: distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/lang/compiler-rt/distinfo,v
retrieving revision 1.9
diff -p -u -r1.9 distinfo
--- distinfo	26 Jul 2020 19:20:13 -0000	1.9
+++ distinfo	25 Sep 2020 18:31:53 -0000
@@ -5,5 +5,5 @@ RMD160 (compiler-rt-10.0.1.src.tar.xz) =
 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) = 313d453302efa05db50cd6a34dec05f4d75a668f
+SHA1 (patch-lib_sanitizer__common_sanitizer__linux__libcdep.cpp) = f812d5a5f6870e1ed2fe31d0bca1f79d8c16fa9a
 SHA1 (patch-lib_sanitizer__common_sanitizer__platform__limits__netbsd.cpp) = 53c60eb4a1e7be5a60c7b4fff2d245daef54653d
Index: patches/patch-lib_sanitizer__common_sanitizer__linux__libcdep.cpp
===================================================================
RCS file: /cvsroot/pkgsrc/lang/compiler-rt/patches/patch-lib_sanitizer__common_sanitizer__linux__libcdep.cpp,v
retrieving revision 1.1
diff -p -u -r1.1 patch-lib_sanitizer__common_sanitizer__linux__libcdep.cpp
--- patches/patch-lib_sanitizer__common_sanitizer__linux__libcdep.cpp	18 Apr 2020 08:03:53 -0000	1.1
+++ patches/patch-lib_sanitizer__common_sanitizer__linux__libcdep.cpp	25 Sep 2020 18:31:53 -0000
@@ -2,7 +2,7 @@ $NetBSD: patch-lib_sanitizer__common_san
 
 Fix building on NetBSD.
 
---- lib/sanitizer_common/sanitizer_linux_libcdep.cpp.orig	2018-10-07 10:50:07.000000000 +0000
+--- 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
@@ -11,7 +11,8 @@ Fix building on NetBSD.
 -#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 && __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))
@comment $NetBSD$
lib/clang/${PKGVERSION}/include/fuzzer/FuzzedDataProvider.h
lib/clang/${PKGVERSION}/include/profile/InstrProfData.inc
lib/clang/${PKGVERSION}/include/sanitizer/allocator_interface.h
lib/clang/${PKGVERSION}/include/sanitizer/asan_interface.h
lib/clang/${PKGVERSION}/include/sanitizer/common_interface_defs.h
lib/clang/${PKGVERSION}/include/sanitizer/coverage_interface.h
lib/clang/${PKGVERSION}/include/sanitizer/dfsan_interface.h
lib/clang/${PKGVERSION}/include/sanitizer/hwasan_interface.h
lib/clang/${PKGVERSION}/include/sanitizer/linux_syscall_hooks.h
lib/clang/${PKGVERSION}/include/sanitizer/lsan_interface.h
lib/clang/${PKGVERSION}/include/sanitizer/msan_interface.h
lib/clang/${PKGVERSION}/include/sanitizer/netbsd_syscall_hooks.h
lib/clang/${PKGVERSION}/include/sanitizer/scudo_interface.h
lib/clang/${PKGVERSION}/include/sanitizer/tsan_interface.h
lib/clang/${PKGVERSION}/include/sanitizer/tsan_interface_atomic.h
lib/clang/${PKGVERSION}/include/sanitizer/ubsan_interface.h
lib/clang/${PKGVERSION}/include/xray/xray_interface.h
lib/clang/${PKGVERSION}/include/xray/xray_log_interface.h
lib/clang/${PKGVERSION}/include/xray/xray_records.h
lib/clang/${PKGVERSION}/lib/netbsd/libclang_rt.asan-i386.a
lib/clang/${PKGVERSION}/lib/netbsd/libclang_rt.asan-i386.so
lib/clang/${PKGVERSION}/lib/netbsd/libclang_rt.asan-preinit-i386.a
lib/clang/${PKGVERSION}/lib/netbsd/libclang_rt.asan-preinit-x86_64.a
lib/clang/${PKGVERSION}/lib/netbsd/libclang_rt.asan-x86_64.a
lib/clang/${PKGVERSION}/lib/netbsd/libclang_rt.asan-x86_64.a.syms
lib/clang/${PKGVERSION}/lib/netbsd/libclang_rt.asan-x86_64.so
lib/clang/${PKGVERSION}/lib/netbsd/libclang_rt.asan_cxx-i386.a
lib/clang/${PKGVERSION}/lib/netbsd/libclang_rt.asan_cxx-x86_64.a
lib/clang/${PKGVERSION}/lib/netbsd/libclang_rt.asan_cxx-x86_64.a.syms
lib/clang/${PKGVERSION}/lib/netbsd/libclang_rt.builtins-i386.a
lib/clang/${PKGVERSION}/lib/netbsd/libclang_rt.builtins-x86_64.a
lib/clang/${PKGVERSION}/lib/netbsd/libclang_rt.cfi-i386.a
lib/clang/${PKGVERSION}/lib/netbsd/libclang_rt.cfi-x86_64.a
lib/clang/${PKGVERSION}/lib/netbsd/libclang_rt.cfi_diag-i386.a
lib/clang/${PKGVERSION}/lib/netbsd/libclang_rt.cfi_diag-x86_64.a
lib/clang/${PKGVERSION}/lib/netbsd/libclang_rt.dd-x86_64.a
lib/clang/${PKGVERSION}/lib/netbsd/libclang_rt.dyndd-x86_64.so
lib/clang/${PKGVERSION}/lib/netbsd/libclang_rt.fuzzer-x86_64.a
lib/clang/${PKGVERSION}/lib/netbsd/libclang_rt.fuzzer_no_main-x86_64.a
lib/clang/${PKGVERSION}/lib/netbsd/libclang_rt.lsan-i386.a
lib/clang/${PKGVERSION}/lib/netbsd/libclang_rt.lsan-x86_64.a
lib/clang/${PKGVERSION}/lib/netbsd/libclang_rt.msan-x86_64.a
lib/clang/${PKGVERSION}/lib/netbsd/libclang_rt.msan-x86_64.a.syms
lib/clang/${PKGVERSION}/lib/netbsd/libclang_rt.msan_cxx-x86_64.a
lib/clang/${PKGVERSION}/lib/netbsd/libclang_rt.msan_cxx-x86_64.a.syms
lib/clang/${PKGVERSION}/lib/netbsd/libclang_rt.profile-i386.a
lib/clang/${PKGVERSION}/lib/netbsd/libclang_rt.profile-x86_64.a
lib/clang/${PKGVERSION}/lib/netbsd/libclang_rt.safestack-i386.a
lib/clang/${PKGVERSION}/lib/netbsd/libclang_rt.safestack-x86_64.a
lib/clang/${PKGVERSION}/lib/netbsd/libclang_rt.stats-i386.a
lib/clang/${PKGVERSION}/lib/netbsd/libclang_rt.stats-x86_64.a
lib/clang/${PKGVERSION}/lib/netbsd/libclang_rt.stats_client-i386.a
lib/clang/${PKGVERSION}/lib/netbsd/libclang_rt.stats_client-x86_64.a
lib/clang/${PKGVERSION}/lib/netbsd/libclang_rt.tsan-x86_64.a
lib/clang/${PKGVERSION}/lib/netbsd/libclang_rt.tsan-x86_64.a.syms
lib/clang/${PKGVERSION}/lib/netbsd/libclang_rt.tsan_cxx-x86_64.a
lib/clang/${PKGVERSION}/lib/netbsd/libclang_rt.tsan_cxx-x86_64.a.syms
lib/clang/${PKGVERSION}/lib/netbsd/libclang_rt.ubsan_minimal-i386.a
lib/clang/${PKGVERSION}/lib/netbsd/libclang_rt.ubsan_minimal-i386.so
lib/clang/${PKGVERSION}/lib/netbsd/libclang_rt.ubsan_minimal-x86_64.a
lib/clang/${PKGVERSION}/lib/netbsd/libclang_rt.ubsan_minimal-x86_64.a.syms
lib/clang/${PKGVERSION}/lib/netbsd/libclang_rt.ubsan_minimal-x86_64.so
lib/clang/${PKGVERSION}/lib/netbsd/libclang_rt.ubsan_standalone-i386.a
lib/clang/${PKGVERSION}/lib/netbsd/libclang_rt.ubsan_standalone-i386.so
lib/clang/${PKGVERSION}/lib/netbsd/libclang_rt.ubsan_standalone-x86_64.a
lib/clang/${PKGVERSION}/lib/netbsd/libclang_rt.ubsan_standalone-x86_64.a.syms
lib/clang/${PKGVERSION}/lib/netbsd/libclang_rt.ubsan_standalone-x86_64.so
lib/clang/${PKGVERSION}/lib/netbsd/libclang_rt.ubsan_standalone_cxx-i386.a
lib/clang/${PKGVERSION}/lib/netbsd/libclang_rt.ubsan_standalone_cxx-x86_64.a
lib/clang/${PKGVERSION}/lib/netbsd/libclang_rt.ubsan_standalone_cxx-x86_64.a.syms
lib/clang/${PKGVERSION}/lib/netbsd/libclang_rt.xray-basic-x86_64.a
lib/clang/${PKGVERSION}/lib/netbsd/libclang_rt.xray-fdr-x86_64.a
lib/clang/${PKGVERSION}/lib/netbsd/libclang_rt.xray-profiling-x86_64.a
lib/clang/${PKGVERSION}/lib/netbsd/libclang_rt.xray-x86_64.a
lib/clang/${PKGVERSION}/share/asan_blacklist.txt
lib/clang/${PKGVERSION}/share/cfi_blacklist.txt
lib/clang/${PKGVERSION}/share/msan_blacklist.txt


Home | Main Index | Thread Index | Old Index