summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorchristos <christos@NetBSD.org>2005-03-02 01:04:21 +0000
committerchristos <christos@NetBSD.org>2005-03-02 01:04:21 +0000
commit0713fcd14111afececb55d07680d43bfbdb6cdda (patch)
treec52ca3c897a847c3e74111fae5cb5a6d988f4b15
parent038bc7aa3a5a3799bd4cb990ba12592a0fd2fff4 (diff)
Make at least the ELF version work. crypt was broken because it was
compiled against the wrong headers. Now we just depend on libcrypt.
-rw-r--r--lib/libcrypto/Makefile14
1 files changed, 9 insertions, 5 deletions
diff --git a/lib/libcrypto/Makefile b/lib/libcrypto/Makefile
index a75a0675b66..d6a8182bb02 100644
--- a/lib/libcrypto/Makefile
+++ b/lib/libcrypto/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.36 2004/07/02 00:05:23 sjg Exp $
+# $NetBSD: Makefile,v 1.37 2005/03/02 01:04:21 christos Exp $
# RCSid:
# Id: Makefile,v 1.33 1998/11/11 11:53:53 sjg Exp
@@ -35,16 +35,20 @@ CRYPTODIST= ${NETBSDSRCDIR}/crypto/dist
.include "srcs.inc"
-# NetBSD's crypt(3) library, in lieu of the one included with OpenSSL,
-# since NetBSD's also supports MD5, SHA1 and Blowfish passwords.
-.PATH: ${NETBSDSRCDIR}/lib/libcrypt
-SRCS+= crypt.c md5crypt.c bcrypt.c crypt-sha1.c util.c
+LIBDPLIBS= crypt ${.CURDIR}/../libcrypt
+
# XXX
.if ${OBJECT_FMT} == "ELF"
AFLAGS+=-DELF
+LIBDPLIBS= crypt ${.CURDIR}/../libcrypt
.else
AFLAGS+=-DOUT
+# XXX: This is broken because we compile with the wrong des headers.
+# NetBSD's crypt(3) library, in lieu of the one included with OpenSSL,
+# since NetBSD's also supports MD5, SHA1 and Blowfish passwords.
+.PATH: ${NETBSDSRCDIR}/lib/libcrypt
+SRCS+= crypt.c md5crypt.c bcrypt.c crypt-sha1.c util.c
.endif
OS_VERSION!= ${HOST_SH} ${NETBSDSRCDIR}/sys/conf/osrelease.sh