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 /usr.sbin | |
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 'usr.sbin')
-rw-r--r-- | usr.sbin/pkg/Makefile | 2 | ||||
-rw-r--r-- | usr.sbin/unbound/anchor/Makefile | 2 | ||||
-rw-r--r-- | usr.sbin/unbound/checkconf/Makefile | 2 | ||||
-rw-r--r-- | usr.sbin/unbound/control/Makefile | 2 | ||||
-rw-r--r-- | usr.sbin/unbound/daemon/Makefile | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/usr.sbin/pkg/Makefile b/usr.sbin/pkg/Makefile index 3892ecc5..6a6c1dd 100644 --- a/usr.sbin/pkg/Makefile +++ b/usr.sbin/pkg/Makefile @@ -8,7 +8,7 @@ CFLAGS+=-I${.CURDIR}/../../contrib/libucl/include .PATH: ${.CURDIR}/../../contrib/libucl/include DPADD= ${LIBARCHIVE} ${LIBELF} ${LIBFETCH} ${LIBUCL} ${LIBSBUF} ${LIBSSL} \ ${LIBCRYPTO} ${LIBM} -LDADD= -larchive -lelf -lfetch -lucl -lsbuf -lssl -lcrypto -lm +LDADD= -larchive -lelf -lfetch ${LDUCL} -lsbuf -lssl -lcrypto -lm USEPRIVATELIB= ucl .include <bsd.prog.mk> diff --git a/usr.sbin/unbound/anchor/Makefile b/usr.sbin/unbound/anchor/Makefile index 1404766..970fb70 100644 --- a/usr.sbin/unbound/anchor/Makefile +++ b/usr.sbin/unbound/anchor/Makefile @@ -11,7 +11,7 @@ PROG= unbound-anchor SRCS= unbound-anchor.c CFLAGS= -I${UNBOUNDDIR} -I${LDNSDIR} -I${EXPATDIR}/lib DPADD= ${LIBUNBOUND} ${LIBLDNS} ${LIBUTIL} ${LIBBSDXML} ${LIBSSL} ${LIBCRYPTO} ${LIBPTHREAD} -LDADD= -lunbound -lldns -lutil -lbsdxml -lssl -lcrypto -lpthread +LDADD= ${LDUNBOUND} ${LDLDNS} -lutil -lbsdxml -lssl -lcrypto -lpthread USEPRIVATELIB= ldns MAN= unbound-anchor.8 diff --git a/usr.sbin/unbound/checkconf/Makefile b/usr.sbin/unbound/checkconf/Makefile index 6a58806..0993d3d 100644 --- a/usr.sbin/unbound/checkconf/Makefile +++ b/usr.sbin/unbound/checkconf/Makefile @@ -10,7 +10,7 @@ PROG= unbound-checkconf SRCS= unbound-checkconf.c worker_cb.c CFLAGS= -I${UNBOUNDDIR} -I${LDNSDIR} DPADD= ${LIBUNBOUND} ${LIBLDNS} ${LIBUTIL} ${LIBSSL} ${LIBCRYPTO} ${LIBPTHREAD} -LDADD= -lunbound -lldns -lutil -lssl -lcrypto -lpthread +LDADD= ${LDUNBOUND} ${LDLDNS} -lutil -lssl -lcrypto -lpthread USEPRIVATELIB= ldns MAN= unbound-checkconf.8 diff --git a/usr.sbin/unbound/control/Makefile b/usr.sbin/unbound/control/Makefile index 7056a9e..2989e73 100644 --- a/usr.sbin/unbound/control/Makefile +++ b/usr.sbin/unbound/control/Makefile @@ -11,7 +11,7 @@ SCRIPTS= unbound-control-setup.sh SRCS= unbound-control.c worker_cb.c CFLAGS= -I${UNBOUNDDIR} -I${LDNSDIR} DPADD= ${LIBUNBOUND} ${LIBLDNS} ${LIBUTIL} ${LIBSSL} ${LIBCRYPTO} ${LIBPTHREAD} -LDADD= -lunbound -lldns -lutil -lssl -lcrypto -lpthread +LDADD= ${LDUNBOUND} ${LDLDNS} -lutil -lssl -lcrypto -lpthread USEPRIVATELIB= ldns MAN= unbound-control.8 diff --git a/usr.sbin/unbound/daemon/Makefile b/usr.sbin/unbound/daemon/Makefile index 0f9044f..a8b1bb2 100644 --- a/usr.sbin/unbound/daemon/Makefile +++ b/usr.sbin/unbound/daemon/Makefile @@ -10,7 +10,7 @@ PROG= unbound SRCS= acl_list.c cachedump.c daemon.c remote.c stats.c unbound.c worker.c CFLAGS= -I${UNBOUNDDIR} -I${LDNSDIR} DPADD= ${LIBUNBOUND} ${LIBLDNS} ${LIBUTIL} ${LIBSSL} ${LIBCRYPTO} ${LIBPTHREAD} -LDADD= -lunbound -lldns -lutil -lssl -lcrypto -lpthread +LDADD= ${LDUNBOUND} ${LDLDNS} -lutil -lssl -lcrypto -lpthread USEPRIVATELIB= ldns MAN= unbound.8 unbound.conf.5 |