CVS commit: pkgsrc/lang/compiler-rt

["Jonathan Perkin" <jperkin%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Mon Dec 17 16:19:52 UTC 2018

Modified Files:
        pkgsrc/lang/compiler-rt: Makefile PLIST
Added Files:
        pkgsrc/lang/compiler-rt: PLIST.SunOS

Log Message:
compiler-rt: Fix PLIST on SunOS.


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 pkgsrc/lang/compiler-rt/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/lang/compiler-rt/PLIST
cvs rdiff -u -r0 -r1.1 pkgsrc/lang/compiler-rt/PLIST.SunOS

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

Modified files:

Index: pkgsrc/lang/compiler-rt/Makefile
diff -u pkgsrc/lang/compiler-rt/Makefile:1.5 pkgsrc/lang/compiler-rt/Makefile:1.6
--- pkgsrc/lang/compiler-rt/Makefile:1.5        Sun Dec  9 20:04:40 2018
+++ pkgsrc/lang/compiler-rt/Makefile    Mon Dec 17 16:19:52 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2018/12/09 20:04:40 adam Exp $
+# $NetBSD: Makefile,v 1.6 2018/12/17 16:19:52 jperkin Exp $
 
 DISTNAME=      compiler-rt-7.0.0.src
 PKGNAME=       ${DISTNAME:S/.src//}
@@ -35,6 +35,13 @@ CMAKE_ARGS+= -DLLVM_CONFIG_PATH=${LLVM_C
 CMAKE_ARGS+=   -DCOMPILER_RT_ENABLE_IOS=OFF
 
 PLIST_SUBST+=  COMPILER_RT_OS_DIR=${OS_DIR}
+PLIST_VARS+=   asan
+
+.include "../../mk/bsd.prefs.mk"
+
+.if ${OPSYS} != "SunOS"
+PLIST.asan=    yes
+.endif
 
 TEST_TARGET=   check-compiler-rt
 

Index: pkgsrc/lang/compiler-rt/PLIST
diff -u pkgsrc/lang/compiler-rt/PLIST:1.2 pkgsrc/lang/compiler-rt/PLIST:1.3
--- pkgsrc/lang/compiler-rt/PLIST:1.2   Sun Dec  9 20:04:40 2018
+++ pkgsrc/lang/compiler-rt/PLIST       Mon Dec 17 16:19:52 2018
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2018/12/09 20:04:40 adam Exp $
+@comment $NetBSD: PLIST,v 1.3 2018/12/17 16:19:52 jperkin Exp $
 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
@@ -15,5 +15,5 @@ lib/clang/${PKGVERSION}/include/sanitize
 lib/clang/${PKGVERSION}/include/sanitizer/tsan_interface_atomic.h
 lib/clang/${PKGVERSION}/include/xray/xray_interface.h
 lib/clang/${PKGVERSION}/include/xray/xray_log_interface.h
-lib/clang/${PKGVERSION}/share/asan_blacklist.txt
-lib/clang/${PKGVERSION}/share/cfi_blacklist.txt
+${PLIST.asan}lib/clang/${PKGVERSION}/share/asan_blacklist.txt
+${PLIST.asan}lib/clang/${PKGVERSION}/share/cfi_blacklist.txt

Added files:

Index: pkgsrc/lang/compiler-rt/PLIST.SunOS
diff -u /dev/null pkgsrc/lang/compiler-rt/PLIST.SunOS:1.1
--- /dev/null   Mon Dec 17 16:19:52 2018
+++ pkgsrc/lang/compiler-rt/PLIST.SunOS Mon Dec 17 16:19:52 2018
@@ -0,0 +1,3 @@
+@comment $NetBSD: PLIST.SunOS,v 1.1 2018/12/17 16:19:52 jperkin Exp $
+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