Module Name: src
Committed By: kamil
Date: Sat Feb 8 00:11:18 UTC 2020
Modified Files:
src/external/bsd/fetch/lib: Makefile
src/external/gpl2/lvm2: lvm2tools.mk
src/tests/lib/libc/net: Makefile
Log Message:
Expand the -Wno-macro-redefined usage to MKLIBCSANITIZER
_REENTRANT can be redefined and this is considered as an error.
To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/external/bsd/fetch/lib/Makefile
cvs rdiff -u -r1.5 -r1.6 src/external/gpl2/lvm2/lvm2tools.mk
cvs rdiff -u -r1.12 -r1.13 src/tests/lib/libc/net/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/bsd/fetch/lib/Makefile
diff -u src/external/bsd/fetch/lib/Makefile:1.15 src/external/bsd/fetch/lib/Makefile:1.16
--- src/external/bsd/fetch/lib/Makefile:1.15 Sun Oct 13 07:28:05 2019
+++ src/external/bsd/fetch/lib/Makefile Sat Feb 8 00:11:18 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2019/10/13 07:28:05 mrg Exp $
+# $NetBSD: Makefile,v 1.16 2020/02/08 00:11:18 kamil Exp $
LIB= fetch
SRCS= fetch.c common.c ftp.c http.c file.c
@@ -32,7 +32,7 @@ httperr.h: ${LIBFETCHDIR}/http.errors ${
${HOST_SH} ${LIBFETCHDIR}/errlist.sh http_errlist HTTP \
${LIBFETCHDIR}/http.errors > ${.TARGET}
-.if ${MKSANITIZER:Uno} == "yes"
+.if ${MKSANITIZER:Uno} == "yes" || ${MKLIBCSANITIZER:Uno} == "yes"
CFLAGS+= -Wno-macro-redefined # _REENTRANT redefined
.endif
Index: src/external/gpl2/lvm2/lvm2tools.mk
diff -u src/external/gpl2/lvm2/lvm2tools.mk:1.5 src/external/gpl2/lvm2/lvm2tools.mk:1.6
--- src/external/gpl2/lvm2/lvm2tools.mk:1.5 Tue Aug 27 22:48:53 2019
+++ src/external/gpl2/lvm2/lvm2tools.mk Sat Feb 8 00:11:18 2020
@@ -1,4 +1,4 @@
-# $NetBSD: lvm2tools.mk,v 1.5 2019/08/27 22:48:53 kamil Exp $
+# $NetBSD: lvm2tools.mk,v 1.6 2020/02/08 00:11:18 kamil Exp $
.include <bsd.own.mk>
@@ -25,6 +25,6 @@ CPPFLAGS+=-DDM_DEVICE_UID=0 -DDM_DEVICE_
#
#LVM2.liblvm= ${LVM2OBJDIR.liblvm}/liblvm.a
-.if ${MKSANITIZER:Uno} == "yes"
+.if ${MKSANITIZER:Uno} == "yes" || ${MKLIBCSANITIZER:Uno} == "yes"
CFLAGS+= -Wno-macro-redefined # _REENTRANT redefined in lib.h
.endif
Index: src/tests/lib/libc/net/Makefile
diff -u src/tests/lib/libc/net/Makefile:1.12 src/tests/lib/libc/net/Makefile:1.13
--- src/tests/lib/libc/net/Makefile:1.12 Tue Aug 27 22:48:53 2019
+++ src/tests/lib/libc/net/Makefile Sat Feb 8 00:11:18 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2019/08/27 22:48:53 kamil Exp $
+# $NetBSD: Makefile,v 1.13 2020/02/08 00:11:18 kamil Exp $
.include <bsd.own.mk>
@@ -41,7 +41,7 @@ LDADD.h_nsd_recurse+= -lpthread
CLEANFILES+= aton_ether_subr.c
-.if ${MKSANITIZER:Uno} == "yes"
+.if ${MKSANITIZER:Uno} == "yes" || ${MKLIBCSANITIZER:Uno} == "yes"
COPTS.h_nsd_recurse.c+= -Wno-macro-redefined # _REENTRANT redefined
.endif
