Now that cross-tools ld(1) has been fixed to look for dynamic
dependencies in the correct place, record the fact that -lssh depends on -lcrypto and -lz. Removed false dependencies on -lz (except ssh(1) and sshd(8)). Removed false dependencies on -lcrypto and -lutil for scp(1). Reviewed by: markm
This commit is contained in:
parent
aaf89c2c89
commit
e47a40e7f7
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=90405
@ -731,6 +731,7 @@ includes:
|
||||
# librpcsvc libtacplus libutil libz libssh
|
||||
# libradius: libmd
|
||||
# libreadline: libncurses
|
||||
# libssh: libcrypto libz
|
||||
# libstc++: msun
|
||||
# libtacplus: libmd
|
||||
#
|
||||
@ -740,7 +741,7 @@ includes:
|
||||
# kerberosIV/lib kerberos5/lib: lib/libcrypt
|
||||
# lib/libpam: secure/lib/libcrypto kerberosIV/lib/libkrb \
|
||||
# secure/lib/libssh lib/libz
|
||||
# secure/lib: lib/libmd
|
||||
# secure/lib: secure/lib/libcrypto lib/libmd lib/libz
|
||||
#
|
||||
.if exists(${.CURDIR}/lib/csu/${MACHINE_ARCH}.pcc)
|
||||
_csu= lib/csu/${MACHINE_ARCH}.pcc
|
||||
@ -750,8 +751,11 @@ _csu= lib/csu/i386-elf
|
||||
_csu= lib/csu/${MACHINE_ARCH}
|
||||
.endif
|
||||
|
||||
.if !defined(NOSECURE) && !defined(NOCRYPT)
|
||||
.if exists(${.CURDIR}/secure) && !defined(NOCRYPT) && !defined(NOSECURE)
|
||||
_secure_lib= secure/lib
|
||||
.if exists(${.CURDIR}/secure/lib/libcrypto)
|
||||
_libcrypto= secure/lib/libcrypto
|
||||
.endif
|
||||
.endif
|
||||
|
||||
.if !defined(NOCRYPT) && defined(MAKE_KERBEROS4)
|
||||
@ -772,10 +776,10 @@ _libperl= gnu/usr.bin/perl/libperl
|
||||
|
||||
libraries:
|
||||
.for _lib in ${_csu} gnu/lib/csu gnu/lib/libgcc lib/libmd lib/libcrypt \
|
||||
${_secure_lib} ${_kerberosIV_lib} \
|
||||
lib/libz ${_libcrypto} ${_secure_lib} ${_kerberosIV_lib} \
|
||||
${_kerberos5_lib} lib/libcom_err lib/libkvm lib/msun lib/libncurses \
|
||||
lib/libopie lib/libradius lib/librpcsvc lib/libsbuf lib/libtacplus \
|
||||
lib/libutil lib/libz lib gnu/lib ${_libperl} usr.bin/lex/lib ${_libkeycap}
|
||||
lib/libutil lib gnu/lib ${_libperl} usr.bin/lex/lib ${_libkeycap}
|
||||
.if exists(${.CURDIR}/${_lib})
|
||||
cd ${.CURDIR}/${_lib}; \
|
||||
${MAKE} depend; \
|
||||
|
@ -7,8 +7,8 @@ LIB= pam_ssh
|
||||
SHLIB_NAME= pam_ssh.so
|
||||
SRCS= pam_ssh.c
|
||||
CFLAGS+= -I${SSHSRC}
|
||||
DPADD= ${LIBSSH} ${LIBCRYPTO} ${LIBCRYPT} ${LIBUTIL} ${LIBZ}
|
||||
LDADD= -lssh -lcrypto -lcrypt -lutil -lz
|
||||
DPADD= ${LIBSSH} ${LIBCRYPTO} ${LIBCRYPT} ${LIBUTIL}
|
||||
LDADD= -lssh -lcrypto -lcrypt -lutil
|
||||
MAN= pam_ssh.8
|
||||
|
||||
.include <bsd.lib.mk>
|
||||
|
@ -24,6 +24,9 @@ CFLAGS+= -DKRB4
|
||||
CFLAGS+= -DKRB5
|
||||
.endif # MAKE_KERBEROS5
|
||||
|
||||
DPADD= ${LIBCRYPTO} ${LIBZ}
|
||||
LDADD= -lcrypto -lz
|
||||
|
||||
.include <bsd.lib.mk>
|
||||
|
||||
.PATH: ${SSHDIR} ${SSHDIR}/lib
|
||||
|
@ -5,8 +5,8 @@ PROG= sftp-server
|
||||
SRCS= sftp-server.c sftp-common.c
|
||||
MAN= sftp-server.8
|
||||
|
||||
LDADD+= -lssh -lcrypto -lz
|
||||
DPADD+= ${LIBSSH} ${LIBCRYPTO} ${LIBZ}
|
||||
LDADD+= -lssh -lcrypto
|
||||
DPADD+= ${LIBSSH} ${LIBCRYPTO}
|
||||
|
||||
.include <bsd.prog.mk>
|
||||
|
||||
|
@ -4,8 +4,8 @@
|
||||
PROG= scp
|
||||
SRCS= scp.c scp-common.c
|
||||
|
||||
LDADD+= -lssh -lcrypto -lutil -lz
|
||||
DPADD+= ${LIBSSH} ${LIBCRYPTO} ${LIBUTIL} ${LIBZ}
|
||||
DPADD= ${LIBSSH}
|
||||
LDADD= -lssh
|
||||
|
||||
.include <bsd.prog.mk>
|
||||
|
||||
|
@ -4,8 +4,8 @@
|
||||
PROG= sftp
|
||||
SRCS= sftp.c sftp-client.c sftp-int.c sftp-common.c sftp-glob.c scp-common.c
|
||||
|
||||
LDADD+= -lssh -lcrypto -lz
|
||||
DPADD+= ${LIBSSH} ${LIBCRYPTO} ${LIBZ}
|
||||
LDADD= -lssh -lcrypto
|
||||
DPADD= ${LIBSSH} ${LIBCRYPTO}
|
||||
|
||||
.include <bsd.prog.mk>
|
||||
|
||||
|
@ -4,8 +4,8 @@
|
||||
PROG= ssh-add
|
||||
SRCS= ssh-add.c
|
||||
|
||||
LDADD+= -lssh -lcrypto -lz
|
||||
DPADD+= ${LIBSSH} ${LIBCRYPTO} ${LIBZ}
|
||||
LDADD+= -lssh -lcrypto
|
||||
DPADD+= ${LIBSSH} ${LIBCRYPTO}
|
||||
|
||||
.include <bsd.prog.mk>
|
||||
|
||||
|
@ -4,8 +4,8 @@
|
||||
PROG= ssh-agent
|
||||
SRCS= ssh-agent.c
|
||||
|
||||
LDADD+= -lssh -lcrypto -lz
|
||||
DPADD+= ${LIBSSH} ${LIBCRYPTO} ${LIBZ}
|
||||
LDADD+= -lssh -lcrypto
|
||||
DPADD+= ${LIBSSH} ${LIBCRYPTO}
|
||||
|
||||
.include <bsd.prog.mk>
|
||||
|
||||
|
@ -4,8 +4,8 @@
|
||||
PROG= ssh-keygen
|
||||
SRCS= ssh-keygen.c
|
||||
|
||||
LDADD+= -lssh -lcrypto -lz
|
||||
DPADD+= ${LIBSSH} ${LIBCRYPTO} ${LIBZ}
|
||||
LDADD+= -lssh -lcrypto
|
||||
DPADD+= ${LIBSSH} ${LIBCRYPTO}
|
||||
|
||||
.include <bsd.prog.mk>
|
||||
|
||||
|
@ -4,8 +4,8 @@
|
||||
PROG= ssh-keyscan
|
||||
SRCS= ssh-keyscan.c
|
||||
|
||||
LDADD+= -lssh -lcrypto -lz
|
||||
DPADD+= ${LIBSSH} ${LIBCRYPTO} ${LIBZ}
|
||||
LDADD+= -lssh -lcrypto
|
||||
DPADD+= ${LIBSSH} ${LIBCRYPTO}
|
||||
|
||||
.include <bsd.prog.mk>
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user