Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/tests/crypto/libcrypto Force libcrypto to be loaded after li...



details:   https://anonhg.NetBSD.org/src/rev/6c23d3cd1496
branches:  trunk
changeset: 433700:6c23d3cd1496
user:      christos <christos%NetBSD.org@localhost>
date:      Fri Sep 28 23:40:45 2018 +0000

description:
Force libcrypto to be loaded after libcryptotest for the benefit of sun2

diffstat:

 tests/crypto/libcrypto/Makefile.inc |  9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)

diffs (30 lines):

diff -r 8c0e97ee2caf -r 6c23d3cd1496 tests/crypto/libcrypto/Makefile.inc
--- a/tests/crypto/libcrypto/Makefile.inc       Fri Sep 28 21:51:42 2018 +0000
+++ b/tests/crypto/libcrypto/Makefile.inc       Fri Sep 28 23:40:45 2018 +0000
@@ -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 @@
 MAN=           # empty
 BINDIR=                ${TESTSDIR}
 
-DPADD+=                ${LIBCRYPTO} ${LIBCRYPT}
-LDADD+=                -lcrypto -lcrypt
-
 CWARNFLAGS.clang+=     -Wno-format
 
 CPPFLAGS+=     -DOPENSSL_FIPS
@@ -30,6 +27,10 @@
 .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>



Home | Main Index | Thread Index | Old Index