svn commit: r291349 - head/share/mk

Bryan Drewery bdrewery at FreeBSD.org
Thu Nov 26 01:47:58 UTC 2015 

Author: bdrewery
Date: Thu Nov 26 01:47:56 2015
New Revision: 291349
URL: https://svnweb.freebsd.org/changeset/base/291349

Log:
  Standardize on OBJTOP in and outside of META MODE.
  
  Sponsored by:	EMC / Isilon Storage Division

Modified:
  head/share/mk/bsd.obj.mk
  head/share/mk/local.dirdeps.mk
  head/share/mk/netbsd-tests.test.mk
  head/share/mk/src.libnames.mk

Modified: head/share/mk/bsd.obj.mk
==============================================================================
--- head/share/mk/bsd.obj.mk	Thu Nov 26 01:14:40 2015	(r291348)
+++ head/share/mk/bsd.obj.mk	Thu Nov 26 01:47:56 2015	(r291349)
@@ -55,10 +55,13 @@ CANONICALOBJDIR= ${.OBJDIR}
 CANONICALOBJDIR:=${MAKEOBJDIRPREFIX}${.CURDIR}
 .elif defined(MAKEOBJDIR) && ${MAKEOBJDIR:M/*} != ""
 CANONICALOBJDIR:=${MAKEOBJDIR}
+OBJTOP?= ${MAKEOBJDIR}
 .else
 CANONICALOBJDIR:=/usr/obj${.CURDIR}
 .endif
 
+OBJTOP?= ${.OBJDIR:S,${.CURDIR},,}${SRCTOP}
+
 #
 # Warn of unorthodox object directory.
 #

Modified: head/share/mk/local.dirdeps.mk
==============================================================================
--- head/share/mk/local.dirdeps.mk	Thu Nov 26 01:14:40 2015	(r291348)
+++ head/share/mk/local.dirdeps.mk	Thu Nov 26 01:47:56 2015	(r291349)
@@ -40,7 +40,7 @@ __<bsd.init.mk>__:
 # allowed to be built though since they are never installed.
 _need_host_libs=
 .for lib in ${_INTERNALLIBS}
-_need_host_libs+= ${LIB${lib:tu}DIR:S,^${ROOTOBJDIR}/,,}
+_need_host_libs+= ${LIB${lib:tu}DIR:S,^${OBJTOP}/,,}
 .endfor
 
 N_host_libs:= ${cd ${SRCTOP} && echo lib/lib*:L:sh:${_need_host_libs:${M_ListToSkip}}:${M_ListToSkip}}

Modified: head/share/mk/netbsd-tests.test.mk
==============================================================================
--- head/share/mk/netbsd-tests.test.mk	Thu Nov 26 01:14:40 2015	(r291348)
+++ head/share/mk/netbsd-tests.test.mk	Thu Nov 26 01:47:56 2015	(r291349)
@@ -3,8 +3,6 @@
 .if !target(__netbsd_tests.test.mk__)
 __netbsd_tests.test.mk__:
 
-OBJTOP?=	${.OBJDIR:S/${RELDIR}//}
-
 TESTSRC?=	${SRCTOP}/contrib/netbsd-tests/${RELDIR:H}
 
 .if !exists(${TESTSRC}/)

Modified: head/share/mk/src.libnames.mk
==============================================================================
--- head/share/mk/src.libnames.mk	Thu Nov 26 01:14:40 2015	(r291348)
+++ head/share/mk/src.libnames.mk	Thu Nov 26 01:47:56 2015	(r291349)
@@ -12,12 +12,6 @@ __<src.libnames.mk>__:
 
 .include <src.opts.mk>
 
-.if ${.OBJDIR:S,${.CURDIR},,} != ${.OBJDIR}
-ROOTOBJDIR=	${.OBJDIR:S,${.CURDIR},,}${SRCTOP}
-.elif defined(OBJTOP) && ${.OBJDIR:M${OBJTOP}*} != ""
-ROOTOBJDIR=	${OBJTOP}
-.endif
-
 _PRIVATELIBS=	\
 		atf_c \
 		atf_cxx \
@@ -311,127 +305,127 @@ LDADD+=		${LDADD_${_l}}
 .error Missing ${DPADD:Mmissing-dpadd_*:S/missing-dpadd_//:S/^/DPADD_/} variable add "${DPADD:Mmissing-dpadd_*:S/missing-dpadd_//}" to _LIBRARIES, _INTERNALLIBS, or _PRIVATELIBS and define "${DPADD:Mmissing-dpadd_*:S/missing-dpadd_//:S/^/LIB/:tu}".
 .endif
 
-LIBELFTCDIR=	${ROOTOBJDIR}/lib/libelftc
+LIBELFTCDIR=	${OBJTOP}/lib/libelftc
 LIBELFTC?=	${LIBELFTCDIR}/libelftc.a
 
-LIBREADLINEDIR=	${ROOTOBJDIR}/gnu/lib/libreadline/readline
+LIBREADLINEDIR=	${OBJTOP}/gnu/lib/libreadline/readline
 LIBREADLINE?=	${LIBREADLINEDIR}/libreadline.a
 
-LIBOPENBSDDIR=	${ROOTOBJDIR}/lib/libopenbsd
+LIBOPENBSDDIR=	${OBJTOP}/lib/libopenbsd
 LIBOPENBSD?=	${LIBOPENBSDDIR}/libopenbsd.a
 
-LIBSMDIR=	${ROOTOBJDIR}/lib/libsm
+LIBSMDIR=	${OBJTOP}/lib/libsm
 LIBSM?=		${LIBSMDIR}/libsm.a
 
-LIBSMDBDIR=	${ROOTOBJDIR}/lib/libsmdb
+LIBSMDBDIR=	${OBJTOP}/lib/libsmdb
 LIBSMDB?=	${LIBSMDBDIR}/libsmdb.a
 
-LIBSMUTILDIR=	${ROOTOBJDIR}/lib/libsmutil
+LIBSMUTILDIR=	${OBJTOP}/lib/libsmutil
 LIBSMUTIL?=	${LIBSMDBDIR}/libsmutil.a
 
-LIBNETBSDDIR?=	${ROOTOBJDIR}/lib/libnetbsd
+LIBNETBSDDIR?=	${OBJTOP}/lib/libnetbsd
 LIBNETBSD?=	${LIBNETBSDDIR}/libnetbsd.a
 
-LIBVERSDIR?=	${ROOTOBJDIR}/kerberos5/lib/libvers
+LIBVERSDIR?=	${OBJTOP}/kerberos5/lib/libvers
 LIBVERS?=	${LIBVERSDIR}/libvers.a
 
-LIBSLDIR=	${ROOTOBJDIR}/kerberos5/lib/libsl
+LIBSLDIR=	${OBJTOP}/kerberos5/lib/libsl
 LIBSL?=		${LIBSLDIR}/libsl.a
 
-LIBIPFDIR=	${ROOTOBJDIR}/sbin/ipf/libipf
+LIBIPFDIR=	${OBJTOP}/sbin/ipf/libipf
 LIBIPF?=	${LIBIPFDIR}/libipf.a
 
-LIBTELNETDIR=	${ROOTOBJDIR}/lib/libtelnet
+LIBTELNETDIR=	${OBJTOP}/lib/libtelnet
 LIBTELNET?=	${LIBTELNETDIR}/libtelnet.a
 
-LIBCRONDIR=	${ROOTOBJDIR}/usr.sbin/cron/lib
+LIBCRONDIR=	${OBJTOP}/usr.sbin/cron/lib
 LIBCRON?=	${LIBCRONDIR}/libcron.a
 
-LIBNTPDIR=	${ROOTOBJDIR}/usr.sbin/ntp/libntp
+LIBNTPDIR=	${OBJTOP}/usr.sbin/ntp/libntp
 LIBNTP?=	${LIBNTPDIR}/libntp.a
 
-LIBNTPEVENTDIR=	${ROOTOBJDIR}/usr.sbin/ntp/libntpevent
+LIBNTPEVENTDIR=	${OBJTOP}/usr.sbin/ntp/libntpevent
 LIBNTPEVENT?=	${LIBNTPEVENTDIR}/libntpevent.a
 
-LIBOPTSDIR=	${ROOTOBJDIR}/usr.sbin/ntp/libopts
+LIBOPTSDIR=	${OBJTOP}/usr.sbin/ntp/libopts
 LIBOTPS?=	${LIBOPTSDIR}/libopts.a
 
-LIBPARSEDIR=	${ROOTOBJDIR}/usr.sbin/ntp/libparse
+LIBPARSEDIR=	${OBJTOP}/usr.sbin/ntp/libparse
 LIBPARSE?=	${LIBPARSEDIR}/libparse.a
 
-LIBLPRDIR=	${ROOTOBJDIR}/usr.sbin/lpr/common_source
+LIBLPRDIR=	${OBJTOP}/usr.sbin/lpr/common_source
 LIBLPR?=	${LIBOPTSDIR}/liblpr.a
 
-LIBFIFOLOGDIR=	${ROOTOBJDIR}/usr.sbin/fifolog/lib
+LIBFIFOLOGDIR=	${OBJTOP}/usr.sbin/fifolog/lib
 LIBFIFOLOG?=	${LIBOPTSDIR}/libfifolog.a
 
-LIBBSNMPTOOLSDIR=	${ROOTOBJDIR}/usr.sbin/bsnmpd/tools/libbsnmptools
+LIBBSNMPTOOLSDIR=	${OBJTOP}/usr.sbin/bsnmpd/tools/libbsnmptools
 LIBBSNMPTOOLS?=	${LIBBSNMPTOOLSDIR}/libbsnmptools.a
 
-LIBAMUDIR=	${ROOTOBJDIR}/usr.sbin/amd/libamu
+LIBAMUDIR=	${OBJTOP}/usr.sbin/amd/libamu
 LIBAMU?=	${LIBAMUDIR}/libamu/libamu.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=	${ROOTOBJDIR}/cddl/lib/libavl
-LIBCTFDIR=	${ROOTOBJDIR}/cddl/lib/libctf
-LIBDTRACEDIR=	${ROOTOBJDIR}/cddl/lib/libdtrace
-LIBNVPAIRDIR=	${ROOTOBJDIR}/cddl/lib/libnvpair
-LIBUMEMDIR=	${ROOTOBJDIR}/cddl/lib/libumem
-LIBUUTILDIR=	${ROOTOBJDIR}/cddl/lib/libuutil
-LIBZFSDIR=	${ROOTOBJDIR}/cddl/lib/libzfs
-LIBZFS_COREDIR=	${ROOTOBJDIR}/cddl/lib/libzfs_core
-LIBZPOOLDIR=	${ROOTOBJDIR}/cddl/lib/libzpool
-LIBDIALOGDIR=	${ROOTOBJDIR}/gnu/lib/libdialog
-LIBGCOVDIR=	${ROOTOBJDIR}/gnu/lib/libgcov
-LIBGOMPDIR=	${ROOTOBJDIR}/gnu/lib/libgomp
-LIBGNUREGEXDIR=	${ROOTOBJDIR}/gnu/lib/libregex
-LIBSSPDIR=	${ROOTOBJDIR}/gnu/lib/libssp
-LIBSSP_NONSHAREDDIR=	${ROOTOBJDIR}/gnu/lib/libssp/libssp_nonshared
-LIBSUPCPLUSPLUSDIR=	${ROOTOBJDIR}/gnu/lib/libsupc++
-LIBASN1DIR=	${ROOTOBJDIR}/kerberos5/lib/libasn1
-LIBGSSAPI_KRB5DIR=	${ROOTOBJDIR}/kerberos5/lib/libgssapi_krb5
-LIBGSSAPI_NTLMDIR=	${ROOTOBJDIR}/kerberos5/lib/libgssapi_ntlm
-LIBGSSAPI_SPNEGODIR=	${ROOTOBJDIR}/kerberos5/lib/libgssapi_spnego
-LIBHDBDIR=	${ROOTOBJDIR}/kerberos5/lib/libhdb
-LIBHEIMBASEDIR=	${ROOTOBJDIR}/kerberos5/lib/libheimbase
-LIBHEIMIPCCDIR=	${ROOTOBJDIR}/kerberos5/lib/libheimipcc
-LIBHEIMIPCSDIR=	${ROOTOBJDIR}/kerberos5/lib/libheimipcs
-LIBHEIMNTLMDIR=	${ROOTOBJDIR}/kerberos5/lib/libheimntlm
-LIBHX509DIR=	${ROOTOBJDIR}/kerberos5/lib/libhx509
-LIBKADM5CLNTDIR=	${ROOTOBJDIR}/kerberos5/lib/libkadm5clnt
-LIBKADM5SRVDIR=	${ROOTOBJDIR}/kerberos5/lib/libkadm5srv
-LIBKAFS5DIR=	${ROOTOBJDIR}/kerberos5/lib/libkafs5
-LIBKDCDIR=	${ROOTOBJDIR}/kerberos5/lib/libkdc
-LIBKRB5DIR=	${ROOTOBJDIR}/kerberos5/lib/libkrb5
-LIBROKENDIR=	${ROOTOBJDIR}/kerberos5/lib/libroken
-LIBWINDDIR=	${ROOTOBJDIR}/kerberos5/lib/libwind
-LIBALIASDIR=	${ROOTOBJDIR}/lib/libalias/libalias
-LIBBLOCKSRUNTIMEDIR=	${ROOTOBJDIR}/lib/libblocksruntime
-LIBBSNMPDIR=	${ROOTOBJDIR}/lib/libbsnmp/libbsnmp
-LIBBSDXMLDIR=	${ROOTOBJDIR}/lib/libexpat
-LIBKVMDIR=	${ROOTOBJDIR}/lib/libkvm
-LIBPTHREADDIR=	${ROOTOBJDIR}/lib/libthr
-LIBMDIR=	${ROOTOBJDIR}/lib/msun
-LIBFORMDIR=	${ROOTOBJDIR}/lib/ncurses/form
-LIBFORMLIBWDIR=	${ROOTOBJDIR}/lib/ncurses/formw
-LIBMENUDIR=	${ROOTOBJDIR}/lib/ncurses/menu
-LIBMENULIBWDIR=	${ROOTOBJDIR}/lib/ncurses/menuw
-LIBTERMCAPDIR=	${ROOTOBJDIR}/lib/ncurses/ncurses
-LIBTERMCAPWDIR=	${ROOTOBJDIR}/lib/ncurses/ncursesw
-LIBPANELDIR=	${ROOTOBJDIR}/lib/ncurses/panel
-LIBPANELWDIR=	${ROOTOBJDIR}/lib/ncurses/panelw
-LIBCRYPTODIR=	${ROOTOBJDIR}/secure/lib/libcrypto
-LIBSSHDIR=	${ROOTOBJDIR}/secure/lib/libssh
-LIBSSLDIR=	${ROOTOBJDIR}/secure/lib/libssl
-LIBTEKENDIR=	${ROOTOBJDIR}/sys/teken/libteken
-LIBEGACYDIR=	${ROOTOBJDIR}/tools/build
-LIBLNDIR=	${ROOTOBJDIR}/usr.bin/lex/lib
+LIBAVLDIR=	${OBJTOP}/cddl/lib/libavl
+LIBCTFDIR=	${OBJTOP}/cddl/lib/libctf
+LIBDTRACEDIR=	${OBJTOP}/cddl/lib/libdtrace
+LIBNVPAIRDIR=	${OBJTOP}/cddl/lib/libnvpair
+LIBUMEMDIR=	${OBJTOP}/cddl/lib/libumem
+LIBUUTILDIR=	${OBJTOP}/cddl/lib/libuutil
+LIBZFSDIR=	${OBJTOP}/cddl/lib/libzfs
+LIBZFS_COREDIR=	${OBJTOP}/cddl/lib/libzfs_core
+LIBZPOOLDIR=	${OBJTOP}/cddl/lib/libzpool
+LIBDIALOGDIR=	${OBJTOP}/gnu/lib/libdialog
+LIBGCOVDIR=	${OBJTOP}/gnu/lib/libgcov
+LIBGOMPDIR=	${OBJTOP}/gnu/lib/libgomp
+LIBGNUREGEXDIR=	${OBJTOP}/gnu/lib/libregex
+LIBSSPDIR=	${OBJTOP}/gnu/lib/libssp
+LIBSSP_NONSHAREDDIR=	${OBJTOP}/gnu/lib/libssp/libssp_nonshared
+LIBSUPCPLUSPLUSDIR=	${OBJTOP}/gnu/lib/libsupc++
+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
+LIBALIASDIR=	${OBJTOP}/lib/libalias/libalias
+LIBBLOCKSRUNTIMEDIR=	${OBJTOP}/lib/libblocksruntime
+LIBBSNMPDIR=	${OBJTOP}/lib/libbsnmp/libbsnmp
+LIBBSDXMLDIR=	${OBJTOP}/lib/libexpat
+LIBKVMDIR=	${OBJTOP}/lib/libkvm
+LIBPTHREADDIR=	${OBJTOP}/lib/libthr
+LIBMDIR=	${OBJTOP}/lib/msun
+LIBFORMDIR=	${OBJTOP}/lib/ncurses/form
+LIBFORMLIBWDIR=	${OBJTOP}/lib/ncurses/formw
+LIBMENUDIR=	${OBJTOP}/lib/ncurses/menu
+LIBMENULIBWDIR=	${OBJTOP}/lib/ncurses/menuw
+LIBTERMCAPDIR=	${OBJTOP}/lib/ncurses/ncurses
+LIBTERMCAPWDIR=	${OBJTOP}/lib/ncurses/ncursesw
+LIBPANELDIR=	${OBJTOP}/lib/ncurses/panel
+LIBPANELWDIR=	${OBJTOP}/lib/ncurses/panelw
+LIBCRYPTODIR=	${OBJTOP}/secure/lib/libcrypto
+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
 
 # Default other library directories to lib/libNAME.
 .for lib in ${_LIBRARIES}
-LIB${lib:tu}DIR?=	${ROOTOBJDIR}/lib/lib${lib}
+LIB${lib:tu}DIR?=	${OBJTOP}/lib/lib${lib}
 .endfor
 
 .endif	# !target(__<src.libnames.mk>__)

More information about the svn-src-all mailing list