Explicitly add libz and libcrypto to LDADD for any ssh utilities missing
it. While not strictly required, it unbreaks the cross-build world that is resulting from moving the libraries around. I have a more permanent solution to this problem in the works, but I asked des for permission to commit this to get the ball rolling. This also makes the ssh build more along the lines of what the openssh-portable and OpenBSD openssh Makefile glue does. Reviewed by: des
This commit is contained in:
parent
0530edef90
commit
c45db69312
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=119116
@ -5,8 +5,8 @@ SRCS= sftp-common.c sftp-server.c
|
||||
MAN= sftp-server.8
|
||||
CFLAGS+=-I${SSHDIR}
|
||||
|
||||
DPADD+= ${LIBSSH} ${LIBCRYPTO}
|
||||
LDADD+= -lssh -lcrypto
|
||||
DPADD+= ${LIBSSH} ${LIBCRYPTO} ${LIBZ}
|
||||
LDADD+= -lssh -lcrypto -lz
|
||||
|
||||
.include <bsd.prog.mk>
|
||||
|
||||
|
@ -3,8 +3,8 @@
|
||||
PROG= scp
|
||||
CFLAGS+=-I${SSHDIR}
|
||||
|
||||
DPADD= ${LIBSSH}
|
||||
LDADD= -lssh
|
||||
DPADD= ${LIBSSH} ${LIBCRYPTO} ${LIBZ}
|
||||
LDADD= -lssh -lcrypto -lz
|
||||
|
||||
.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
|
||||
CFLAGS+=-I${SSHDIR}
|
||||
|
||||
DPADD= ${LIBSSH} ${LIBCRYPTO}
|
||||
LDADD= -lssh -lcrypto
|
||||
DPADD= ${LIBSSH} ${LIBCRYPTO} ${LIBZ}
|
||||
LDADD= -lssh -lcrypto -lz
|
||||
|
||||
.include <bsd.prog.mk>
|
||||
|
||||
|
@ -3,8 +3,8 @@
|
||||
PROG= ssh-add
|
||||
CFLAGS+=-I${SSHDIR}
|
||||
|
||||
DPADD= ${LIBSSH} ${LIBCRYPTO}
|
||||
LDADD= -lssh -lcrypto
|
||||
DPADD= ${LIBSSH} ${LIBCRYPTO} ${LIBZ}
|
||||
LDADD= -lssh -lcrypto -lz
|
||||
|
||||
.include <bsd.prog.mk>
|
||||
|
||||
|
@ -3,8 +3,8 @@
|
||||
PROG= ssh-agent
|
||||
CFLAGS+=-I${SSHDIR}
|
||||
|
||||
DPADD= ${LIBSSH} ${LIBCRYPTO}
|
||||
LDADD= -lssh -lcrypto
|
||||
DPADD= ${LIBSSH} ${LIBCRYPTO} ${LIBZ}
|
||||
LDADD= -lssh -lcrypto -lz
|
||||
|
||||
.include <bsd.prog.mk>
|
||||
|
||||
|
@ -3,8 +3,8 @@
|
||||
PROG= ssh-keygen
|
||||
CFLAGS+=-I${SSHDIR}
|
||||
|
||||
DPADD= ${LIBSSH} ${LIBCRYPTO}
|
||||
LDADD= -lssh -lcrypto
|
||||
DPADD= ${LIBSSH} ${LIBCRYPTO} ${LIBZ}
|
||||
LDADD= -lssh -lcrypto -lz
|
||||
|
||||
.include <bsd.prog.mk>
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user