CVS commit: src/external/cddl/osnet/usr.bin/ctfmerge

2020-06-07 Thread Santhosh Raju
Module Name:src
Committed By:   fox
Date:   Sun Jun  7 23:26:54 UTC 2020

Modified Files:
src/external/cddl/osnet/usr.bin/ctfmerge: Makefile

Log Message:
external/cddl/osnet: Suppress -Werror=stringop-truncation error

This logic correctly uses strncpy(3) to fully initialize a fixed-width field, 
and also ensures
NUL-termination on the next line as other users of the field expect.

Add -Werror=stringop-truncation to prevent build failure, when run with 
MKSANITIZER=yes.

Error was reported when build.sh was run with MKSANITIZER=yes flag.

Reviewed by: kamil@


To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/external/cddl/osnet/usr.bin/ctfmerge/Makefile

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

Modified files:

Index: src/external/cddl/osnet/usr.bin/ctfmerge/Makefile
diff -u src/external/cddl/osnet/usr.bin/ctfmerge/Makefile:1.10 src/external/cddl/osnet/usr.bin/ctfmerge/Makefile:1.11
--- src/external/cddl/osnet/usr.bin/ctfmerge/Makefile:1.10	Mon May 28 21:05:11 2018
+++ src/external/cddl/osnet/usr.bin/ctfmerge/Makefile	Sun Jun  7 23:26:54 2020
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.10 2018/05/28 21:05:11 chs Exp $
+#	$NetBSD: Makefile,v 1.11 2020/06/07 23:26:54 fox Exp $
 
 # $FreeBSD: head/cddl/usr.bin/ctfmerge/Makefile 314654 2017-03-04 11:30:04Z ngie $
 
@@ -36,4 +36,6 @@ LDADD+=-lpthread
 DPADD+=${LIBPTHREAD}
 .endif
 
+COPTS.ctfmerge.c+=	${GCC_NO_STRINGOP_TRUNCATION}
+
 .include 



CVS commit: src/external/cddl/osnet/usr.bin/ctfmerge

2016-02-04 Thread Roy Marples
Module Name:src
Committed By:   roy
Date:   Thu Feb  4 17:47:17 UTC 2016

Modified Files:
src/external/cddl/osnet/usr.bin/ctfmerge: Makefile

Log Message:
Disable -Wformat-nonliteral here to build.


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/external/cddl/osnet/usr.bin/ctfmerge/Makefile

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

Modified files:

Index: src/external/cddl/osnet/usr.bin/ctfmerge/Makefile
diff -u src/external/cddl/osnet/usr.bin/ctfmerge/Makefile:1.8 src/external/cddl/osnet/usr.bin/ctfmerge/Makefile:1.9
--- src/external/cddl/osnet/usr.bin/ctfmerge/Makefile:1.8	Wed Jan 27 18:43:25 2016
+++ src/external/cddl/osnet/usr.bin/ctfmerge/Makefile	Thu Feb  4 17:47:17 2016
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.8 2016/01/27 18:43:25 christos Exp $
+#	$NetBSD: Makefile,v 1.9 2016/02/04 17:47:17 roy Exp $
 
 # $FreeBSD: src/cddl/usr.bin/ctfmerge/Makefile,v 1.1.4.1 2009/08/03 08:13:06 kensmith Exp $
 
@@ -29,6 +29,8 @@ SRCS=		alist.c \
 		traverse.c \
 		util.c
 
+COPTS.util.c +=		-Wno-format-nonliteral
+
 .if (${HOSTPROG:U} == "")
 LDADD+=-lpthread
 DPADD+=${LIBPTHREAD}



CVS commit: src/external/cddl/osnet/usr.bin/ctfmerge

2016-01-27 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Wed Jan 27 18:43:26 UTC 2016

Modified Files:
src/external/cddl/osnet/usr.bin/ctfmerge: Makefile

Log Message:
don't link/depend on libpthread if we are a hostprog.
XXX: should be using -pthread instead?


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/external/cddl/osnet/usr.bin/ctfmerge/Makefile

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

Modified files:

Index: src/external/cddl/osnet/usr.bin/ctfmerge/Makefile
diff -u src/external/cddl/osnet/usr.bin/ctfmerge/Makefile:1.7 src/external/cddl/osnet/usr.bin/ctfmerge/Makefile:1.8
--- src/external/cddl/osnet/usr.bin/ctfmerge/Makefile:1.7	Tue Sep 29 16:31:43 2015
+++ src/external/cddl/osnet/usr.bin/ctfmerge/Makefile	Wed Jan 27 13:43:25 2016
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.7 2015/09/29 20:31:43 christos Exp $
+#	$NetBSD: Makefile,v 1.8 2016/01/27 18:43:25 christos Exp $
 
 # $FreeBSD: src/cddl/usr.bin/ctfmerge/Makefile,v 1.1.4.1 2009/08/03 08:13:06 kensmith Exp $
 
@@ -28,7 +28,10 @@ SRCS=		alist.c \
 		tdata.c \
 		traverse.c \
 		util.c
+
+.if (${HOSTPROG:U} == "")
 LDADD+=-lpthread
 DPADD+=${LIBPTHREAD}
+.endif
 
 .include 



CVS commit: src/external/cddl/osnet/usr.bin/ctfmerge

2015-09-29 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Tue Sep 29 20:31:43 UTC 2015

Modified Files:
src/external/cddl/osnet/usr.bin/ctfmerge: Makefile

Log Message:
no other ctf program needs -lrt, why does this one?


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/external/cddl/osnet/usr.bin/ctfmerge/Makefile

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

Modified files:

Index: src/external/cddl/osnet/usr.bin/ctfmerge/Makefile
diff -u src/external/cddl/osnet/usr.bin/ctfmerge/Makefile:1.6 src/external/cddl/osnet/usr.bin/ctfmerge/Makefile:1.7
--- src/external/cddl/osnet/usr.bin/ctfmerge/Makefile:1.6	Sun Mar  9 18:01:31 2014
+++ src/external/cddl/osnet/usr.bin/ctfmerge/Makefile	Tue Sep 29 16:31:43 2015
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.6 2014/03/09 22:01:31 christos Exp $
+#	$NetBSD: Makefile,v 1.7 2015/09/29 20:31:43 christos Exp $
 
 # $FreeBSD: src/cddl/usr.bin/ctfmerge/Makefile,v 1.1.4.1 2009/08/03 08:13:06 kensmith Exp $
 
@@ -28,8 +28,7 @@ SRCS=		alist.c \
 		tdata.c \
 		traverse.c \
 		util.c
-
-LDADD+=-lrt -lpthread
-DPADD+=${LIBRT} ${LIBPTHREAD}
+LDADD+=-lpthread
+DPADD+=${LIBPTHREAD}
 
 .include