From 8a9380f42cca5e897a1ccdfa1d7a4d0e624e4864 Mon Sep 17 00:00:00 2001 From: bapt Date: Wed, 6 Aug 2014 22:17:26 +0000 Subject: 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 --- ObsoleteFiles.inc | 25 +++++++++++++++++ gnu/usr.bin/gdb/Makefile.inc | 1 - gnu/usr.bin/gdb/gdb/Makefile | 2 +- gnu/usr.bin/gdb/gdbtui/Makefile | 2 +- gnu/usr.bin/gdb/kgdb/Makefile | 2 +- kerberos5/lib/libkrb5/Makefile | 2 +- kerberos5/libexec/digest-service/Makefile | 2 +- kerberos5/libexec/kcm/Makefile | 2 +- lib/libpam/modules/pam_ssh/Makefile | 2 +- libexec/atf/atf-check/Makefile | 4 +-- libexec/atf/atf-sh/Makefile | 2 +- secure/lib/libssh/Makefile | 2 +- secure/libexec/sftp-server/Makefile | 2 +- secure/libexec/ssh-keysign/Makefile | 2 +- secure/libexec/ssh-pkcs11-helper/Makefile | 2 +- secure/usr.bin/scp/Makefile | 2 +- secure/usr.bin/sftp/Makefile | 2 +- secure/usr.bin/ssh-add/Makefile | 2 +- secure/usr.bin/ssh-agent/Makefile | 2 +- secure/usr.bin/ssh-keygen/Makefile | 4 +-- secure/usr.bin/ssh-keyscan/Makefile | 2 +- secure/usr.bin/ssh/Makefile | 4 +-- secure/usr.sbin/sshd/Makefile | 4 +-- share/mk/atf.test.mk | 4 +-- share/mk/bsd.lib.mk | 10 +++---- share/mk/bsd.libnames.mk | 10 ++----- share/mk/src.libnames.mk | 46 +++++++++++++++++++++++++++++++ usr.bin/drill/Makefile | 2 +- usr.bin/host/Makefile | 2 +- usr.sbin/pkg/Makefile | 2 +- usr.sbin/unbound/anchor/Makefile | 2 +- usr.sbin/unbound/checkconf/Makefile | 2 +- usr.sbin/unbound/control/Makefile | 2 +- usr.sbin/unbound/daemon/Makefile | 2 +- 34 files changed, 111 insertions(+), 49 deletions(-) create mode 100644 share/mk/src.libnames.mk diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc index 5c3cec2..14ae586 100644 --- a/ObsoleteFiles.inc +++ b/ObsoleteFiles.inc @@ -38,6 +38,31 @@ # xargs -n1 | sort | uniq -d; # done +# 20140807: Remove private lib files that should not be installed. +OLD_FILES+=usr/lib/private/libatf-c.a +OLD_FILES+=usr/lib/private/libatf-c.so +OLD_FILES+=usr/lib/private/libatf-c_p.a +OLD_FILES+=usr/lib/private/libatf-c++.a +OLD_FILES+=usr/lib/private/libatf-c++.so +OLD_FILES+=usr/lib/private/libatf-c++_p.a +OLD_FILES+=usr/lib/private/libheimipcc.a +OLD_FILES+=usr/lib/private/libheimipcc.so +OLD_FILES+=usr/lib/private/libheimipcc_p.a +OLD_FILES+=usr/lib/private/libheimipcs.a +OLD_FILES+=usr/lib/private/libheimipcs.so +OLD_FILES+=usr/lib/private/libheimipcs_p.a +OLD_FILES+=usr/lib/private/libldns.a +OLD_FILES+=usr/lib/private/libldns.so +OLD_FILES+=usr/lib/private/libldns_p.a +OLD_FILES+=usr/lib/private/libssh.a +OLD_FILES+=usr/lib/private/libssh.so +OLD_FILES+=usr/lib/private/libssh.p.a +OLD_FILES+=usr/lib/private/libunbound.a +OLD_FILES+=usr/lib/private/libunbound.so +OLD_FILES+=usr/lib/private/libunbound_p.a +OLD_FILES+=usr/lib/private/libucl.a +OLD_FILES+=usr/lib/private/libucl.so +OLD_FILES+=usr/lib/private/libucl_p.a # 20140803: Remove an obsolete man page OLD_FILES+=usr/share/man/man9/pmap_change_wiring.9.gz # 20140728: libsbuf restored to old version. diff --git a/gnu/usr.bin/gdb/Makefile.inc b/gnu/usr.bin/gdb/Makefile.inc index 4912e0c6..c5057ca 100644 --- a/gnu/usr.bin/gdb/Makefile.inc +++ b/gnu/usr.bin/gdb/Makefile.inc @@ -16,7 +16,6 @@ OBJ_ROOT= ${.OBJDIR}/../.. OBJ_BU= ${OBJ_ROOT}/binutils OBJ_GDB= ${OBJ_ROOT}/gdb OBJ_RL= ${OBJ_ROOT}/../lib/libreadline/readline -LIBREADLINE= ${OBJ_ROOT}/../lib/libreadline/readline/libreadline.a # These assignments duplicate much of the functionality of # MACHINE_CPUARCH, but there's no easy way to export make functions... diff --git a/gnu/usr.bin/gdb/gdb/Makefile b/gnu/usr.bin/gdb/gdb/Makefile index 9da4da1..cf23804 100644 --- a/gnu/usr.bin/gdb/gdb/Makefile +++ b/gnu/usr.bin/gdb/gdb/Makefile @@ -12,7 +12,7 @@ GDBLIBS= ${OBJ_GDB}/libgdb/libgdb.a LDFLAGS+= -Wl,-E DPADD= ${GDBLIBS} ${BULIBS} ${LIBM} ${LIBREADLINE} ${LIBTERMCAPW} ${LIBGNUREGEX} -LDADD= ${GDBLIBS} ${BULIBS} -lm ${LIBREADLINE} -ltermcapw -lgnuregex +LDADD= ${GDBLIBS} ${BULIBS} -lm ${LDREADLINE} -ltermcapw -lgnuregex NO_PIE= yes diff --git a/gnu/usr.bin/gdb/gdbtui/Makefile b/gnu/usr.bin/gdb/gdbtui/Makefile index 8369b7f..1670173 100644 --- a/gnu/usr.bin/gdb/gdbtui/Makefile +++ b/gnu/usr.bin/gdb/gdbtui/Makefile @@ -13,7 +13,7 @@ GDBLIBS= ${OBJ_GDB}/libgdb/libgdb.a LDFLAGS+= -Wl,-E DPADD= ${GDBLIBS} ${BULIBS} ${LIBM} ${LIBREADLINE} ${LIBTERMCAPW} ${LIBGNUREGEX} -LDADD= ${GDBLIBS} ${BULIBS} -lm ${LIBREADLINE} -ltermcapw -lgnuregex +LDADD= ${GDBLIBS} ${BULIBS} -lm ${LDREADLINE} -ltermcapw -lgnuregex NO_PIE= yes diff --git a/gnu/usr.bin/gdb/kgdb/Makefile b/gnu/usr.bin/gdb/kgdb/Makefile index bbc886b..076b7cd 100644 --- a/gnu/usr.bin/gdb/kgdb/Makefile +++ b/gnu/usr.bin/gdb/kgdb/Makefile @@ -10,7 +10,7 @@ GDBLIBS= ${OBJ_GDB}/libgdb/libgdb.a DPADD= ${GDBLIBS} ${BULIBS} ${LIBKVM} ${LIBM} ${LIBREADLINE} ${LIBTERMCAPW} \ ${LIBGNUREGEX} -LDADD= ${GDBLIBS} ${BULIBS} -lkvm${GDB_SUFFIX} -lm ${LIBREADLINE} -ltermcapw \ +LDADD= ${GDBLIBS} ${BULIBS} -lkvm${GDB_SUFFIX} -lm ${LDREADLINE} -ltermcapw \ -lgnuregex .if defined(GDB_CROSS_DEBUGGER) diff --git a/kerberos5/lib/libkrb5/Makefile b/kerberos5/lib/libkrb5/Makefile index b30ec75..4128762 100644 --- a/kerberos5/lib/libkrb5/Makefile +++ b/kerberos5/lib/libkrb5/Makefile @@ -3,7 +3,7 @@ LIB= krb5 LDFLAGS= -Wl,--no-undefined VERSION_MAP= ${KRB5DIR}/lib/krb5/version-script.map -LDADD= -lasn1 -lcom_err -lcrypt -lcrypto -lhx509 -lroken -lwind -lheimbase -lheimipcc +LDADD= -lasn1 -lcom_err -lcrypt -lcrypto -lhx509 -lroken -lwind -lheimbase ${LDHEIMIPCC} DPADD= ${LIBASN1} ${LIBCOM_ERR} ${LIBCRYPT} ${LIBCRYPTO} ${LIBHX509} ${LIBROKEN} ${LIBWIND} ${LIBHEIMBASE} ${LIBHEIMIPCC} USEPRIVATELIB= heimipcc diff --git a/kerberos5/libexec/digest-service/Makefile b/kerberos5/libexec/digest-service/Makefile index 937d0bf..bc55a1a 100644 --- a/kerberos5/libexec/digest-service/Makefile +++ b/kerberos5/libexec/digest-service/Makefile @@ -10,7 +10,7 @@ CFLAGS+= -I${KRB5DIR}/kdc \ -I${KRB5DIR}/lib/roken DPADD= ${LIBHDB} ${LIBKDC} ${LIBHEIMIPCS} ${LIBKRB5} ${LIBROKEN} ${LIBASN1} \ ${LIBCRYPTO} ${LIBCRYPT} ${LIBVERS} -LDADD= -lhdb -lkdc -lheimipcs -lkrb5 -lroken -lasn1 -lcrypto -lcrypt \ +LDADD= -lhdb -lkdc ${LDHEIMIPCS} -lkrb5 -lroken -lasn1 -lcrypto -lcrypt \ ${LIBVERS} -lheimntlm USEPRIVATELIB= heimipcs diff --git a/kerberos5/libexec/kcm/Makefile b/kerberos5/libexec/kcm/Makefile index 003c510..8daf958 100644 --- a/kerberos5/libexec/kcm/Makefile +++ b/kerberos5/libexec/kcm/Makefile @@ -21,7 +21,7 @@ CFLAGS+=-I${KRB5DIR}/lib/krb5 -I${KRB5DIR}/lib/asn1 -I${KRB5DIR}/lib/roken \ -I${KRB5DIR}/kcm -I${KRB5DIR}/lib/ipc ${LDAPCFLAGS} DPADD= ${LIBHDB} ${LIBKRB5} ${LIBROKEN} ${LIBASN1} ${LIBHEIMNTLM} \ ${LIBHEIMIPCS} ${LIBCRYPTO} ${LIBCRYPT} ${LIBVERS} ${LDAPDPADD} -LDADD= -lhdb -lkrb5 -lroken -lasn1 -lheimntlm -lheimipcs \ +LDADD= -lhdb -lkrb5 -lroken -lasn1 -lheimntlm ${LDHEIMIPCS} \ -lcrypto -lcrypt ${LIBVERS} ${LDAPLDADD} USEPRIVATELIB= heimipcs LDFLAGS=${LDAPLDFLAGS} diff --git a/lib/libpam/modules/pam_ssh/Makefile b/lib/libpam/modules/pam_ssh/Makefile index 886610a..5643f32 100644 --- a/lib/libpam/modules/pam_ssh/Makefile +++ b/lib/libpam/modules/pam_ssh/Makefile @@ -14,7 +14,7 @@ WARNS?= 3 CFLAGS+= -I${SSHDIR} -include ssh_namespace.h DPADD= ${LIBSSH} ${LIBCRYPTO} ${LIBCRYPT} -LDADD= -lssh -lcrypto -lcrypt +LDADD= ${LDSSH} -lcrypto -lcrypt USEPRIVATELIB= ssh .include diff --git a/libexec/atf/atf-check/Makefile b/libexec/atf/atf-check/Makefile index fa7fabe..a36d94d 100644 --- a/libexec/atf/atf-check/Makefile +++ b/libexec/atf/atf-check/Makefile @@ -37,10 +37,8 @@ MAN= atf-check.1 CFLAGS+= -I${ATF} -LDFLAGS+= -L${.OBJDIR}/../../../lib/atf/libatf-c++ -LDFLAGS+= -L${.OBJDIR}/../../../lib/atf/libatf-c DPADD+= ${LIBATF_CXX} ${LIBATF_C} -LDADD+= -latf-c++ -latf-c +LDADD+= ${LDATF_CXX} ${LDATF_C} USEPRIVATELIB= atf-c++ atf-c .if ${MK_TESTS} != "no" diff --git a/libexec/atf/atf-sh/Makefile b/libexec/atf/atf-sh/Makefile index 3f461fd..90a780c 100644 --- a/libexec/atf/atf-sh/Makefile +++ b/libexec/atf/atf-sh/Makefile @@ -39,7 +39,7 @@ CFLAGS+= -DHAVE_CONFIG_H CFLAGS+= -I${ATF} DPADD+= ${LIBATF_C} ${LIBATF_CXX} -LDADD+= -latf-c++ -latf-c +LDADD+= ${LDATF_C} ${LDATF_CXX} USEPRIVATELIB= atf-c++ atf-c FILESGROUPS= SUBR diff --git a/secure/lib/libssh/Makefile b/secure/lib/libssh/Makefile index b63d6b9..36b4d76 100644 --- a/secure/lib/libssh/Makefile +++ b/secure/lib/libssh/Makefile @@ -35,7 +35,7 @@ LDNSDIR= ${.CURDIR}/../../../contrib/ldns CFLAGS+= -DHAVE_LDNS=1 -I${LDNSDIR} SRCS+= getrrsetbyname-ldns.c DPADD+= ${LIBLDNS} -LDADD+= -lldns +LDADD+= ${LDLDNS} USEPRIVATELIB+= ldns .endif 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" diff --git a/secure/usr.bin/scp/Makefile b/secure/usr.bin/scp/Makefile index d58d855..1d77d4f 100644 --- a/secure/usr.bin/scp/Makefile +++ b/secure/usr.bin/scp/Makefile @@ -12,7 +12,7 @@ SRCS+= roaming_dummy.c .endif DPADD= ${LIBSSH} -LDADD= -lssh +LDADD= ${LDSSH} USEPRIVATELIB= ssh .if ${MK_LDNS} != "no" diff --git a/secure/usr.bin/sftp/Makefile b/secure/usr.bin/sftp/Makefile index bb1c325..96f9d04 100644 --- a/secure/usr.bin/sftp/Makefile +++ b/secure/usr.bin/sftp/Makefile @@ -12,7 +12,7 @@ SRCS+= roaming_dummy.c .endif DPADD= ${LIBSSH} ${LIBEDIT} ${LIBNCURSESW} -LDADD= -lssh -ledit -lncursesw +LDADD= ${LDSSH} -ledit -lncursesw USEPRIVATELIB= ssh .if ${MK_LDNS} != "no" diff --git a/secure/usr.bin/ssh-add/Makefile b/secure/usr.bin/ssh-add/Makefile index 97191ba..fe8739b 100644 --- a/secure/usr.bin/ssh-add/Makefile +++ b/secure/usr.bin/ssh-add/Makefile @@ -12,7 +12,7 @@ SRCS+= roaming_dummy.c .endif DPADD= ${LIBSSH} -LDADD= -lssh +LDADD= ${LDSSH} USEPRIVATELIB= ssh .if ${MK_LDNS} != "no" diff --git a/secure/usr.bin/ssh-agent/Makefile b/secure/usr.bin/ssh-agent/Makefile index b5db532..b5c98b7 100644 --- a/secure/usr.bin/ssh-agent/Makefile +++ b/secure/usr.bin/ssh-agent/Makefile @@ -12,7 +12,7 @@ SRCS+= roaming_dummy.c .endif DPADD= ${LIBSSH} -LDADD= -lssh +LDADD= ${LDSSH} USEPRIVATELIB= ssh .if ${MK_LDNS} != "no" diff --git a/secure/usr.bin/ssh-keygen/Makefile b/secure/usr.bin/ssh-keygen/Makefile index 45e4d16..62e3927 100644 --- a/secure/usr.bin/ssh-keygen/Makefile +++ b/secure/usr.bin/ssh-keygen/Makefile @@ -12,13 +12,13 @@ SRCS+= roaming_dummy.c .endif DPADD= ${LIBSSH} -LDADD= -lssh +LDADD= ${LDSSH} USEPRIVATELIB= ssh .if ${MK_LDNS} != "no" CFLAGS+= -DHAVE_LDNS=1 DPADD+= ${LIBLDNS} -LDADD+= -lldns +LDADD+= ${LDLDNS} USEPRIVATELIB+= ldns .endif diff --git a/secure/usr.bin/ssh-keyscan/Makefile b/secure/usr.bin/ssh-keyscan/Makefile index 298f52a..4465918 100644 --- a/secure/usr.bin/ssh-keyscan/Makefile +++ b/secure/usr.bin/ssh-keyscan/Makefile @@ -7,7 +7,7 @@ SRCS= ssh-keyscan.c roaming_dummy.c CFLAGS+=-I${SSHDIR} -include ssh_namespace.h DPADD= ${LIBSSH} -LDADD= -lssh +LDADD= ${LDSSH} USEPRIVATELIB= ssh .if ${MK_LDNS} != "no" diff --git a/secure/usr.bin/ssh/Makefile b/secure/usr.bin/ssh/Makefile index 89f9927..bb23f43 100644 --- a/secure/usr.bin/ssh/Makefile +++ b/secure/usr.bin/ssh/Makefile @@ -16,13 +16,13 @@ SRCS= ssh.c readconf.c clientloop.c sshtty.c \ SRCS+= gss-genr.c DPADD= ${LIBSSH} ${LIBUTIL} -LDADD= -lssh -lutil +LDADD= ${LDSSH} -lutil USEPRIVATELIB= ssh .if ${MK_LDNS} != "no" CFLAGS+= -DHAVE_LDNS=1 DPADD+= ${LIBLDNS} -LDADD+= -lldns +LDADD+= ${LIBLDNSADD} USEPRIVATELIB+= ldns .endif diff --git a/secure/usr.sbin/sshd/Makefile b/secure/usr.sbin/sshd/Makefile index d487fe3..7215315 100644 --- a/secure/usr.sbin/sshd/Makefile +++ b/secure/usr.sbin/sshd/Makefile @@ -26,7 +26,7 @@ MAN= sshd.8 sshd_config.5 CFLAGS+=-I${SSHDIR} -include ssh_namespace.h DPADD= ${LIBSSH} ${LIBUTIL} ${LIBWRAP} ${LIBPAM} -LDADD= -lssh -lutil -lwrap ${MINUSLPAM} +LDADD= ${LDSSH} -lutil -lwrap ${MINUSLPAM} USEPRIVATELIB= ssh .if ${MK_LDNS} != "no" @@ -47,7 +47,7 @@ CFLAGS+= -include krb5_config.h DPADD+= ${LIBGSSAPI_KRB5} ${LIBGSSAPI} ${LIBKRB5} ${LIBHX509} ${LIBASN1} \ ${LIBCOM_ERR} ${LIBROKEN} ${LIBWIND} ${LIBHEIMBASE} ${LIBHEIMIPCC} LDADD+= -lgssapi_krb5 -lgssapi -lkrb5 -lhx509 -lasn1 \ - -lcom_err -lroken -lwind -lheimbase -lheimipcc + -lcom_err -lroken -lwind -lheimbase ${LDHEIMIPCC} .endif .if ${MK_OPENSSH_NONE_CIPHER} != "no" diff --git a/share/mk/atf.test.mk b/share/mk/atf.test.mk index f7d66bf..3c60d3b 100644 --- a/share/mk/atf.test.mk +++ b/share/mk/atf.test.mk @@ -71,7 +71,7 @@ BINDIR.${_T}= ${TESTSDIR} MAN.${_T}?= # empty SRCS.${_T}?= ${_T}.c DPADD.${_T}+= ${LIBATF_C} -LDADD.${_T}+= -latf-c +LDADD.${_T}+= ${LDATF_C} USEPRIVATELIB+= atf-c TEST_INTERFACE.${_T}= atf .endfor @@ -85,7 +85,7 @@ BINDIR.${_T}= ${TESTSDIR} MAN.${_T}?= # empty SRCS.${_T}?= ${_T}${CXX_SUFFIX:U.cc} DPADD.${_T}+= ${LIBATF_CXX} ${LIBATF_C} -LDADD.${_T}+= -latf-c++ -latf-c +LDADD.${_T}+= ${LDATF_CXX} ${LDATF_C} USEPRIVATELIB+= atf-c++ TEST_INTERFACE.${_T}= atf .endfor diff --git a/share/mk/bsd.lib.mk b/share/mk/bsd.lib.mk index 84f4ca7..509150d 100644 --- a/share/mk/bsd.lib.mk +++ b/share/mk/bsd.lib.mk @@ -155,7 +155,7 @@ LDFLAGS+= -Wl,--version-script=${VERSION_MAP} .endif .if defined(USEPRIVATELIB) -LDFLAGS+= -L${_SHLIBDIRPREFIX}${LIBPRIVATEDIR} -rpath ${LIBPRIVATEDIR} +LDFLAGS+= -rpath ${LIBPRIVATEDIR} .endif .if defined(LIB) && !empty(LIB) || defined(SHLIB_NAME) @@ -306,11 +306,11 @@ _SHLINSTALLFLAGS:= ${_SHLINSTALLFLAGS${ie}} realinstall: _libinstall .ORDER: beforeinstall _libinstall _libinstall: -.if defined(LIB) && !empty(LIB) && ${MK_INSTALLLIB} != "no" +.if defined(LIB) && !empty(LIB) && ${MK_INSTALLLIB} != "no" && !defined(PRIVATELIB) ${INSTALL} -C -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \ ${_INSTALLFLAGS} lib${LIB}.a ${DESTDIR}${_LIBDIR} .endif -.if ${MK_PROFILE} != "no" && defined(LIB) && !empty(LIB) +.if ${MK_PROFILE} != "no" && defined(LIB) && !empty(LIB) && !defined(PRIVATELIB) ${INSTALL} -C -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \ ${_INSTALLFLAGS} lib${LIB}_p.a ${DESTDIR}${_LIBDIR} .endif @@ -326,7 +326,7 @@ _libinstall: ${_INSTALLFLAGS} \ ${SHLIB_NAME}.debug ${DESTDIR}${DEBUGFILEDIR} .endif -.if defined(SHLIB_LINK) +.if defined(SHLIB_LINK) && !defined(PRIVATELIB) # ${_SHLIBDIRPREFIX} and ${_LDSCRIPTROOT} are both needed when cross-building # and when building 32 bits library shims. ${_SHLIBDIRPREFIX} is the directory # prefix where shared objects will be installed by the install target. @@ -367,7 +367,7 @@ _libinstall: .endif # SHLIB_LDSCRIPT .endif # SHLIB_LINK .endif # SHIB_NAME -.if defined(INSTALL_PIC_ARCHIVE) && defined(LIB) && !empty(LIB) && ${MK_TOOLCHAIN} != "no" +.if defined(INSTALL_PIC_ARCHIVE) && defined(LIB) && !empty(LIB) && ${MK_TOOLCHAIN} != "no" && !defined(PRIVATELIB) ${INSTALL} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \ ${_INSTALLFLAGS} lib${LIB}_pic.a ${DESTDIR}${_LIBDIR} .endif diff --git a/share/mk/bsd.libnames.mk b/share/mk/bsd.libnames.mk index 0f61600..c7ad449 100644 --- a/share/mk/bsd.libnames.mk +++ b/share/mk/bsd.libnames.mk @@ -8,13 +8,13 @@ .error bsd.libnames.mk cannot be included directly. .endif +.sinclude + LIBCRT0?= ${DESTDIR}${LIBDIR}/crt0.o LIBALIAS?= ${DESTDIR}${LIBDIR}/libalias.a LIBARCHIVE?= ${DESTDIR}${LIBDIR}/libarchive.a LIBASN1?= ${DESTDIR}${LIBDIR}/libasn1.a -LIBATF_C?= ${DESTDIR}${LIBPRIVATEDIR}/libatf-c.a -LIBATF_CXX?= ${DESTDIR}${LIBPRIVATEDIR}/libatf-c++.a LIBATM?= ${DESTDIR}${LIBDIR}/libatm.a LIBAUDITD?= ${DESTDIR}${LIBDIR}/libauditd.a LIBAVL?= ${DESTDIR}${LIBDIR}/libavl.a @@ -58,8 +58,6 @@ LIBGSSAPI?= ${DESTDIR}${LIBDIR}/libgssapi.a LIBGSSAPI_KRB5?= ${DESTDIR}${LIBDIR}/libgssapi_krb5.a LIBHDB?= ${DESTDIR}${LIBDIR}/libhdb.a LIBHEIMBASE?= ${DESTDIR}${LIBDIR}/libheimbase.a -LIBHEIMIPCC?= ${DESTDIR}${LIBPRIVATEDIR}/libheimipcc.a -LIBHEIMIPCS?= ${DESTDIR}${LIBPRIVATEDIR}/libheimipcs.a LIBHEIMNTLM?= ${DESTDIR}${LIBDIR}/libheimntlm.a LIBHEIMSQLITE?= ${DESTDIR}${LIBDIR}/libheimsqlite.a LIBHX509?= ${DESTDIR}${LIBDIR}/libhx509.a @@ -74,7 +72,6 @@ LIBKICONV?= ${DESTDIR}${LIBDIR}/libkiconv.a LIBKRB5?= ${DESTDIR}${LIBDIR}/libkrb5.a LIBKVM?= ${DESTDIR}${LIBDIR}/libkvm.a LIBL?= ${DESTDIR}${LIBDIR}/libl.a -LIBLDNS?= ${DESTDIR}${LIBPRIVATEDIR}/libldns.a LIBLN?= "don't use LIBLN, use LIBL" LIBLZMA?= ${DESTDIR}${LIBDIR}/liblzma.a LIBM?= ${DESTDIR}${LIBDIR}/libm.a @@ -134,7 +131,6 @@ LIBRTLD_DB?= ${DESTDIR}${LIBDIR}/librtld_db.a LIBSBUF?= ${DESTDIR}${LIBDIR}/libsbuf.a LIBSDP?= ${DESTDIR}${LIBDIR}/libsdp.a LIBSMB?= ${DESTDIR}${LIBDIR}/libsmb.a -LIBSSH?= ${DESTDIR}${LIBPRIVATEDIR}/libssh.a LIBSSL?= ${DESTDIR}${LIBDIR}/libssl.a LIBSTAND?= ${DESTDIR}${LIBDIR}/libstand.a LIBSTDCPLUSPLUS?= ${DESTDIR}${LIBDIR}/libstdc++.a @@ -142,11 +138,9 @@ LIBTACPLUS?= ${DESTDIR}${LIBDIR}/libtacplus.a LIBTERMCAP?= ${DESTDIR}${LIBDIR}/libtermcap.a LIBTERMLIB?= "don't use LIBTERMLIB, use LIBTERMCAP" LIBTINFO?= "don't use LIBTINFO, use LIBNCURSES" -LIBUCL?= ${DESTDIR}${LIBPRIVATEDIR}/libucl.a LIBUFS?= ${DESTDIR}${LIBDIR}/libufs.a LIBUGIDFW?= ${DESTDIR}${LIBDIR}/libugidfw.a LIBUMEM?= ${DESTDIR}${LIBDIR}/libumem.a -LIBUNBOUND?= ${DESTDIR}${LIBPRIVATEDIR}/libunbound.a LIBUSBHID?= ${DESTDIR}${LIBDIR}/libusbhid.a LIBUSB?= ${DESTDIR}${LIBDIR}/libusb.a LIBULOG?= ${DESTDIR}${LIBDIR}/libulog.a diff --git a/share/mk/src.libnames.mk b/share/mk/src.libnames.mk new file mode 100644 index 0000000..a366420 --- /dev/null +++ b/share/mk/src.libnames.mk @@ -0,0 +1,46 @@ +# $FreeBSD$ +# +# The include file define library names suitable +# for INTERNALLIB and PRIVATELIB definition + +.if !target(____) +.error src.libnames.mk cannot be included directly. +.endif + +ROOTOBJDIR= ${.OBJDIR:S/${.CURDIR}//}${.MAKE.MAKEFILES:M*/src.libnames.mk:H:H:H} + +LIBATF_CDIR= ${ROOTOBJDIR}/lib/atf/libatf-c +LDATF_C?= ${LIBATF_CDIR}/libatf-c.so +LIBATF_C?= ${LIBATF_CDIR}/libatf-c.a + +LIBATF_CXXDIR= ${ROOTOBJDIR}/lib/atf/libatf-c++ +LDATF_CXX?= ${LIBATF_CXXDIR}/libatf-c++.so +LIBATF_CXX?= ${LIBATF_CXXDIR}/libatf-c++.a + +LIBHEIMIPCCDIR= ${ROOTOBJDIR}/kerberos5/lib/libheimipcc +LDHEIMIPCC?= ${LIBHEIMIPCCDIR}/libheimipcc.so +LIBHEIMIPCC?= ${LIBHEIMIPCCDIR}/libheimipcc.a + +LIBHEIMIPCSDIR= ${ROOTOBJDIR}/kerberos5/lib/libheimipcs +LDHEIMIPCS?= ${LIBHEIMIPCSDIR}/libheimipcs.so +LIBHEIMIPCS?= ${LIBHEIMIPCSDIR}/libheimipcs.a + +LIBLDNSDIR= ${ROOTOBJDIR}/lib/libldns +LDLDNS?= ${LIBLDNSDIR}/libldns.so +LIBLDNS?= ${LIBLDNSDIR}/libldns.a + +LIBSSHDIR= ${ROOTOBJDIR}/secure/lib/libssh +LDSSH?= ${LIBSSHDIR}/libssh.so +LIBSSH?= ${LIBSSHDIR}/libssh.a + +LIBUNBOUNDDIR= ${ROOTOBJDIR}/lib/libunbound +LDUNBOUND?= ${LIBUNBOUNDDIR}/libunbound.so +LIBUNBOUND?= ${LIBUNBOUNDDIR}/libunbound.a + +LIBUCLDIR= ${ROOTOBJDIR}/lib/libucl +LDUCL?= ${LIBUCLDIR}/libucl.so +LIBUCL?= ${LIBUCLDIR}/libucl.a + +LIBREADLINEDIR= ${ROOTOBJDIR}/gnu/lib/libreadline/readline +LDREADLINE?= ${LIBREADLINEDIR}/libreadline.a +LIBREADLINE?= ${LIBREADLINEDIR}/libreadline.a diff --git a/usr.bin/drill/Makefile b/usr.bin/drill/Makefile index a963bfc..0db0604 100644 --- a/usr.bin/drill/Makefile +++ b/usr.bin/drill/Makefile @@ -13,7 +13,7 @@ NO_WERROR= true MAN= drill.1 DPADD+= ${LIBLDNS} ${LIBCRYPTO} -LDADD+= -lldns -lcrypto +LDADD+= ${LDLDNS} -lcrypto USEPRIVATELIB= ldns .include diff --git a/usr.bin/host/Makefile b/usr.bin/host/Makefile index 5962454..385bf1b 100644 --- a/usr.bin/host/Makefile +++ b/usr.bin/host/Makefile @@ -15,7 +15,7 @@ host.1: ldns-host.1 CFLAGS+= -I${LDNSDIR} DPADD+= ${LIBLDNS} ${LIBCRYPTO} -LDADD+= -lldns -lcrypto +LDADD+= ${LDLDNS} -lcrypto USEPRIVATELIB= ldns .include 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 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 -- cgit v1.1