Module Name: src
Committed By: matt
Date: Tue Nov 20 23:26:55 UTC 2012
Modified Files:
src/tests/crypto/libcrypto/idea [matt-nb6-plus]: Makefile
src/tests/crypto/libcrypto/mdc2 [matt-nb6-plus]: Makefile
src/tests/crypto/libcrypto/rc5 [matt-nb6-plus]: Makefile
src/tests/lib/libcurses/slave [matt-nb6-plus]: Makefile
Log Message:
Conditionalize use of --no-fatal-warnings on ${HAVE_BINUTILS} == "219"
To generate a diff of this commit:
cvs rdiff -u -r1.3.6.1 -r1.3.6.2 src/tests/crypto/libcrypto/idea/Makefile
cvs rdiff -u -r1.3.6.1 -r1.3.6.2 src/tests/crypto/libcrypto/mdc2/Makefile
cvs rdiff -u -r1.3 -r1.3.6.1 src/tests/crypto/libcrypto/rc5/Makefile
cvs rdiff -u -r1.6 -r1.6.6.1 src/tests/lib/libcurses/slave/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/crypto/libcrypto/idea/Makefile
diff -u src/tests/crypto/libcrypto/idea/Makefile:1.3.6.1 src/tests/crypto/libcrypto/idea/Makefile:1.3.6.2
--- src/tests/crypto/libcrypto/idea/Makefile:1.3.6.1 Thu Nov 1 16:45:06 2012
+++ src/tests/crypto/libcrypto/idea/Makefile Tue Nov 20 23:26:54 2012
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3.6.1 2012/11/01 16:45:06 matt Exp $
+# $NetBSD: Makefile,v 1.3.6.2 2012/11/20 23:26:54 matt Exp $
HELPER_NAME= ideatest
HELPER_DIR= idea
@@ -7,4 +7,6 @@ HELPER_DIR= idea
LDADD= -lcrypto
+.if ${HAVE_BINUTILS} == "219"
LDADD+= -Wl,--no-fatal-warnings
+.endif
Index: src/tests/crypto/libcrypto/mdc2/Makefile
diff -u src/tests/crypto/libcrypto/mdc2/Makefile:1.3.6.1 src/tests/crypto/libcrypto/mdc2/Makefile:1.3.6.2
--- src/tests/crypto/libcrypto/mdc2/Makefile:1.3.6.1 Thu Nov 1 16:45:06 2012
+++ src/tests/crypto/libcrypto/mdc2/Makefile Tue Nov 20 23:26:54 2012
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3.6.1 2012/11/01 16:45:06 matt Exp $
+# $NetBSD: Makefile,v 1.3.6.2 2012/11/20 23:26:54 matt Exp $
HELPER_NAME= mdc2test
HELPER_DIR= mdc2
@@ -7,4 +7,6 @@ HELPER_DIR= mdc2
LDADD= -lcrypto
+.if ${HAVE_BINUTILS} == "219"
LDADD+= -Wl,--no-fatal-warnings
+.endif
Index: src/tests/crypto/libcrypto/rc5/Makefile
diff -u src/tests/crypto/libcrypto/rc5/Makefile:1.3 src/tests/crypto/libcrypto/rc5/Makefile:1.3.6.1
--- src/tests/crypto/libcrypto/rc5/Makefile:1.3 Tue Jul 5 10:03:10 2011
+++ src/tests/crypto/libcrypto/rc5/Makefile Tue Nov 20 23:26:54 2012
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2011/07/05 10:03:10 spz Exp $
+# $NetBSD: Makefile,v 1.3.6.1 2012/11/20 23:26:54 matt Exp $
HELPER_NAME= rc5test
HELPER_DIR= rc5
@@ -11,4 +11,6 @@ LDADD= -lcrypto_rc5 -lcrypto
CPPFLAGS+= -DOPENSSL_NO_RC5
.endif
+.if ${HAVE_BINUTILS} == "219"
LDADD+= -Wl,--no-fatal-warnings
+.endif
Index: src/tests/lib/libcurses/slave/Makefile
diff -u src/tests/lib/libcurses/slave/Makefile:1.6 src/tests/lib/libcurses/slave/Makefile:1.6.6.1
--- src/tests/lib/libcurses/slave/Makefile:1.6 Thu Sep 8 18:44:38 2011
+++ src/tests/lib/libcurses/slave/Makefile Tue Nov 20 23:26:54 2012
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2011/09/08 18:44:38 jmmv Exp $
+# $NetBSD: Makefile,v 1.6.6.1 2012/11/20 23:26:54 matt Exp $
#
.include <bsd.own.mk>
@@ -12,7 +12,10 @@ NOMAN= "true"
SRCS= slave.c commands.c curses_commands.c
CPPFLAGS+= -g -I${.CURDIR} -I. -I${.CURDIR}/../director
-LDADD+= -lcurses -lterminfo -Wl,--no-fatal-warnings
+LDADD+= -lcurses -lterminfo
+.if ${HAVE_BINUTILS} == "219"
+LDADD+= -Wl,--no-fatal-warnings
+.endif
COPTS.curses_commands.c += -Wno-format-nonliteral
CWARNFLAGS.clang+= -Wno-format
