Module Name: src
Committed By: christos
Date: Fri Sep 28 23:40:45 UTC 2018
Modified Files:
src/tests/crypto/libcrypto: Makefile.inc
Log Message:
Force libcrypto to be loaded after libcryptotest for the benefit of sun2
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/tests/crypto/libcrypto/Makefile.inc
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/Makefile.inc
diff -u src/tests/crypto/libcrypto/Makefile.inc:1.9 src/tests/crypto/libcrypto/Makefile.inc:1.10
--- src/tests/crypto/libcrypto/Makefile.inc:1.9 Sun Sep 23 09:34:57 2018
+++ src/tests/crypto/libcrypto/Makefile.inc Fri Sep 28 19:40:45 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.9 2018/09/23 13:34:57 christos Exp $
+# $NetBSD: Makefile.inc,v 1.10 2018/09/28 23:40:45 christos Exp $
.include <bsd.own.mk>
.include "../Makefile.inc"
@@ -13,9 +13,6 @@ SRCS= ${HELPER_SRCS}
MAN= # empty
BINDIR= ${TESTSDIR}
-DPADD+= ${LIBCRYPTO} ${LIBCRYPT}
-LDADD+= -lcrypto -lcrypt
-
CWARNFLAGS.clang+= -Wno-format
CPPFLAGS+= -DOPENSSL_FIPS
@@ -30,6 +27,10 @@ CRYPTODIST= ${NETBSDSRCDIR}/crypto
.PATH: ${OPENSSLSRC}/crypto/${HELPER_DIR}
.endif
PROGDPLIBS+= cryptotest ${OPENSSLSRC}/../lib/libcryptotest
+PROGDPLIBS+= crypto ${OPENSSLSRC}/../lib/libcrypto
+DPADD+= ${LIBCRYPT}
+LDADD+= -lcrypt
+
.include <bsd.test.mk>
.include <bsd.prog.mk>
