git: 0c8ff61ee113 - main - src.libnames.mk: NEED/WANT_COMPAT+static support

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Brooks Davis <brooks_at_FreeBSD.org>
Date: Thu, 28 Jul 2022 17:55:30 UTC
The branch main has been updated by brooks:

URL: https://cgit.FreeBSD.org/src/commit/?id=0c8ff61ee113b7c09c21565c20ff6c7eb728a554

commit 0c8ff61ee113b7c09c21565c20ff6c7eb728a554
Author:     Brooks Davis <brooks@FreeBSD.org>
AuthorDate: 2022-07-28 17:54:35 +0000
Commit:     Brooks Davis <brooks@FreeBSD.org>
CommitDate: 2022-07-28 17:55:01 +0000

    src.libnames.mk: NEED/WANT_COMPAT+static support
    
    Look in _LIB_OBJTOP for all static libraries not just INTERNALLIBs. In
    normal operation this is a no-op, but improves the consistency of this
    file.
    
    Reviewed by:    imp, jhb
    Obtained from:  CheriBSD
    Differential Revision:  https://reviews.freebsd.org/D35822
---
 share/mk/src.libnames.mk | 166 +++++++++++++++++++++++------------------------
 1 file changed, 83 insertions(+), 83 deletions(-)

diff --git a/share/mk/src.libnames.mk b/share/mk/src.libnames.mk
index 1df6bb8827f9..50eb5f1bf915 100644
--- a/share/mk/src.libnames.mk
+++ b/share/mk/src.libnames.mk
@@ -661,99 +661,99 @@ LIBC_NOSSP_PIC?=	${LIBC_NOSSP_PICDIR}/libc_nossp_pic.a
 # Define a directory for each library.  This is useful for adding -L in when
 # not using a --sysroot or for meta mode bootstrapping when there is no
 # Makefile.depend.  These are sorted by directory.
-LIBAVLDIR=	${OBJTOP}/cddl/lib/libavl
-LIBCTFDIR=	${OBJTOP}/cddl/lib/libctf
-LIBDTRACEDIR=	${OBJTOP}/cddl/lib/libdtrace
-LIBICPDIR=	${OBJTOP}/cddl/lib/libicp
+LIBAVLDIR=	${_LIB_OBJTOP}/cddl/lib/libavl
+LIBCTFDIR=	${_LIB_OBJTOP}/cddl/lib/libctf
+LIBDTRACEDIR=	${_LIB_OBJTOP}/cddl/lib/libdtrace
+LIBICPDIR=	${_LIB_OBJTOP}/cddl/lib/libicp
 LIBICP?=	${LIBICPDIR}/libicp${PIE_SUFFIX}.a
-LIBICP_RESCUEDIR=	${OBJTOP}/cddl/lib/libicp_rescue
+LIBICP_RESCUEDIR=	${_LIB_OBJTOP}/cddl/lib/libicp_rescue
 LIBICP_RESCUE?=	${LIBICP_RESCUEDIR}/libicp_rescue${PIE_SUFFIX}.a
-LIBNVPAIRDIR=	${OBJTOP}/cddl/lib/libnvpair
+LIBNVPAIRDIR=	${_LIB_OBJTOP}/cddl/lib/libnvpair
 LIBNVPAIR?=	${LIBNVPAIRDIR}/libnvpair${PIE_SUFFIX}.a
-LIBUMEMDIR=	${OBJTOP}/cddl/lib/libumem
-LIBUUTILDIR=	${OBJTOP}/cddl/lib/libuutil
-LIBZFSDIR=	${OBJTOP}/cddl/lib/libzfs
+LIBUMEMDIR=	${_LIB_OBJTOP}/cddl/lib/libumem
+LIBUUTILDIR=	${_LIB_OBJTOP}/cddl/lib/libuutil
+LIBZFSDIR=	${_LIB_OBJTOP}/cddl/lib/libzfs
 LIBZFS?=	${LIBZFSDIR}/libzfs${PIE_SUFFIX}.a
-LIBZFS_COREDIR=	${OBJTOP}/cddl/lib/libzfs_core
+LIBZFS_COREDIR=	${_LIB_OBJTOP}/cddl/lib/libzfs_core
 LIBZFS_CORE?=	${LIBZFS_COREDIR}/libzfs_core${PIE_SUFFIX}.a
-LIBZFSBOOTENVDIR=	${OBJTOP}/cddl/lib/libzfsbootenv
+LIBZFSBOOTENVDIR=	${_LIB_OBJTOP}/cddl/lib/libzfsbootenv
 LIBZFSBOOTENV?=	${LIBZFSBOOTENVDIR}/libzfsbootenv${PIE_SUFFIX}.a
