From a73b902f6911c747f2dcdb2be2a337c6dcb7faad Mon Sep 17 00:00:00 2001
From: Philip Guenther <guenther@cvs.openbsd.org>
Date: Mon, 14 Sep 2015 07:19:42 +0000
Subject: Supply DEF_WEAK() macro to suppress warnings during compilation via
 reach-around into libc

noted by daniel@
---
 usr.bin/chpass/Makefile | 5 +++--
 usr.bin/passwd/Makefile | 5 +++--
 2 files changed, 6 insertions(+), 4 deletions(-)

(limited to 'usr.bin')

diff --git a/usr.bin/chpass/Makefile b/usr.bin/chpass/Makefile
index 75c0d7ff1df..59ed17061f8 100644
--- a/usr.bin/chpass/Makefile
+++ b/usr.bin/chpass/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.12 2008/07/04 12:50:23 djm Exp $
+#	$OpenBSD: Makefile,v 1.13 2015/09/14 07:19:41 guenther Exp $
 
 .include <bsd.own.mk>
 
@@ -19,4 +19,5 @@ LDADD+= -lrpcsvc -lutil
 .include <bsd.prog.mk>
 
 getpwent.o: getpwent.c
-	${COMPILE.c} -UYP ${.CURDIR}/../../lib/libc/gen/getpwent.c
+	${COMPILE.c} -UYP -D'DEF_WEAK(x)=asm("")' \
+	    ${.CURDIR}/../../lib/libc/gen/getpwent.c
diff --git a/usr.bin/passwd/Makefile b/usr.bin/passwd/Makefile
index 45d09aab3fe..8f27be6df99 100644
--- a/usr.bin/passwd/Makefile
+++ b/usr.bin/passwd/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.39 2014/11/20 14:53:15 tedu Exp $
+#	$OpenBSD: Makefile,v 1.40 2015/09/14 07:19:41 guenther Exp $
 
 .include <bsd.own.mk>
 
@@ -19,6 +19,7 @@ BINMODE=4555
 BINOWN=root
 
 getpwent.o: getpwent.c
-	${COMPILE.c} -UYP ${.CURDIR}/../../lib/libc/gen/getpwent.c
+	${COMPILE.c} -UYP -D'DEF_WEAK(x)=asm("")' \
+	    ${.CURDIR}/../../lib/libc/gen/getpwent.c
 
 .include <bsd.prog.mk>
-- 
cgit v1.2.3