Index: Makefile =================================================================== --- Makefile +++ Makefile @@ -1,5 +1,5 @@ # -# $FreeBSD: head/Makefile 282156 2015-04-28 17:13:05Z emaste $ +# $FreeBSD: projects/bmake/Makefile 284219 2015-06-10 13:08:45Z sjg $ # # The user-driven targets are: # @@ -99,6 +99,11 @@ # # For more information, see the build(7) manual page. # +.if ${MK_META_MODE} == "yes" +# targets/Makefile plays the role of top-level +.include "targets/Makefile" +.else + TGTS= all all-man buildenv buildenvvars buildkernel buildworld \ check-old check-old-dirs check-old-files check-old-libs \ checkdpadd clean cleandepend cleandir \ @@ -516,10 +521,22 @@ buildLINT: ${MAKE} -C ${.CURDIR}/sys/${_TARGET}/conf LINT -.if defined(.PARSEDIR) +# This makefile does not run in meta mode +.MAKE.MODE= normal +# Normally the things we run from here don't either. +# Using -DWITH_META_FILES +# we can buildworld with meta files created which are useful +# for debugging, but without any of the rest of a meta mode build. +MK_META_MODE= no +MK_STAGING= no +# tell meta.autodep.mk to not even think about updating anything. +UPDATE_DEPENDFILE= NO +.export MK_META_MODE MK_STAGING UPDATE_DEPENDFILE + .if make(universe) # we do not want a failure of one branch abort all. MAKE_JOB_ERROR_TOKEN= no .export MAKE_JOB_ERROR_TOKEN .endif -.endif + +.endif # META_MODE Index: Makefile.inc1 =================================================================== --- Makefile.inc1 +++ Makefile.inc1 @@ -1,5 +1,5 @@ # -# $FreeBSD: head/Makefile.inc1 283572 2015-05-26 16:25:28Z bapt $ +# $FreeBSD: projects/bmake/Makefile.inc1 284224 2015-06-10 14:08:36Z sjg $ # # Make command line options: # -DNO_CLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir @@ -1755,7 +1755,6 @@ cddl/lib/libzfs_core__L: cddl/lib/libnvpair__L cddl/lib/libzfs__L: lib/libgeom__L cddl/lib/libctf__L: lib/libz__L -.endif # cddl/lib/libdtrace requires lib/libproc and lib/librtld_db; it's only built # on select architectures though (see cddl/lib/Makefile) .if ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "i386" || \ @@ -1763,6 +1762,7 @@ ${MACHINE_CPUARCH} == "arm" _prebuild_libs+= lib/libproc lib/librtld_db .endif +.endif .if ${MK_CRYPT} != "no" .if ${MK_OPENSSL} != "no" Index: etc/Makefile =================================================================== --- etc/Makefile +++ etc/Makefile @@ -1,5 +1,5 @@ # from: @(#)Makefile 5.11 (Berkeley) 5/21/91 -# $FreeBSD: head/etc/Makefile 283056 2015-05-18 11:02:43Z ngie $ +# $FreeBSD: projects/bmake/etc/Makefile 283595 2015-05-27 01:19:58Z sjg $ .include @@ -332,6 +332,16 @@ MTREE_CMD?= mtree +.if ${MK_INSTALL_AS_USER} != "no" && ${_uid} != 0 +MTREE_FILTER= sed -e 's,\([gu]\)name=,\1id=,g' \ + -e 's,\(uid=\)[^ ]* ,\1${_uid} ,' \ + -e 's,\(gid=\)[^ ]* ,\1${_gid} ,' \ + -e 's,\(uid=\)[^ ]*$$,\1${_uid},' \ + -e 's,\(gid=\)[^ ]*$$,\1${_gid},' +.else +MTREE_FILTER= cat +.endif + MTREES= mtree/BSD.root.dist / \ mtree/BSD.var.dist /var \ mtree/BSD.usr.dist /usr \ @@ -360,7 +370,8 @@ test -d $$d || mkdir -p $$d; \ ${ECHO} ${MTREE_CMD} -deU ${MTREE_FOLLOWS_SYMLINKS} \ -f $$m -p $$d; \ - ${MTREE_CMD} -deU ${MTREE_FOLLOWS_SYMLINKS} -f $$m -p $$d; \ + ${MTREE_FILTER} $$m | \ + ${MTREE_CMD} -deU ${MTREE_FOLLOWS_SYMLINKS} -p $$d; \ done; true .if defined(NO_ROOT) @set ${MTREES}; \ @@ -374,7 +385,8 @@ test -d ${DESTDIR}/$$d || mkdir -p ${DESTDIR}/$$d; \ ${ECHO} "${MTREE_CMD:N-W} -C -f $$m -K uname,gname | " \ "sed s#^\.#.$$d# | ${METALOG.add}" ; \ - ${MTREE_CMD:N-W} -C -f $$m -K uname,gname | sed s#^\.#.$$d# | \ + ${MTREE_FILTER} $$m | \ + ${MTREE_CMD:N-W} -C -K uname,gname | sed s#^\.#.$$d# | \ ${METALOG.add} ; \ done; true .endif Index: gnu/lib/csu/Makefile =================================================================== --- gnu/lib/csu/Makefile +++ gnu/lib/csu/Makefile @@ -1,4 +1,6 @@ -# $FreeBSD: head/gnu/lib/csu/Makefile 272350 2014-10-01 08:26:51Z andrew $ +# $FreeBSD: projects/bmake/gnu/lib/csu/Makefile 283595 2015-05-27 01:19:58Z sjg $ + +.MAIN: all .include MK_SSP= no @@ -74,4 +76,11 @@ ${file} ${DESTDIR}${LIBDIR}/${file} .endfor +.if ${MK_STAGING} == "yes" +STAGE_DIR= ${STAGE_LIBDIR} +STAGE_FILES= ${OBJS} ${SOBJS} ${TGTOBJS} +staging: stage_files +.endif +.NOPATH: ${CLEANFILES} + .include Index: gnu/lib/libreadline/readline/Makefile =================================================================== --- gnu/lib/libreadline/readline/Makefile +++ gnu/lib/libreadline/readline/Makefile @@ -1,4 +1,4 @@ -# $FreeBSD: head/gnu/lib/libreadline/readline/Makefile 275077 2014-11-25 21:18:18Z bapt $ +# $FreeBSD: projects/bmake/gnu/lib/libreadline/readline/Makefile 283595 2015-05-27 01:19:58Z sjg $ LIB= readline INTERNALLIB= yes @@ -13,14 +13,15 @@ INSTALLED_HEADERS= readline.h chardefs.h keymaps.h history.h tilde.h \ rlstdc.h rlconf.h rltypedefs.h +CFLAGS+= -DREADLINE_LIBRARY CFLAGS+= -I${.OBJDIR}/.. SRCDIR= ${.CURDIR}/../../../../contrib/libreadline -.for _h in ${INSTALLED_HEADERS} -CLEANFILES+= ${_h} -DPSRCS+= ${.OBJDIR}/${_h} -${.OBJDIR}/${_h}: ${SRCDIR}/${_h} - ${INSTALL} ${.ALLSRC} ${.TARGET} +CLEANFILES+= ${INSTALLED_HEADERS} +beforebuild: ${INSTALLED_HEADERS} +.for h in ${INSTALLED_HEADERS} +$h: ${SRCDIR}/$h + ln -sf ${SRCDIR}/$h $h .endfor LIBADD= ncursesw Index: gnu/usr.bin/binutils/ld/Makefile =================================================================== --- gnu/usr.bin/binutils/ld/Makefile +++ gnu/usr.bin/binutils/ld/Makefile @@ -1,4 +1,4 @@ -# $FreeBSD: head/gnu/usr.bin/binutils/ld/Makefile 268351 2014-07-07 00:27:09Z marcel $ +# $FreeBSD: projects/bmake/gnu/usr.bin/binutils/ld/Makefile 283595 2015-05-27 01:19:58Z sjg $ .include "../Makefile.inc0" .include @@ -70,4 +70,6 @@ ${INSTALL} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \ ${LDSCRIPTS:S|^|ldscripts/|} ${DESTDIR}${SCRIPTDIR} +GENDIRDEPS_FILTER.host+= Nusr.bin/yacc + .include Index: gnu/usr.bin/cc/cc_tools/Makefile =================================================================== --- gnu/usr.bin/cc/cc_tools/Makefile +++ gnu/usr.bin/cc/cc_tools/Makefile @@ -1,4 +1,4 @@ -# $FreeBSD: head/gnu/usr.bin/cc/cc_tools/Makefile 272350 2014-10-01 08:26:51Z andrew $ +# $FreeBSD: projects/bmake/gnu/usr.bin/cc/cc_tools/Makefile 283595 2015-05-27 01:19:58Z sjg $ .include @@ -207,7 +207,7 @@ CLEANFILES+= cs-bconfig.h # tconfig.h -tconfig.h: +tconfig.h: .PHONY TARGET_CPU_DEFAULT="${TARGET_CPU_DEFAULT}" \ HEADERS="auto-host.h ansidecl.h" \ DEFINES="USED_FOR_TARGET" \ @@ -543,6 +543,8 @@ GENOBJS+= ${GENSRCS:N*.h:R:S/$/.o/g} CLEANFILES+= ${GENSRCS} ${GENONLY} ${GENOBJS} ${GNTOOLS} +.NOPATH: ${GENSRCS} ${CLEANFILES} + #----------------------------------------------------------------------- # Manual dependencies. .if !exists(${DEPENDFILE}) Index: gnu/usr.bin/groff/Makefile.inc =================================================================== --- gnu/usr.bin/groff/Makefile.inc +++ gnu/usr.bin/groff/Makefile.inc @@ -1,4 +1,4 @@ -# $FreeBSD: head/gnu/usr.bin/groff/Makefile.inc 151504 2005-10-20 10:57:53Z ru $ +# $FreeBSD: projects/bmake/gnu/usr.bin/groff/Makefile.inc 283595 2015-05-27 01:19:58Z sjg $ BINDIR?= /usr/bin SHELL= /bin/sh @@ -127,6 +127,7 @@ .sh .pl: @${ECHO} Making ${.TARGET} from ${.IMPSRC} + @rm -f ${.TARGET} @sed -e "s|@BINDIR@|${BINDIR}|g" \ -e 's|@GROFF_BIN_PATH_SETUP@|GROFF_RUNTIME="$${GROFF_BIN_PATH=${BINDIR}}:"|g' \ -e "s;@FONTDIR@;$(fontdir);g" \ Index: include/Makefile =================================================================== --- include/Makefile +++ include/Makefile @@ -1,5 +1,5 @@ # @(#)Makefile 8.2 (Berkeley) 1/4/94 -# $FreeBSD: head/include/Makefile 281613 2015-04-16 20:22:40Z glebius $ +# $FreeBSD: projects/bmake/include/Makefile 283595 2015-05-27 01:19:58Z sjg $ # # Doing a "make install" builds /usr/include. @@ -128,8 +128,30 @@ _MARCHS+= x86 .endif +.if ${MK_STAGING} != "no" +# tell bsd.incs.mk that we have it covered +NO_STAGE_INCLUDES= +.endif + .include +.if ${MK_STAGING} != "no" && !defined(_SKIP_BUILD) +.if make(all) +DESTDIR= ${STAGE_OBJTOP} + +all: stage_include +installincludes: buildincludes +buildincludes: stage_prep + +stage_prep: + @mkdir -p ${DESTDIR}${INCLUDEDIR} + @touch $@ + +stage_include: .dirdep installincludes + @touch $@ +.endif +.endif + installincludes: ${SHARED} ${SHARED}: compat @@ -142,7 +164,10 @@ .endfor mtree -deU ${MTREE_FOLLOWS_SYMLINKS} \ -f ${.CURDIR}/../etc/mtree/BSD.include.dist \ - -p ${DESTDIR}${INCLUDEDIR} + -p ${DESTDIR}${INCLUDEDIR} > /dev/null +.if ${MK_META_MODE} == "yes" + touch ${.TARGET} +.endif copies: .for i in ${LDIRS} ${LSUBDIRS} ${LSUBSUBDIRS} crypto machine machine/pc \ @@ -229,6 +254,9 @@ cd ${.CURDIR}/../sys/teken; \ ${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 teken.h \ ${DESTDIR}${INCLUDEDIR}/teken +.if ${MK_META_MODE} == "yes" + touch ${.TARGET} +.endif symlinks: @${ECHO} "Setting up symlinks to kernel source tree..." @@ -343,3 +371,15 @@ ln -fs ../../../sys/rpc/$$h \ ${DESTDIR}${INCLUDEDIR}/rpc; \ done +.if ${MK_META_MODE} == "yes" + touch ${.TARGET} +.endif + +.if ${MACHINE} == "host" +# we're here because we are building a sysroot... +# we need MACHINE et al set correctly +HOST_MACHINE!= uname -m +HOST_MACHINE_ARCH!= uname -p +MACHINE:= ${HOST_MACHINE} +MACHINE_ARCH:= ${HOST_MACHINE_ARCH} +.endif Index: include/arpa/Makefile =================================================================== --- include/arpa/Makefile +++ include/arpa/Makefile @@ -1,12 +1,9 @@ -# $FreeBSD: head/include/arpa/Makefile 265420 2014-05-06 04:22:01Z imp $ +# $FreeBSD: projects/bmake/include/arpa/Makefile 265720 2014-05-08 23:54:15Z sjg $ .include -NO_OBJ= -INCS= ftp.h inet.h nameser.h nameser_compat.h tftp.h -.if ${MK_TELNET} == "no" -INCS+= telnet.h -.endif +INCS= ftp.h inet.h nameser.h nameser_compat.h telnet.h tftp.h + INCSDIR=${INCLUDEDIR}/arpa .include Index: include/gssapi/Makefile =================================================================== --- include/gssapi/Makefile +++ include/gssapi/Makefile @@ -1,6 +1,5 @@ -# $FreeBSD: head/include/gssapi/Makefile 153838 2005-12-29 14:40:22Z dfr $ +# $FreeBSD: projects/bmake/include/gssapi/Makefile 239572 2012-08-22 19:25:57Z marcel $ -NO_OBJ= INCS= gssapi.h INCSDIR= ${INCLUDEDIR}/gssapi Index: include/mk-osreldate.sh =================================================================== --- include/mk-osreldate.sh +++ include/mk-osreldate.sh @@ -23,7 +23,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: head/include/mk-osreldate.sh 255957 2013-09-30 21:01:04Z ian $ +# $FreeBSD: projects/bmake/include/mk-osreldate.sh 266223 2014-05-16 14:43:24Z sjg $ set -e @@ -49,4 +49,4 @@ #endif EOF chmod 644 $tmpfile -mv $tmpfile osreldate.h +mv -f $tmpfile osreldate.h Index: include/protocols/Makefile =================================================================== --- include/protocols/Makefile +++ include/protocols/Makefile @@ -1,6 +1,5 @@ -# $FreeBSD: head/include/protocols/Makefile 139103 2004-12-21 08:47:35Z ru $ +# $FreeBSD: projects/bmake/include/protocols/Makefile 239572 2012-08-22 19:25:57Z marcel $ -NO_OBJ= INCS= dumprestore.h routed.h rwhod.h talkd.h timed.h INCSDIR=${INCLUDEDIR}/protocols Index: include/xlocale/Makefile =================================================================== --- include/xlocale/Makefile +++ include/xlocale/Makefile @@ -1,6 +1,5 @@ -# $FreeBSD: head/include/xlocale/Makefile 266865 2014-05-30 01:09:07Z pfg $ +# $FreeBSD: projects/bmake/include/xlocale/Makefile 270164 2014-08-19 06:50:54Z sjg $ -NO_OBJ= INCS= _ctype.h _inttypes.h _langinfo.h _locale.h _monetary.h _stdio.h\ _stdlib.h _string.h _strings.h _time.h _uchar.h _wchar.h INCSDIR=${INCLUDEDIR}/xlocale Index: kerberos5/Makefile.inc =================================================================== --- kerberos5/Makefile.inc +++ kerberos5/Makefile.inc @@ -1,4 +1,4 @@ -# $FreeBSD: head/kerberos5/Makefile.inc 275022 2014-11-25 09:57:42Z bapt $ +# $FreeBSD: projects/bmake/kerberos5/Makefile.inc 283595 2015-05-27 01:19:58Z sjg $ .include @@ -34,7 +34,7 @@ .for ET in ${ETSRCS} .for _ET in ${ET:T:R} .if ${SRCS:M${_ET}.[ch]} != "" -.ORDER: ${_ET}.c ${_ET}.h +.ORDER: ${_ET}.h ${_ET}.c ${_ET}.c ${_ET}.h: ${ET} compile_et ${.ALLSRC} CLEANFILES+= ${_ET}.h ${_ET}.c Index: kerberos5/lib/libasn1/Makefile =================================================================== --- kerberos5/lib/libasn1/Makefile +++ kerberos5/lib/libasn1/Makefile @@ -1,4 +1,4 @@ -# $FreeBSD: head/kerberos5/lib/libasn1/Makefile 277273 2015-01-16 21:39:08Z will $ +# $FreeBSD: projects/bmake/kerberos5/lib/libasn1/Makefile 284206 2015-06-10 04:57:09Z sjg $ LIB= asn1 LDFLAGS= -Wl,--no-undefined @@ -115,7 +115,12 @@ .hx.h: ${CP} ${.IMPSRC} ${.TARGET} - + +# This makefile generates a lot of its headers +# so tell bsd.sys.mk not to try and stage them before they are built. +# Note: this is rare +NO_BEFOREBUILD_INCLUDES= + .include .SUFFIXES: .h .c .x .hx Index: kerberos5/lib/libhdb/Makefile =================================================================== --- kerberos5/lib/libhdb/Makefile +++ kerberos5/lib/libhdb/Makefile @@ -1,4 +1,4 @@ -# $FreeBSD: head/kerberos5/lib/libhdb/Makefile 283160 2015-05-20 18:56:29Z bapt $ +# $FreeBSD: projects/bmake/kerberos5/lib/libhdb/Makefile 284241 2015-06-10 19:48:45Z sjg $ LIB= hdb LDFLAGS= -Wl,--no-undefined @@ -96,6 +96,11 @@ .hx.h: ${CP} ${.IMPSRC} ${.TARGET} +# This makefile generates a lot of its headers +# so tell bsd.sys.mk not to try and stage them before they are built. +# Note: this is rare +NO_BEFOREBUILD_INCLUDES= + .include .SUFFIXES: .h .c .x .hx Index: kerberos5/lib/libheimipcc/Makefile =================================================================== --- kerberos5/lib/libheimipcc/Makefile +++ kerberos5/lib/libheimipcc/Makefile @@ -1,4 +1,4 @@ -#$FreeBSD: head/kerberos5/lib/libheimipcc/Makefile 275022 2014-11-25 09:57:42Z bapt $ +#$FreeBSD: projects/bmake/kerberos5/lib/libheimipcc/Makefile 283595 2015-05-27 01:19:58Z sjg $ LIB= heimipcc PRIVATELIB= @@ -10,7 +10,8 @@ CFLAGS+= -I${KRB5DIR}/lib/roken \ -I${KRB5DIR}/base \ - -I${KRB5DIR}/lib/ipc + -I${KRB5DIR}/lib/ipc \ + -I${KRB5DIR}/include .include Index: kerberos5/lib/libhx509/Makefile =================================================================== --- kerberos5/lib/libhx509/Makefile +++ kerberos5/lib/libhx509/Makefile @@ -1,4 +1,4 @@ -# $FreeBSD: head/kerberos5/lib/libhx509/Makefile 277273 2015-01-16 21:39:08Z will $ +# $FreeBSD: projects/bmake/kerberos5/lib/libhx509/Makefile 284242 2015-06-10 19:51:35Z sjg $ LIB= hx509 LDFLAGS= -Wl,--no-undefined @@ -290,8 +290,14 @@ .hx.h: ${CP} ${.IMPSRC} ${.TARGET} +# This makefile generates a lot of its headers +# so tell bsd.sys.mk not to try and stage them before they are built. +# Note: this is rare +NO_BEFOREBUILD_INCLUDES= + .include .SUFFIXES: .h .c .x .hx .PATH: ${KRB5DIR}/lib/hx509 ${KRB5DIR}/lib/asn1 ${KRB5DIR}/doc/doxyout/hx509/man/man3 + Index: lib/clang/clang.build.mk =================================================================== --- lib/clang/clang.build.mk +++ lib/clang/clang.build.mk @@ -1,4 +1,4 @@ -# $FreeBSD: head/lib/clang/clang.build.mk 280031 2015-03-15 13:31:13Z dim $ +# $FreeBSD: projects/bmake/lib/clang/clang.build.mk 283595 2015-05-27 01:19:58Z sjg $ .include @@ -39,8 +39,28 @@ .PATH: ${LLVM_SRCS}/${SRCDIR} +#.info ${MACHINE BOOTSTRAPPING_TOOLS LEGACY_TOOLS:L:@v@$v=${$v}@} +.if empty(TOOLSDIR) || !exists(${TOOLSDIR}/usr/bin/clang-tblgen) +.if ${MACHINE} == "host" && defined(BOOTSTRAPPING_TOOLS) +.if !empty(LEGACY_TOOLS) && exists(${LEGACY_TOOLS}/usr/bin/tblgen) +TOOLSDIR= ${LEGACY_TOOLS} +.endif +.endif +.if ${MK_STAGING} == "yes" && exists(${STAGE_HOST_OBJTOP:Uno}/usr/bin/tblgen) +TOOLSDIR= ${STAGE_HOST_OBJTOP} +.endif +.if exists(${LEGACY_TOOLS:Uno}/usr/bin/tblgen) +TOOLSDIR= ${LEGACY_TOOLS} +.endif +.endif +TOOLSDIR?= +.if !empty(TOOLSDIR) && exists(${TOOLSDIR}/usr/bin/clang-tblgen) +TBLGEN= ${TOOLSDIR}/usr/bin/tblgen +CLANG_TBLGEN= ${TOOLSDIR}/usr/bin/clang-tblgen +.endif TBLGEN?= tblgen CLANG_TBLGEN?= clang-tblgen +#.info ${TOOLSDIR TBLGEN CLANG_TBLGEN:L:@v@$v=${$v}@} Intrinsics.inc.h: ${LLVM_SRCS}/include/llvm/IR/Intrinsics.td ${TBLGEN} -gen-intrinsic \ @@ -227,3 +247,7 @@ SRCS+= ${TGHDRS:C/$/.inc.h/} DPSRCS+= ${TGHDRS:C/$/.inc.h/} CLEANFILES+= ${TGHDRS:C/$/.inc.h/} ${TGHDRS:C/$/.inc.d/} + +# if we are not doing explicit 'make depend', there is +# nothing to cause these to be generated. +beforebuild: ${SRCS:M*.inc.h} Index: lib/clang/include/Makefile =================================================================== --- lib/clang/include/Makefile +++ lib/clang/include/Makefile @@ -1,4 +1,4 @@ -# $FreeBSD: head/lib/clang/include/Makefile 283526 2015-05-25 13:43:03Z dim $ +# $FreeBSD: projects/bmake/lib/clang/include/Makefile 283595 2015-05-27 01:19:58Z sjg $ .include @@ -8,7 +8,7 @@ .PATH: ${LLVM_SRCS}/tools/clang/lib/Headers -INCSDIR=${LIBDIR}/clang/3.6.1/include +INCSDIR=${LIBDIR}/clang/3.6.0/include INCS= __stddef_max_align_t.h \ __wmmintrin_aes.h \ @@ -56,4 +56,7 @@ GENINCS= arm_neon.h CLEANFILES= ${GENINCS} +# avoid a circular dependency +GENDIRDEPS_FILTER+= Nusr.bin/clang/clang-tblgen.host + .include Index: lib/csu/Makefile.inc =================================================================== --- lib/csu/Makefile.inc +++ lib/csu/Makefile.inc @@ -1,4 +1,4 @@ -# $FreeBSD: head/lib/csu/Makefile.inc 249657 2013-04-19 19:45:00Z ed $ +# $FreeBSD: projects/bmake/lib/csu/Makefile.inc 275338 2014-11-30 18:42:29Z sjg $ SSP_CFLAGS= @@ -7,3 +7,8 @@ NO_WMISSING_VARIABLE_DECLARATIONS= .include "../Makefile.inc" + +.if ${MK_STAGING} == "yes" && ${.TARGETS:Nall} == "" +FILES?= ${OBJS} +FILESDIR?= ${LIBDIR} +.endif Index: lib/libc++/Makefile =================================================================== --- lib/libc++/Makefile +++ lib/libc++/Makefile @@ -1,4 +1,4 @@ -# $FreeBSD: head/lib/libc++/Makefile 277217 2015-01-15 21:17:36Z dim $ +# $FreeBSD: projects/bmake/lib/libc++/Makefile 283595 2015-05-27 01:19:58Z sjg $ .include @@ -208,4 +208,8 @@ ${.OBJDIR}/libstdc++.a .endif +# avoid cyclic dependency +CFLAGS+= -I${LIBCXXRTDIR} +GENDIRDEPS_FILTER= N*/libcxxrt + .include Index: lib/libc/Makefile =================================================================== --- lib/libc/Makefile +++ lib/libc/Makefile @@ -1,5 +1,5 @@ # @(#)Makefile 8.2 (Berkeley) 2/3/94 -# $FreeBSD: head/lib/libc/Makefile 282057 2015-04-27 06:49:27Z ngie $ +# $FreeBSD: projects/bmake/lib/libc/Makefile 283595 2015-05-27 01:19:58Z sjg $ SHLIBDIR?= /lib @@ -163,6 +163,24 @@ .include +.if !defined(_SKIP_BUILD) +# We need libutil.h, get it directly to avoid +# recording a build dependency +CFLAGS+= -I${.CURDIR:H}/libutil +# Same issue with libm +MSUN_ARCH_SUBDIR != ${MAKE} -B -C ${.CURDIR:H}/msun -V ARCH_SUBDIR +# unfortunately msun/src contains both private and public headers +CFLAGS+= -I${.CURDIR:H}/msun/${MSUN_ARCH_SUBDIR} +.if ${MACHINE_CPUARCH} == "i386" || ${MACHINE_CPUARCH} == "amd64" +CFLAGS+= -I${.CURDIR:H}/msun/x86 +.endif +CFLAGS+= -I${.CURDIR:H}/msun/src +# and we do not want to record a dependency on msun +.if ${.MAKE.LEVEL} > 0 +GENDIRDEPS_FILTER+= N${RELDIR:H}/msun +.endif +.endif + # Disable warnings in contributed sources. CWARNFLAGS:= ${.IMPSRC:Ngdtoa_*.c:C/^.+$/${CWARNFLAGS}/:C/^$/-w/} # XXX For now, we don't allow libc to be compiled with Index: lib/libcrypt/tests/crypt_tests.c =================================================================== --- lib/libcrypt/tests/crypt_tests.c +++ lib/libcrypt/tests/crypt_tests.c @@ -1,8 +1,7 @@ #include -__FBSDID("$FreeBSD: head/lib/libcrypt/tests/crypt_tests.c 256365 2013-10-12 06:06:53Z rpaulo $"); +__FBSDID("$FreeBSD: projects/bmake/lib/libcrypt/tests/crypt_tests.c 283774 2015-05-30 17:24:41Z sjg $"); #include -#include #include #include Index: lib/libpam/Makefile =================================================================== --- lib/libpam/Makefile +++ lib/libpam/Makefile @@ -22,10 +22,10 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: head/lib/libpam/Makefile 112044 2003-03-09 20:06:38Z obrien $ +# $FreeBSD: projects/bmake/lib/libpam/Makefile 245892 2013-01-24 19:09:38Z sjg $ # The modules must be built first, because they are built into the # static version of libpam. -SUBDIR+= modules libpam +SUBDIR+= modules libpam static_modules .include Index: lib/libpam/libpam/Makefile =================================================================== --- lib/libpam/libpam/Makefile +++ lib/libpam/libpam/Makefile @@ -33,7 +33,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: head/lib/libpam/libpam/Makefile 274138 2014-11-05 16:13:42Z des $ +# $FreeBSD: projects/bmake/lib/libpam/libpam/Makefile 274692 2014-11-19 07:09:14Z sjg $ OPENPAM= ${.CURDIR}/../../../contrib/openpam .PATH: ${OPENPAM}/include ${OPENPAM}/lib/libpam ${OPENPAM}/doc/man @@ -172,33 +172,12 @@ ADD_HEADERS= security/pam_mod_misc.h -# -# Static modules -# -# We build static versions of all modules and of openpam_static.o, -# then link them all together into openpam_static_modules.o. None of -# the modules export any symbols, but they store structures with -# pointers to their service functions in a linker set which the code -# in openpam_static.c traverses to locate the individual modules. -# -MODULE_DIR= ../modules -.include "${.CURDIR}/${MODULE_DIR}/modules.inc" -STATIC_MODULES= ${MODULES:C/.*/${MODULE_DIR}\/&\/lib&.a/} -STATICOBJS+= openpam_static_modules.o -CLEANFILES+= openpam_static.o \ - openpam_static_modules.o - -openpam_static_modules.o: openpam_static.o ${STATIC_MODULES} - ${LD} -o ${.TARGET} -r --whole-archive ${.ALLSRC} - -# We can't put openpam_static.c in SRCS, but we still want to scan it -# for dependencies. -DPSRCS= openpam_static.c - # Headers INCS= ${HEADERS} ${ADD_HEADERS} INCSDIR= ${INCLUDEDIR}/security +.include + .if ${MK_TESTS} != "no" SUBDIR+= tests .endif Index: lib/libproc/Makefile =================================================================== --- lib/libproc/Makefile +++ lib/libproc/Makefile @@ -1,4 +1,4 @@ -# $FreeBSD: head/lib/libproc/Makefile 283132 2015-05-19 22:23:15Z bapt $ +# $FreeBSD: projects/bmake/lib/libproc/Makefile 283595 2015-05-27 01:19:58Z sjg $ .include @@ -14,6 +14,9 @@ INCS= libproc.h CFLAGS+= -I${.CURDIR} +# avoid cyclic dependency +CFLAGS+= -I${.CURDIR:H}/librtld_db +GENDIRDEPS_FILTER+= Nlib/librtld_db .if ${MK_CXX} == "no" CFLAGS+= -DNO_CXA_DEMANGLE Index: lib/libtelnet/Makefile =================================================================== --- lib/libtelnet/Makefile +++ lib/libtelnet/Makefile @@ -1,5 +1,5 @@ # From: @(#)Makefile 8.2 (Berkeley) 12/15/93 -# $FreeBSD: head/lib/libtelnet/Makefile 267147 2014-06-06 04:09:07Z imp $ +# $FreeBSD: projects/bmake/lib/libtelnet/Makefile 270164 2014-08-19 06:50:54Z sjg $ .include @@ -26,7 +26,4 @@ CFLAGS+= -DFORWARD -Dnet_write=telnet_net_write .endif -INCS= ${TELNETDIR}/arpa/telnet.h -INCSDIR= ${INCLUDEDIR}/arpa - .include Index: lib/msun/Makefile =================================================================== --- lib/msun/Makefile +++ lib/msun/Makefile @@ -1,5 +1,5 @@ # @(#)Makefile 5.1beta 93/09/24 -# $FreeBSD: head/lib/msun/Makefile 282057 2015-04-27 06:49:27Z ngie $ +# $FreeBSD: projects/bmake/lib/msun/Makefile 283595 2015-05-27 01:19:58Z sjg $ # # ==================================================== # Copyright (C) 1993 by Sun Microsystems, Inc. All rights reserved. @@ -35,6 +35,8 @@ CFLAGS+= -I${.CURDIR}/ld128 .endif +CFLAGS+= -I${.CURDIR}/${ARCH_SUBDIR} + .PATH: ${.CURDIR}/bsdsrc .PATH: ${.CURDIR}/src .PATH: ${.CURDIR}/man Index: lib/ncurses/ncurses/Makefile =================================================================== --- lib/ncurses/ncurses/Makefile +++ lib/ncurses/ncurses/Makefile @@ -1,4 +1,4 @@ -# $FreeBSD: head/lib/ncurses/ncurses/Makefile 268351 2014-07-07 00:27:09Z marcel $ +# $FreeBSD: projects/bmake/lib/ncurses/ncurses/Makefile 270164 2014-08-19 06:50:54Z sjg $ SHLIBDIR?= /lib @@ -308,6 +308,7 @@ SYMLINKS+= libncurses${LIB_SUFFIX}_p.a ${LIBDIR}/libtinfo${LIB_SUFFIX}_p.a .endif +.if ${.CURDIR:T} == "ncurses" .if defined(ENABLE_WIDEC) DOCSDIR= ${SHAREDIR}/doc/ncurses DOCS= ncurses-intro.html hackguide.html @@ -317,6 +318,7 @@ .PATH: ${NCURSES_DIR}/doc/html FILESGROUPS= DOCS .endif +.endif # Generated source .ORDER: names.c codes.c Index: libexec/save-entropy/Makefile =================================================================== --- libexec/save-entropy/Makefile +++ libexec/save-entropy/Makefile @@ -1,6 +1,5 @@ -# $FreeBSD: head/libexec/save-entropy/Makefile 139103 2004-12-21 08:47:35Z ru $ +# $FreeBSD: projects/bmake/libexec/save-entropy/Makefile 256421 2013-10-13 00:27:34Z sjg $ SCRIPTS= save-entropy.sh -NO_OBJ= .include Index: rescue/rescue/Makefile =================================================================== --- rescue/rescue/Makefile +++ rescue/rescue/Makefile @@ -1,4 +1,4 @@ -#$FreeBSD: head/rescue/rescue/Makefile 279219 2015-02-23 21:59:30Z ken $ +#$FreeBSD: projects/bmake/rescue/rescue/Makefile 284208 2015-06-10 05:30:13Z sjg $ # @(#)Makefile 8.1 (Berkeley) 6/2/93 .include Index: sbin/atm/atmconfig/Makefile =================================================================== --- sbin/atm/atmconfig/Makefile +++ sbin/atm/atmconfig/Makefile @@ -3,7 +3,7 @@ # All rights reserved. # Author: Harti Brandt # -# $FreeBSD: head/sbin/atm/atmconfig/Makefile 275030 2014-11-25 11:23:12Z bapt $ +# $FreeBSD: projects/bmake/sbin/atm/atmconfig/Makefile 284223 2015-06-10 13:57:11Z sjg $ .include Index: share/colldef/Makefile =================================================================== --- share/colldef/Makefile +++ share/colldef/Makefile @@ -1,4 +1,4 @@ -# $FreeBSD: head/share/colldef/Makefile 196788 2009-09-03 16:53:11Z ache $ +# $FreeBSD: projects/bmake/share/colldef/Makefile 245831 2013-01-23 00:49:05Z sjg $ LOCALES= bg_BG.CP1251 \ be_BY.CP1131 \ @@ -109,7 +109,7 @@ .for enc2 in ${ENCODINGS} .for lang_terr in ${${enc1}_${enc2}} SYMLINKS+= ../${lang_terr:C/:.*$//}.${enc1}/${FILESNAME} \ - ${LOCALEDIR}/${lang_terr:C/^.*://}.${enc2} + ${LOCALEDIR}/${lang_terr:C/^.*://}.${enc2}/${FILESNAME} .endfor .endfor .endfor Index: share/dict/Makefile =================================================================== --- share/dict/Makefile +++ share/dict/Makefile @@ -1,7 +1,5 @@ # @(#)Makefile 8.1 (Berkeley) 6/5/93 -# $FreeBSD: head/share/dict/Makefile 139103 2004-12-21 08:47:35Z ru $ - -NO_OBJ= +# $FreeBSD: projects/bmake/share/dict/Makefile 256421 2013-10-13 00:27:34Z sjg $ # XXX MISSING: connectives words FILES= README propernames web2 web2a freebsd Index: share/dtrace/toolkit/Makefile =================================================================== --- share/dtrace/toolkit/Makefile +++ share/dtrace/toolkit/Makefile @@ -1,4 +1,4 @@ -#$FreeBSD: head/share/dtrace/toolkit/Makefile 269764 2014-08-09 20:25:17Z jmg $ +#$FreeBSD: projects/bmake/share/dtrace/toolkit/Makefile 284224 2015-06-10 14:08:36Z sjg $ # # Install scripts from the DTraceToolkit # @@ -12,6 +12,4 @@ SCRIPTSDIR= ${SHAREDIR}/dtrace/toolkit -NO_OBJ= - .include Index: share/examples/pf/Makefile =================================================================== --- share/examples/pf/Makefile +++ share/examples/pf/Makefile @@ -1,6 +1,4 @@ -# $FreeBSD: head/share/examples/pf/Makefile 173536 2007-11-11 01:16:51Z mlaier $ - -NO_OBJ= +# $FreeBSD: projects/bmake/share/examples/pf/Makefile 284224 2015-06-10 14:08:36Z sjg $ FILES= faq-example1 faq-example2 faq-example3 \ ackpri queue1 queue2 queue3 queue4 \ Index: share/i18n/csmapper/Makefile.inc =================================================================== --- share/i18n/csmapper/Makefile.inc +++ share/i18n/csmapper/Makefile.inc @@ -1,4 +1,9 @@ -# $FreeBSD: head/share/i18n/csmapper/Makefile.inc 219019 2011-02-25 00:04:39Z gabor $ +# $FreeBSD: projects/bmake/share/i18n/csmapper/Makefile.inc 256700 2013-10-17 20:02:36Z sjg $ + +.include CSMAPPERDIR?= /usr/share/i18n/csmapper +.if ${MK_STAGING} == "yes" +MKCSMAPPER= ${STAGE_HOST_OBJTOP}/usr/bin/mkcsmapper_static +.endif MKCSMAPPER?= ${.OBJDIR}/../../../usr.bin/mkcsmapper_static/mkcsmapper_static Index: share/i18n/esdb/Makefile.inc =================================================================== --- share/i18n/esdb/Makefile.inc +++ share/i18n/esdb/Makefile.inc @@ -1,6 +1,11 @@ -# $FreeBSD: head/share/i18n/esdb/Makefile.inc 219019 2011-02-25 00:04:39Z gabor $ +# $FreeBSD: projects/bmake/share/i18n/esdb/Makefile.inc 256700 2013-10-17 20:02:36Z sjg $ + +.include .PATH: ${.CURDIR} ESDBDIR?= /usr/share/i18n/esdb +.if ${MK_STAGING} == "yes" +MKESDB= ${STAGE_HOST_OBJTOP}/usr/bin/mkesdb_static +.endif MKESDB?= ${.OBJDIR}/../../../usr.bin/mkesdb_static/mkesdb_static Index: share/misc/Makefile =================================================================== --- share/misc/Makefile +++ share/misc/Makefile @@ -1,5 +1,5 @@ # From: @(#)Makefile 8.1 (Berkeley) 6/8/93 -# $FreeBSD: head/share/misc/Makefile 278202 2015-02-04 11:43:19Z ngie $ +# $FreeBSD: projects/bmake/share/misc/Makefile 283595 2015-05-27 01:19:58Z sjg $ .include @@ -11,7 +11,6 @@ scsi_modes \ organization.dot -NO_OBJ= FILESDIR= ${BINDIR}/misc .if ${MK_USB} != "no" Index: share/mklocale/Makefile =================================================================== --- share/mklocale/Makefile +++ share/mklocale/Makefile @@ -1,4 +1,4 @@ -# $FreeBSD: head/share/mklocale/Makefile 196790 2009-09-03 17:12:45Z ache $ +# $FreeBSD: projects/bmake/share/mklocale/Makefile 245831 2013-01-23 00:49:05Z sjg $ LOCALES= UTF-8 \ am_ET.UTF-8 \ @@ -94,7 +94,7 @@ .for enc2 in ${ENCODINGS} .for lang_terr in ${${enc1}_${enc2}} SYMLINKS+= ../${lang_terr:C/:.*$//:C/.+$/&./}${enc1}/${FILESNAME} \ - ${LOCALEDIR}/${lang_terr:C/^.*://}.${enc2} + ${LOCALEDIR}/${lang_terr:C/^.*://}.${enc2}/${FILESNAME} .endfor .endfor .endfor Index: share/monetdef/Makefile =================================================================== --- share/monetdef/Makefile +++ share/monetdef/Makefile @@ -1,4 +1,4 @@ -# $FreeBSD: head/share/monetdef/Makefile 253425 2013-07-17 14:00:51Z bapt $ +# $FreeBSD: projects/bmake/share/monetdef/Makefile 255263 2013-09-05 20:18:59Z sjg $ LOCALES= af_ZA.ISO8859-1 \ am_ET.UTF-8 \ @@ -138,7 +138,7 @@ .for enc2 in ${ENCODINGS} .for lang_terr in ${${enc1}_${enc2}} SYMLINKS+= ../${lang_terr:C/:.*$//}.${enc1}/${FILESNAME} \ - ${LOCALEDIR}/${lang_terr:C/^.*://}.${enc2} + ${LOCALEDIR}/${lang_terr:C/^.*://}.${enc2}/${FILESNAME} .endfor .endfor .endfor Index: share/msgdef/Makefile =================================================================== --- share/msgdef/Makefile +++ share/msgdef/Makefile @@ -1,4 +1,4 @@ -# $FreeBSD: head/share/msgdef/Makefile 245889 2013-01-24 17:00:11Z brooks $ +# $FreeBSD: projects/bmake/share/msgdef/Makefile 246555 2013-02-08 16:10:16Z obrien $ LOCALES= af_ZA.ISO8859-1 \ am_ET.UTF-8 \ @@ -129,7 +129,7 @@ .for enc2 in ${ENCODINGS} .for lang_terr in ${${enc1}_${enc2}} SYMLINKS+= ../${lang_terr:C/:.*$//}.${enc1}/${FILESNAME} \ - ${LOCALEDIR}/${lang_terr:C/^.*://}.${enc2} + ${LOCALEDIR}/${lang_terr:C/^.*://}.${enc2}/${FILESNAME} .endfor .endfor .endfor Index: share/numericdef/Makefile =================================================================== --- share/numericdef/Makefile +++ share/numericdef/Makefile @@ -1,4 +1,4 @@ -# $FreeBSD: head/share/numericdef/Makefile 245889 2013-01-24 17:00:11Z brooks $ +# $FreeBSD: projects/bmake/share/numericdef/Makefile 246555 2013-02-08 16:10:16Z obrien $ LOCALES= af_ZA.ISO8859-1 \ am_ET.UTF-8 \ @@ -124,7 +124,7 @@ .for enc2 in ${ENCODINGS} .for lang_terr in ${${enc1}_${enc2}} SYMLINKS+= ../${lang_terr:C/:.*$//}.${enc1}/${FILESNAME} \ - ${LOCALEDIR}/${lang_terr:C/^.*://}.${enc2} + ${LOCALEDIR}/${lang_terr:C/^.*://}.${enc2}/${FILESNAME} .endfor .endfor .endfor Index: share/sendmail/Makefile =================================================================== --- share/sendmail/Makefile +++ share/sendmail/Makefile @@ -1,4 +1,4 @@ -# $FreeBSD: head/share/sendmail/Makefile 179460 2008-05-31 19:15:15Z remko $ +# $FreeBSD: projects/bmake/share/sendmail/Makefile 284224 2015-06-10 14:08:36Z sjg $ # # Doing a make install builds /usr/share/sendmail/ @@ -9,8 +9,6 @@ DDIR= ${DESTDIR}/usr/share/sendmail -NO_OBJ= - # Define SHARED to indicate whether you want symbolic links to the system # source (``symlinks''), or a separate copy (``copies'') SHARED?= copies Index: share/skel/Makefile =================================================================== --- share/skel/Makefile +++ share/skel/Makefile @@ -1,5 +1,5 @@ # @(#)Makefile 8.1 (Berkeley) 6/8/93 -# $FreeBSD: head/share/skel/Makefile 139103 2004-12-21 08:47:35Z ru $ +# $FreeBSD: projects/bmake/share/skel/Makefile 256421 2013-10-13 00:27:34Z sjg $ FILESGROUPS= FILES1 FILES2 FILES1= dot.cshrc dot.login dot.login_conf dot.mailrc dot.profile \ @@ -9,6 +9,5 @@ FILES2DIR= /usr/share/skel FILES1MODE= 0644 FILES2MODE= 0600 -NO_OBJ= .include Index: share/snmp/mibs/Makefile =================================================================== --- share/snmp/mibs/Makefile +++ share/snmp/mibs/Makefile @@ -1,7 +1,6 @@ -# $FreeBSD: head/share/snmp/mibs/Makefile 139103 2004-12-21 08:47:35Z ru $ +# $FreeBSD: projects/bmake/share/snmp/mibs/Makefile 256421 2013-10-13 00:27:34Z sjg $ FILES= FREEBSD-MIB.txt -NO_OBJ= FILESDIR= ${SHAREDIR}/snmp/mibs .include Index: share/syscons/fonts/Makefile =================================================================== --- share/syscons/fonts/Makefile +++ share/syscons/fonts/Makefile @@ -1,4 +1,4 @@ -# $FreeBSD: head/share/syscons/fonts/Makefile 215991 2010-11-28 09:35:56Z delphij $ +# $FreeBSD: projects/bmake/share/syscons/fonts/Makefile 284209 2015-06-10 05:39:06Z sjg $ FILES= armscii8-8x8.fnt armscii8-8x14.fnt armscii8-8x16.fnt \ cp437-8x8.fnt cp437-8x14.fnt cp437-8x16.fnt \ @@ -32,6 +32,4 @@ FILESDIR= ${SHAREDIR}/syscons/fonts -NO_OBJ= - .include Index: share/syscons/keymaps/Makefile =================================================================== --- share/syscons/keymaps/Makefile +++ share/syscons/keymaps/Makefile @@ -1,4 +1,4 @@ -# $FreeBSD: head/share/syscons/keymaps/Makefile 243935 2012-12-06 01:44:19Z eadler $ +# $FreeBSD: projects/bmake/share/syscons/keymaps/Makefile 284210 2015-06-10 05:39:48Z sjg $ FILES= INDEX.keymaps \ be.iso.kbd be.iso.acc.kbd \ @@ -52,6 +52,4 @@ FILESDIR= ${SHAREDIR}/syscons/keymaps -NO_OBJ= - .include Index: share/timedef/Makefile =================================================================== --- share/timedef/Makefile +++ share/timedef/Makefile @@ -1,4 +1,4 @@ -# $FreeBSD: head/share/timedef/Makefile 196814 2009-09-04 06:26:40Z ache $ +# $FreeBSD: projects/bmake/share/timedef/Makefile 245831 2013-01-23 00:49:05Z sjg $ LOCALES= am_ET.UTF-8 \ be_BY.CP1131 \ @@ -148,7 +148,7 @@ .for enc2 in ${ENCODINGS} .for lang_terr in ${${enc1}_${enc2}} SYMLINKS+= ../${lang_terr:C/:.*$//}.${enc1}/${FILESNAME} \ - ${LOCALEDIR}/${lang_terr:C/^.*://}.${enc2} + ${LOCALEDIR}/${lang_terr:C/^.*://}.${enc2}/${FILESNAME} .endfor .endfor .endfor Index: sys/conf/kmod.mk =================================================================== --- sys/conf/kmod.mk +++ sys/conf/kmod.mk @@ -1,5 +1,5 @@ # From: @(#)bsd.prog.mk 5.26 (Berkeley) 6/25/91 -# $FreeBSD: head/sys/conf/kmod.mk 283670 2015-05-28 22:01:50Z jhb $ +# $FreeBSD: projects/bmake/sys/conf/kmod.mk 283595 2015-05-27 01:19:58Z sjg $ # # The include file handles building and installing loadable # kernel modules. @@ -253,12 +253,10 @@ .error "can't find kernel source tree" .endif -.for _link in ${_ILINKS} -.PHONY: ${_link} -${_link}: ${.OBJDIR}/${_link} +.NOPATH: ${_ILINKS} -${.OBJDIR}/${_link}: - @case ${.TARGET:T} in \ +${_ILINKS}: + @case ${.TARGET} in \ machine) \ path=${SYSDIR}/${MACHINE}/include ;; \ *) \ @@ -267,7 +265,6 @@ path=`(cd $$path && /bin/pwd)` ; \ ${ECHO} ${.TARGET:T} "->" $$path ; \ ln -sf $$path ${.TARGET:T} -.endfor CLEANFILES+= ${PROG} ${KMOD}.kld ${OBJS} @@ -349,7 +346,7 @@ dev/mbox/mbox_if.m dev/mmc/mmcbr_if.m dev/mmc/mmcbus_if.m \ dev/mii/miibus_if.m dev/mvs/mvs_if.m dev/ofw/ofw_bus_if.m \ dev/pccard/card_if.m dev/pccard/power_if.m dev/pci/pci_if.m \ - dev/pci/pci_iov_if.m dev/pci/pcib_if.m dev/ppbus/ppbus_if.m \ + dev/pci/pcib_if.m dev/ppbus/ppbus_if.m \ dev/sdhci/sdhci_if.m dev/smbus/smbus_if.m dev/spibus/spibus_if.m \ dev/sound/pci/hda/hdac_if.m \ dev/sound/pcm/ac97_if.m dev/sound/pcm/channel_if.m \ Index: tools/build/mk/Makefile.boot =================================================================== --- tools/build/mk/Makefile.boot +++ tools/build/mk/Makefile.boot @@ -1,6 +1,9 @@ -# $FreeBSD: head/tools/build/mk/Makefile.boot 142640 2005-02-27 11:22:58Z ru $ +# $FreeBSD: projects/bmake/tools/build/mk/Makefile.boot 239572 2012-08-22 19:25:57Z marcel $ CFLAGS+= -I${WORLDTMP}/legacy/usr/include DPADD+= ${WORLDTMP}/legacy/usr/lib/libegacy.a LDADD+= -legacy LDFLAGS+= -L${WORLDTMP}/legacy/usr/lib + +# we do not want to capture dependencies refering to the above +UPDATE_DEPENDFILE= no Index: usr.bin/alias/Makefile =================================================================== --- usr.bin/alias/Makefile +++ usr.bin/alias/Makefile @@ -1,8 +1,7 @@ -# $FreeBSD: head/usr.bin/alias/Makefile 207196 2010-04-25 17:38:53Z jilles $ +# $FreeBSD: projects/bmake/usr.bin/alias/Makefile 256421 2013-10-13 00:27:34Z sjg $ SCRIPTS=generic.sh SCRIPTSNAME=alias -NO_OBJ= LINKS= ${BINDIR}/alias ${BINDIR}/bg \ ${BINDIR}/alias ${BINDIR}/cd \ Index: usr.bin/bmake/Makefile.inc =================================================================== --- usr.bin/bmake/Makefile.inc +++ usr.bin/bmake/Makefile.inc @@ -1,4 +1,4 @@ -# $FreeBSD: head/usr.bin/bmake/Makefile.inc 266147 2014-05-15 15:45:45Z imp $ +# $FreeBSD: projects/bmake/usr.bin/bmake/Makefile.inc 270164 2014-08-19 06:50:54Z sjg $ .sinclude @@ -21,4 +21,4 @@ .endif WARNS=3 -CFLAGS+= -DNO_PWD_OVERRIDE +CFLAGS+= -DNO_PWD_OVERRIDE ${DBG} Index: usr.bin/clang/clang.prog.mk =================================================================== --- usr.bin/clang/clang.prog.mk +++ usr.bin/clang/clang.prog.mk @@ -1,4 +1,4 @@ -# $FreeBSD: head/usr.bin/clang/clang.prog.mk 270168 2014-08-19 15:04:32Z bdrewery $ +# $FreeBSD: projects/bmake/usr.bin/clang/clang.prog.mk 274683 2014-11-19 01:07:58Z sjg $ LLVM_SRCS= ${.CURDIR}/../../../contrib/llvm @@ -14,4 +14,9 @@ BINDIR?= /usr/bin + +.if ${MK_SHARED_TOOLCHAIN} == "no" +NO_SHARED= yes +.endif + .include Index: usr.bin/kdump/Makefile =================================================================== --- usr.bin/kdump/Makefile +++ usr.bin/kdump/Makefile @@ -1,8 +1,12 @@ # @(#)Makefile 8.1 (Berkeley) 6/6/93 -# $FreeBSD: head/usr.bin/kdump/Makefile 283430 2015-05-24 16:22:03Z dchagin $ +# $FreeBSD: projects/bmake/usr.bin/kdump/Makefile 283595 2015-05-27 01:19:58Z sjg $ .include +.if (${MACHINE_ARCH} == "amd64") +SFX= 32 +.endif + .PATH: ${.CURDIR}/../ktrace PROG= kdump @@ -26,27 +30,20 @@ .if (${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "i386") CLEANFILES+= linux_syscalls.c .endif -.if (${MACHINE_ARCH} == "amd64") -CLEANFILES+= linux32_syscalls.c -.endif ioctl.c: mkioctls env MACHINE=${MACHINE} CPP="${CPP}" \ - sh ${.CURDIR}/mkioctls print ${DESTDIR}/usr/include > ${.TARGET} + sh ${.CURDIR}/mkioctls print ${DESTDIR}${INCLUDEDIR} > ${.TARGET} kdump_subr.h: mksubr - sh ${.CURDIR}/mksubr ${DESTDIR}/usr/include | \ + sh ${.CURDIR}/mksubr ${DESTDIR}${INCLUDEDIR} | \ sed -n 's/^\([a-z].*)\)$$/void \1;/p' >${.TARGET} kdump_subr.c: mksubr kdump_subr.h - sh ${.CURDIR}/mksubr ${DESTDIR}/usr/include >${.TARGET} + sh ${.CURDIR}/mksubr ${DESTDIR}${INCLUDEDIR} >${.TARGET} .if (${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "i386") sh ${.CURDIR}/../../sys/kern/makesyscalls.sh \ - ${.CURDIR}/../../sys/${MACHINE_ARCH}/linux/syscalls.master ${.CURDIR}/linux_syscalls.conf -.endif -.if (${MACHINE_ARCH} == "amd64") - sh ${.CURDIR}/../../sys/kern/makesyscalls.sh \ - ${.CURDIR}/../../sys/${MACHINE_ARCH}/linux32/syscalls.master ${.CURDIR}/linux32_syscalls.conf + ${.CURDIR}/../../sys/${MACHINE_ARCH}/linux${SFX}/syscalls.master ${.CURDIR}/linux_syscalls.conf .endif .include Index: usr.bin/kdump/mkioctls =================================================================== --- usr.bin/kdump/mkioctls +++ usr.bin/kdump/mkioctls @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: head/usr.bin/kdump/mkioctls 281143 2015-04-06 09:42:23Z glebius $ +# $FreeBSD: projects/bmake/usr.bin/kdump/mkioctls 283595 2015-05-27 01:19:58Z sjg $ # # When editing this script, keep in mind that truss also uses it. # @@ -39,7 +39,7 @@ esac awk -v x="$ioctl_includes" 'BEGIN {print x}' | - $CPP -I$1 -dM -DCOMPAT_43TTY - | + $CPP -nostdinc -I$1 -dM -DCOMPAT_43TTY - | awk -v ioctl_includes="$ioctl_includes" -v style="$style" ' BEGIN { print "/* XXX obnoxious prerequisites. */" Index: usr.bin/mkcsmapper_static/Makefile =================================================================== --- usr.bin/mkcsmapper_static/Makefile +++ usr.bin/mkcsmapper_static/Makefile @@ -1,4 +1,4 @@ -# $FreeBSD: head/usr.bin/mkcsmapper_static/Makefile 264400 2014-04-13 05:21:56Z imp $ +# $FreeBSD: projects/bmake/usr.bin/mkcsmapper_static/Makefile 265044 2014-04-28 07:50:45Z sjg $ .PATH: ${.CURDIR}/../../lib/libc/iconv ${.CURDIR}/../mkcsmapper @@ -7,6 +7,7 @@ citrus_lookup_factory.c citrus_pivot_factory.c MAN= NO_SHARED= yes +NO_WARNS= yes build-tools: mkcsmapper_static Index: usr.bin/mkesdb_static/Makefile =================================================================== --- usr.bin/mkesdb_static/Makefile +++ usr.bin/mkesdb_static/Makefile @@ -1,4 +1,4 @@ -# $FreeBSD: head/usr.bin/mkesdb_static/Makefile 264400 2014-04-13 05:21:56Z imp $ +# $FreeBSD: projects/bmake/usr.bin/mkesdb_static/Makefile 265044 2014-04-28 07:50:45Z sjg $ .PATH: ${.CURDIR}/../../lib/libc/iconv ${.CURDIR}/../mkesdb @@ -7,6 +7,7 @@ citrus_lookup_factory.c MAN= NO_SHARED= yes +NO_WARNS= yes build-tools: mkesdb_static Index: usr.bin/top/Makefile =================================================================== --- usr.bin/top/Makefile +++ usr.bin/top/Makefile @@ -1,4 +1,4 @@ -# $FreeBSD: head/usr.bin/top/Makefile 275042 2014-11-25 14:29:10Z bapt $ +# $FreeBSD: projects/bmake/usr.bin/top/Makefile 283595 2015-05-27 01:19:58Z sjg $ TOPDIR= ${.CURDIR}/../../contrib/top .PATH: ${TOPDIR} @@ -25,7 +25,8 @@ CLEANFILES= sigdesc.h SIGCONV_AWK= ${.CURDIR}/../../contrib/top/sigconv.awk -SIGNAL_H= ${DESTDIR}/usr/include/sys/signal.h +STAGED_INCLUDE_DIR?= ${DESTDIR}/usr/include +SIGNAL_H= ${STAGED_INCLUDE_DIR}/sys/signal.h sigdesc.h: ${SIGCONV_AWK} ${SIGNAL_H} awk -f ${SIGCONV_AWK} < ${SIGNAL_H} > ${.TARGET} Index: usr.bin/truss/Makefile =================================================================== --- usr.bin/truss/Makefile +++ usr.bin/truss/Makefile @@ -1,4 +1,4 @@ -# $FreeBSD: head/usr.bin/truss/Makefile 234060 2012-04-09 15:34:22Z dim $ +# $FreeBSD: projects/bmake/usr.bin/truss/Makefile 250424 2013-05-09 22:28:16Z sjg $ NO_WERROR= PROG= truss @@ -24,7 +24,7 @@ ioctl.c: ${.CURDIR}/../kdump/mkioctls env MACHINE=${MACHINE} CPP="${CPP}" \ - /bin/sh ${.CURDIR}/../kdump/mkioctls return ${DESTDIR}/usr/include > ${.TARGET} + /bin/sh ${.CURDIR}/../kdump/mkioctls return ${DESTDIR}${INCLUDEDIR} > ${.TARGET} .if ${MACHINE_CPUARCH} == "i386" SRCS+= i386-linux.c linux_syscalls.h Index: usr.sbin/pc-sysinstall/backend-partmanager/Makefile =================================================================== --- usr.sbin/pc-sysinstall/backend-partmanager/Makefile +++ usr.sbin/pc-sysinstall/backend-partmanager/Makefile @@ -1,8 +1,7 @@ -# $FreeBSD: head/usr.sbin/pc-sysinstall/backend-partmanager/Makefile 209527 2010-06-25 22:35:19Z imp $ +# $FreeBSD: projects/bmake/usr.sbin/pc-sysinstall/backend-partmanager/Makefile 256421 2013-10-13 00:27:34Z sjg $ FILES= create-part.sh delete-part.sh FILESMODE= ${BINMODE} FILESDIR=${SHAREDIR}/pc-sysinstall/backend-partmanager -NO_OBJ= .include Index: usr.sbin/pc-sysinstall/backend-query/Makefile =================================================================== --- usr.sbin/pc-sysinstall/backend-query/Makefile +++ usr.sbin/pc-sysinstall/backend-query/Makefile @@ -1,4 +1,4 @@ -# $FreeBSD: head/usr.sbin/pc-sysinstall/backend-query/Makefile 211485 2010-08-19 05:59:27Z imp $ +# $FreeBSD: projects/bmake/usr.sbin/pc-sysinstall/backend-query/Makefile 256421 2013-10-13 00:27:34Z sjg $ FILES= detect-laptop.sh detect-nics.sh detect-emulation.sh disk-info.sh \ disk-list.sh disk-part.sh enable-net.sh get-packages.sh list-config.sh \ @@ -8,6 +8,5 @@ xkeyboard-models.sh xkeyboard-variants.sh FILESMODE= ${BINMODE} FILESDIR=${SHAREDIR}/pc-sysinstall/backend-query -NO_OBJ= .include Index: usr.sbin/pc-sysinstall/backend/Makefile =================================================================== --- usr.sbin/pc-sysinstall/backend/Makefile +++ usr.sbin/pc-sysinstall/backend/Makefile @@ -1,4 +1,4 @@ -# $FreeBSD: head/usr.sbin/pc-sysinstall/backend/Makefile 212337 2010-09-08 20:10:24Z imp $ +# $FreeBSD: projects/bmake/usr.sbin/pc-sysinstall/backend/Makefile 256421 2013-10-13 00:27:34Z sjg $ FILES= functions-bsdlabel.sh functions-cleanup.sh functions-disk.sh \ functions-extractimage.sh functions-ftp.sh functions-installcomponents.sh \ @@ -10,6 +10,5 @@ functions.sh parseconfig.sh startautoinstall.sh installimage.sh FILESMODE= ${BINMODE} FILESDIR=${SHAREDIR}/pc-sysinstall/backend -NO_OBJ= .include Index: usr.sbin/pc-sysinstall/conf/Makefile =================================================================== --- usr.sbin/pc-sysinstall/conf/Makefile +++ usr.sbin/pc-sysinstall/conf/Makefile @@ -1,6 +1,4 @@ -# $FreeBSD: head/usr.sbin/pc-sysinstall/conf/Makefile 209514 2010-06-24 22:29:36Z imp $ - -NO_OBJ= +# $FreeBSD: projects/bmake/usr.sbin/pc-sysinstall/conf/Makefile 284224 2015-06-10 14:08:36Z sjg $ FILESGROUPS= CONF LICENSE CONF= exclude-from-upgrade pc-sysinstall.conf avail-langs Index: usr.sbin/pc-sysinstall/examples/Makefile =================================================================== --- usr.sbin/pc-sysinstall/examples/Makefile +++ usr.sbin/pc-sysinstall/examples/Makefile @@ -1,4 +1,4 @@ -# $FreeBSD: head/usr.sbin/pc-sysinstall/examples/Makefile 209513 2010-06-24 22:21:47Z imp $ +# $FreeBSD: projects/bmake/usr.sbin/pc-sysinstall/examples/Makefile 256421 2013-10-13 00:27:34Z sjg $ FILES= README pc-autoinstall.conf pcinstall.cfg.fbsd-netinstall \ pcinstall.cfg.geli pcinstall.cfg.gmirror pcinstall.cfg.netinstall \ @@ -6,6 +6,5 @@ pcinstall.cfg.zfs FILESDIR=${SHAREDIR}/examples/pc-sysinstall -NO_OBJ= .include