Source-Changes-HG archive

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

[src/trunk]: src/usr.bin/openssl link openssl with -lcrypto_rc5 and/or -lcryp...



details:   https://anonhg.NetBSD.org/src/rev/4428e05b6773
branches:  trunk
changeset: 501837:4428e05b6773
user:      mrg <mrg%NetBSD.org@localhost>
date:      Mon Jan 08 07:49:01 2001 +0000

description:
link openssl with -lcrypto_rc5 and/or -lcrypto_idea (before -lcrypto) if
those ciphers are asked for with MKCRYPTO_RC5/MKCRYPTO_IDEA.  avoids building
rc5/idea support with missing libcrypto support.

diffstat:

 usr.bin/openssl/Makefile |  17 ++++++++++++-----
 1 files changed, 12 insertions(+), 5 deletions(-)

diffs (46 lines):

diff -r 05d94e7b9b38 -r 4428e05b6773 usr.bin/openssl/Makefile
--- a/usr.bin/openssl/Makefile  Mon Jan 08 07:48:59 2001 +0000
+++ b/usr.bin/openssl/Makefile  Mon Jan 08 07:49:01 2001 +0000
@@ -1,9 +1,9 @@
-#      $NetBSD: Makefile,v 1.8 2001/01/08 07:38:00 itojun Exp $
+#      $NetBSD: Makefile,v 1.9 2001/01/08 07:49:01 mrg Exp $
 
 .include <bsd.own.mk>
 
 # RCSid:
-#      $Id: Makefile,v 1.8 2001/01/08 07:38:00 itojun Exp $
+#      $Id: Makefile,v 1.9 2001/01/08 07:49:01 mrg Exp $
 #
 #      @(#) Copyright (c) 1995 Simon J. Gerraty
 #
@@ -30,20 +30,27 @@
        s_client.c s_server.c s_socket.c s_time.c sess_id.c smime.c \
        speed.c spkac.c verify.c version.c x509.c
 
-LDADD+=        -lssl -lcrypto
-DPADD+=        ${LIBSSL} ${LIBCRYPTO}
-
 CPPFLAGS+= -DMONOLITH -DUSE_SSL
 
 # with normal OpenSSL, NO_{RC5,IDEA} changes ABI due to change in struct/union.
 # we nuked all of them in our header files and it is now safe.
 .if ${MKCRYPTO_RC5} == "no"
 CPPFLAGS+= -DNO_RC5
+.else
+LDADD+=        -lcrypto_rc5
+DPADD+=        ${LIBCRYPTO_RC5}
 .endif
 .if ${MKCRYPTO_IDEA} == "no"
 CPPFLAGS+= -DNO_IDEA
+.else
+LDADD+=        -lcrypto_idea
+DPADD+=        ${LIBCRYPTO_IDEA}
 .endif
 
+# this must be _after_ the libcrypto_rc5/libcrypto_idea entries.
+LDADD+=        -lssl -lcrypto
+DPADD+=        ${LIBSSL} ${LIBCRYPTO}
+
 MKMAN= no
 
 CRYPTODIST=    ${.CURDIR}/../../crypto/dist



Home | Main Index | Thread Index | Old Index