diff options
| author | bapt <bapt@FreeBSD.org> | 2014-08-06 22:17:26 +0000 |
|---|---|---|
| committer | bapt <bapt@FreeBSD.org> | 2014-08-06 22:17:26 +0000 |
| commit | 8a9380f42cca5e897a1ccdfa1d7a4d0e624e4864 (patch) | |
| tree | 55e479f80b3d04d5fd6accb8908787cccd17d895 /secure/libexec | |
| parent | 8b0ef17c97fe79b895e87452fef5f810ade727fd (diff) | |
| download | FreeBSD-src-8a9380f42cca5e897a1ccdfa1d7a4d0e624e4864.zip FreeBSD-src-8a9380f42cca5e897a1ccdfa1d7a4d0e624e4864.tar.gz | |
Rework privatelib/internallib
Make sure everything linking to a privatelib and/or an internallib does it directly
from the OBJDIR rather than DESTDIR.
Add src.libnames.mk so bsd.libnames.mk is not polluted by libraries not existsing
in final installation
Introduce the LD* variable which is what ld(1) is expecting (via LDADD) to link to
internal/privatelib
Directly link to the .so in case of private library to avoid having to complexify
LDFLAGS.
Phabric: https://phabric.freebsd.org/D553
Reviewed by: imp, emaste
Diffstat (limited to 'secure/libexec')
| -rw-r--r-- | secure/libexec/sftp-server/Makefile | 2 | ||||
| -rw-r--r-- | secure/libexec/ssh-keysign/Makefile | 2 | ||||
| -rw-r--r-- | secure/libexec/ssh-pkcs11-helper/Makefile | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/secure/libexec/sftp-server/Makefile b/secure/libexec/sftp-server/Makefile index eb788f6..ebddba9 100644 --- a/secure/libexec/sftp-server/Makefile +++ b/secure/libexec/sftp-server/Makefile @@ -13,7 +13,7 @@ SRCS+= roaming_dummy.c .endif DPADD= ${LIBSSH} -LDADD= -lssh +LDADD= ${LDSSH} USEPRIVATELIB= ssh .if ${MK_LDNS} != "no" diff --git a/secure/libexec/ssh-keysign/Makefile b/secure/libexec/ssh-keysign/Makefile index 668ad9e..f248666 100644 --- a/secure/libexec/ssh-keysign/Makefile +++ b/secure/libexec/ssh-keysign/Makefile @@ -9,7 +9,7 @@ CFLAGS+=-I${SSHDIR} -include ssh_namespace.h BINMODE=4555 DPADD= ${LIBSSH} -LDADD= -lssh +LDADD= ${LDSSH} USEPRIVATELIB= ssh .if ${MK_LDNS} != "no" diff --git a/secure/libexec/ssh-pkcs11-helper/Makefile b/secure/libexec/ssh-pkcs11-helper/Makefile index f3cf902..b73416f 100644 --- a/secure/libexec/ssh-pkcs11-helper/Makefile +++ b/secure/libexec/ssh-pkcs11-helper/Makefile @@ -13,7 +13,7 @@ SRCS+= roaming_dummy.c .endif DPADD= ${LIBSSH} -LDADD= -lssh +LDADD= ${LDSSH} USEPRIVATELIB= ssh .if ${MK_LDNS} != "no" |