-LIBZPOOLDIR=	${OBJTOP}/cddl/lib/libzpool
+LIBZPOOLDIR=	${_LIB_OBJTOP}/cddl/lib/libzpool
 LIBZPOOL?=	${LIBZPOOLDIR}/libzpool${PIE_SUFFIX}.a
-LIBZUTILDIR=	${OBJTOP}/cddl/lib/libzutil
+LIBZUTILDIR=	${_LIB_OBJTOP}/cddl/lib/libzutil
 LIBZUTIL?=	${LIBZUTILDIR}/libzutil${PIE_SUFFIX}.a
-LIBTPOOLDIR=	${OBJTOP}/cddl/lib/libtpool
+LIBTPOOLDIR=	${_LIB_OBJTOP}/cddl/lib/libtpool
 
 # OFED support
-LIBCXGB4DIR=	${OBJTOP}/lib/ofed/libcxgb4
-LIBIBCMDIR=	${OBJTOP}/lib/ofed/libibcm
-LIBIBMADDIR=	${OBJTOP}/lib/ofed/libibmad
-LIBIBNETDISCDIR=${OBJTOP}/lib/ofed/libibnetdisc
-LIBIBUMADDIR=	${OBJTOP}/lib/ofed/libibumad
-LIBIBVERBSDIR=	${OBJTOP}/lib/ofed/libibverbs
-LIBIRDMADIR=	${OBJTOP}/lib/ofed/libirdma
-LIBMLX4DIR=	${OBJTOP}/lib/ofed/libmlx4
-LIBMLX5DIR=	${OBJTOP}/lib/ofed/libmlx5
-LIBRDMACMDIR=	${OBJTOP}/lib/ofed/librdmacm
-LIBOSMCOMPDIR=	${OBJTOP}/lib/ofed/complib
-LIBOPENSMDIR=	${OBJTOP}/lib/ofed/libopensm
-LIBOSMVENDORDIR=${OBJTOP}/lib/ofed/libvendor
-
-LIBDIALOGDIR=	${OBJTOP}/gnu/lib/libdialog
-LIBSSPDIR=	${OBJTOP}/lib/libssp
-LIBSSP_NONSHAREDDIR=	${OBJTOP}/lib/libssp_nonshared
-LIBASN1DIR=	${OBJTOP}/kerberos5/lib/libasn1
-LIBGSSAPI_KRB5DIR=	${OBJTOP}/kerberos5/lib/libgssapi_krb5
-LIBGSSAPI_NTLMDIR=	${OBJTOP}/kerberos5/lib/libgssapi_ntlm
-LIBGSSAPI_SPNEGODIR=	${OBJTOP}/kerberos5/lib/libgssapi_spnego
-LIBHDBDIR=	${OBJTOP}/kerberos5/lib/libhdb
-LIBHEIMBASEDIR=	${OBJTOP}/kerberos5/lib/libheimbase
-LIBHEIMIPCCDIR=	${OBJTOP}/kerberos5/lib/libheimipcc
-LIBHEIMIPCSDIR=	${OBJTOP}/kerberos5/lib/libheimipcs
-LIBHEIMNTLMDIR=	${OBJTOP}/kerberos5/lib/libheimntlm
-LIBHX509DIR=	${OBJTOP}/kerberos5/lib/libhx509
-LIBKADM5CLNTDIR=	${OBJTOP}/kerberos5/lib/libkadm5clnt
-LIBKADM5SRVDIR=	${OBJTOP}/kerberos5/lib/libkadm5srv
-LIBKAFS5DIR=	${OBJTOP}/kerberos5/lib/libkafs5
-LIBKDCDIR=	${OBJTOP}/kerberos5/lib/libkdc
-LIBKRB5DIR=	${OBJTOP}/kerberos5/lib/libkrb5
-LIBROKENDIR=	${OBJTOP}/kerberos5/lib/libroken
-LIBWINDDIR=	${OBJTOP}/kerberos5/lib/libwind
-LIBATF_CDIR=	${OBJTOP}/lib/atf/libatf-c
-LIBATF_CXXDIR=	${OBJTOP}/lib/atf/libatf-c++
-LIBGMOCKDIR=	${OBJTOP}/lib/googletest/gmock
-LIBGMOCK_MAINDIR=	${OBJTOP}/lib/googletest/gmock_main
-LIBGTESTDIR=	${OBJTOP}/lib/googletest/gtest
-LIBGTEST_MAINDIR=	${OBJTOP}/lib/googletest/gtest_main
-LIBALIASDIR=	${OBJTOP}/lib/libalias/libalias
-LIBBLACKLISTDIR=	${OBJTOP}/lib/libblacklist
-LIBBLOCKSRUNTIMEDIR=	${OBJTOP}/lib/libblocksruntime
-LIBBSNMPDIR=	${OBJTOP}/lib/libbsnmp/libbsnmp
-LIBCASPERDIR=	${OBJTOP}/lib/libcasper/libcasper
-LIBCAP_DNSDIR=	${OBJTOP}/lib/libcasper/services/cap_dns
-LIBCAP_GRPDIR=	${OBJTOP}/lib/libcasper/services/cap_grp
-LIBCAP_NETDIR=	${OBJTOP}/lib/libcasper/services/cap_net
-LIBCAP_PWDDIR=	${OBJTOP}/lib/libcasper/services/cap_pwd
-LIBCAP_SYSCTLDIR=	${OBJTOP}/lib/libcasper/services/cap_sysctl
-LIBCAP_SYSLOGDIR=	${OBJTOP}/lib/libcasper/services/cap_syslog
-LIBCBORDIR=	${OBJTOP}/lib/libcbor
-LIBBSDXMLDIR=	${OBJTOP}/lib/libexpat
-LIBFIDO2DIR=	${OBJTOP}/lib/libfido2
-LIBKVMDIR=	${OBJTOP}/lib/libkvm
-LIBPTHREADDIR=	${OBJTOP}/lib/libthr
-LIBMDIR=	${OBJTOP}/lib/msun
-LIBFORMWDIR=	${OBJTOP}/lib/ncurses/form
-LIBMENUWDIR=	${OBJTOP}/lib/ncurses/menu
-LIBNCURSESWDIR=	${OBJTOP}/lib/ncurses/ncurses
-LIBTINFOWDIR=	${OBJTOP}/lib/ncurses/tinfo
-LIBPANELWDIR=	${OBJTOP}/lib/ncurses/panel
-LIBCRYPTODIR=	${OBJTOP}/secure/lib/libcrypto
-LIBSPLDIR=	${OBJTOP}/cddl/lib/libspl
-LIBSSHDIR=	${OBJTOP}/secure/lib/libssh
-LIBSSLDIR=	${OBJTOP}/secure/lib/libssl
-LIBTEKENDIR=	${OBJTOP}/sys/teken/libteken
-LIBEGACYDIR=	${OBJTOP}/tools/build
-LIBLNDIR=	${OBJTOP}/usr.bin/lex/lib
+LIBCXGB4DIR=	${_LIB_OBJTOP}/lib/ofed/libcxgb4
+LIBIBCMDIR=	${_LIB_OBJTOP}/lib/ofed/libibcm
+LIBIBMADDIR=	${_LIB_OBJTOP}/lib/ofed/libibmad
+LIBIBNETDISCDIR=${_LIB_OBJTOP}/lib/ofed/libibnetdisc
+LIBIBUMADDIR=	${_LIB_OBJTOP}/lib/ofed/libibumad
+LIBIBVERBSDIR=	${_LIB_OBJTOP}/lib/ofed/libibverbs
+LIBIRDMADIR=	${_LIB_OBJTOP}/lib/ofed/libirdma
+LIBMLX4DIR=	${_LIB_OBJTOP}/lib/ofed/libmlx4
+LIBMLX5DIR=	${_LIB_OBJTOP}/lib/ofed/libmlx5
+LIBRDMACMDIR=	${_LIB_OBJTOP}/lib/ofed/librdmacm
+LIBOSMCOMPDIR=	${_LIB_OBJTOP}/lib/ofed/complib
+LIBOPENSMDIR=	${_LIB_OBJTOP}/lib/ofed/libopensm
+LIBOSMVENDORDIR=${_LIB_OBJTOP}/lib/ofed/libvendor
+
+LIBDIALOGDIR=	${_LIB_OBJTOP}/gnu/lib/libdialog
+LIBSSPDIR=	${_LIB_OBJTOP}/lib/libssp
+LIBSSP_NONSHAREDDIR=	${_LIB_OBJTOP}/lib/libssp_nonshared
+LIBASN1DIR=	${_LIB_OBJTOP}/kerberos5/lib/libasn1
+LIBGSSAPI_KRB5DIR=	${_LIB_OBJTOP}/kerberos5/lib/libgssapi_krb5
+LIBGSSAPI_NTLMDIR=	${_LIB_OBJTOP}/kerberos5/lib/libgssapi_ntlm
+LIBGSSAPI_SPNEGODIR=	${_LIB_OBJTOP}/kerberos5/lib/libgssapi_spnego
+LIBHDBDIR=	${_LIB_OBJTOP}/kerberos5/lib/libhdb
+LIBHEIMBASEDIR=	${_LIB_OBJTOP}/kerberos5/lib/libheimbase
+LIBHEIMIPCCDIR=	${_LIB_OBJTOP}/kerberos5/lib/libheimipcc
+LIBHEIMIPCSDIR=	${_LIB_OBJTOP}/kerberos5/lib/libheimipcs
+LIBHEIMNTLMDIR=	${_LIB_OBJTOP}/kerberos5/lib/libheimntlm
+LIBHX509DIR=	${_LIB_OBJTOP}/kerberos5/lib/libhx509
+LIBKADM5CLNTDIR=	${_LIB_OBJTOP}/kerberos5/lib/libkadm5clnt
+LIBKADM5SRVDIR=	${_LIB_OBJTOP}/kerberos5/lib/libkadm5srv
+LIBKAFS5DIR=	${_LIB_OBJTOP}/kerberos5/lib/libkafs5
+LIBKDCDIR=	${_LIB_OBJTOP}/kerberos5/lib/libkdc
+LIBKRB5DIR=	${_LIB_OBJTOP}/kerberos5/lib/libkrb5
+LIBROKENDIR=	${_LIB_OBJTOP}/kerberos5/lib/libroken
+LIBWINDDIR=	${_LIB_OBJTOP}/kerberos5/lib/libwind
+LIBATF_CDIR=	${_LIB_OBJTOP}/lib/atf/libatf-c
+LIBATF_CXXDIR=	${_LIB_OBJTOP}/lib/atf/libatf-c++
+LIBGMOCKDIR=	${_LIB_OBJTOP}/lib/googletest/gmock
+LIBGMOCK_MAINDIR=	${_LIB_OBJTOP}/lib/googletest/gmock_main
+LIBGTESTDIR=	${_LIB_OBJTOP}/lib/googletest/gtest
+LIBGTEST_MAINDIR=	${_LIB_OBJTOP}/lib/googletest/gtest_main
+LIBALIASDIR=	${_LIB_OBJTOP}/lib/libalias/libalias
+LIBBLACKLISTDIR=	${_LIB_OBJTOP}/lib/libblacklist
+LIBBLOCKSRUNTIMEDIR=	${_LIB_OBJTOP}/lib/libblocksruntime
+LIBBSNMPDIR=	${_LIB_OBJTOP}/lib/libbsnmp/libbsnmp
+LIBCASPERDIR=	${_LIB_OBJTOP}/lib/libcasper/libcasper
+LIBCAP_DNSDIR=	${_LIB_OBJTOP}/lib/libcasper/services/cap_dns
+LIBCAP_GRPDIR=	${_LIB_OBJTOP}/lib/libcasper/services/cap_grp
+LIBCAP_NETDIR=	${_LIB_OBJTOP}/lib/libcasper/services/cap_net
+LIBCAP_PWDDIR=	${_LIB_OBJTOP}/lib/libcasper/services/cap_pwd
+LIBCAP_SYSCTLDIR=	${_LIB_OBJTOP}/lib/libcasper/services/cap_sysctl
+LIBCAP_SYSLOGDIR=	${_LIB_OBJTOP}/lib/libcasper/services/cap_syslog
+LIBCBORDIR=	${_LIB_OBJTOP}/lib/libcbor
+LIBBSDXMLDIR=	${_LIB_OBJTOP}/lib/libexpat
+LIBFIDO2DIR=	${_LIB_OBJTOP}/lib/libfido2
+LIBKVMDIR=	${_LIB_OBJTOP}/lib/libkvm
+LIBPTHREADDIR=	${_LIB_OBJTOP}/lib/libthr
+LIBMDIR=	${_LIB_OBJTOP}/lib/msun
+LIBFORMWDIR=	${_LIB_OBJTOP}/lib/ncurses/form
+LIBMENUWDIR=	${_LIB_OBJTOP}/lib/ncurses/menu
+LIBNCURSESWDIR=	${_LIB_OBJTOP}/lib/ncurses/ncurses
+LIBTINFOWDIR=	${_LIB_OBJTOP}/lib/ncurses/tinfo
+LIBPANELWDIR=	${_LIB_OBJTOP}/lib/ncurses/panel
+LIBCRYPTODIR=	${_LIB_OBJTOP}/secure/lib/libcrypto
+LIBSPLDIR=	${_LIB_OBJTOP}/cddl/lib/libspl
+LIBSSHDIR=	${_LIB_OBJTOP}/secure/lib/libssh
+LIBSSLDIR=	${_LIB_OBJTOP}/secure/lib/libssl
+LIBTEKENDIR=	${_LIB_OBJTOP}/sys/teken/libteken
+LIBEGACYDIR=	${_LIB_OBJTOP}/tools/build
+LIBLNDIR=	${_LIB_OBJTOP}/usr.bin/lex/lib
 
 LIBTERMCAPWDIR=	${LIBTINFOWDIR}