diff options
author | Dag-Erling Smørgrav <des@FreeBSD.org> | 2013-09-10 22:26:11 +0000 |
---|---|---|
committer | Dag-Erling Smørgrav <des@FreeBSD.org> | 2013-09-10 22:26:11 +0000 |
commit | 9cfa8b3fee2f79940b0b9e5a4ffbc5f095861529 (patch) | |
tree | ab68ba5a5b6f4e8ee717558d70c0221f0b1ef6dc /Makefile.inc1 | |
parent | 27789e56b28fd6d95ebb2bc7d9436305b193fe40 (diff) | |
download | src-9cfa8b3fee2f79940b0b9e5a4ffbc5f095861529.tar.gz src-9cfa8b3fee2f79940b0b9e5a4ffbc5f095861529.zip |
Clean up the OpenSSH build. It is now possible to build most components
as static binaries, if desired. The one exception is sshd, which runs
into trouble due to libpam.a's includion of pam_ssh.
Make OpenSSH use LDNS if available. This allows it to verify signed
SSHFP records.
Approved by: re (blanket)
Notes
Notes:
svn path=/head/; revision=255460
Diffstat (limited to 'Makefile.inc1')
-rw-r--r-- | Makefile.inc1 | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/Makefile.inc1 b/Makefile.inc1 index bbb9d89b746b..63c24ca0b828 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -1470,8 +1470,8 @@ _prebuild_libs= ${_kerberos5_lib_libasn1} \ ${_cddl_lib_libumem} ${_cddl_lib_libnvpair} \ ${_cddl_lib_libzfs_core} \ lib/libutil ${_lib_libypclnt} lib/libz lib/msun \ - ${_secure_lib_libcrypto} ${_secure_lib_libssh} \ - ${_secure_lib_libssl} + ${_secure_lib_libcrypto} ${_lib_libldns} \ + ${_secure_lib_libssh} ${_secure_lib_libssl} .if ${MK_ATF} != "no" _lib_atf_libatf_c= lib/atf/libatf-c @@ -1507,9 +1507,16 @@ cddl/lib/libzfs_core__L: cddl/lib/libnvpair__L _secure_lib_libcrypto= secure/lib/libcrypto _secure_lib_libssl= secure/lib/libssl lib/libradius__L secure/lib/libssl__L: secure/lib/libcrypto__L +.if ${MK_LDNS} != "no" +_lib_libldns= lib/libldns +lib/libldns__L: secure/lib/libcrypto__L +.endif .if ${MK_OPENSSH} != "no" _secure_lib_libssh= secure/lib/libssh secure/lib/libssh__L: lib/libz__L secure/lib/libcrypto__L lib/libcrypt__L +.if ${MK_LDNS} != "no" +secure/lib/libssh__L: lib/libldns__L +.endif .if ${MK_KERBEROS_SUPPORT} != "no" secure/lib/libssh__L: lib/libgssapi__L kerberos5/lib/libkrb5__L \ kerberos5/lib/libhx509__L kerberos5/lib/libasn1__L lib/libcom_err__L \ |