diff options
Diffstat (limited to 'targets/pseudo')
52 files changed, 109 insertions, 79 deletions
diff --git a/targets/pseudo/Makefile.inc b/targets/pseudo/Makefile.inc index 40f3828ec7d4..5173461eae71 100644 --- a/targets/pseudo/Makefile.inc +++ b/targets/pseudo/Makefile.inc @@ -1,13 +1,7 @@ -# $FreeBSD$ # we don't do anything in these dirs # they are just for triggering building of other things UPDATE_DEPENDFILE= no -.if !target(all) all: - @echo Done! -.endif - - diff --git a/targets/pseudo/bootstrap-tools/Makefile b/targets/pseudo/bootstrap-tools/Makefile index d5545f082283..4c6bd8bc275f 100644 --- a/targets/pseudo/bootstrap-tools/Makefile +++ b/targets/pseudo/bootstrap-tools/Makefile @@ -1,4 +1,3 @@ -# $FreeBSD$ # building clang is particularly tedious - so avoid re-inventing wheels @@ -90,6 +89,7 @@ BSTCENV= \ BSTCARGS= \ ${BSARGS:NDESTDIR=*:NOBJTOP=*:NOBJROOT=*:NMK_CROSS_COMPILER=*:NMK_CLANG=*} \ BUILD_DIRDEPS=yes \ + LLVM_MIN_TBLGEN=${TOOLSDIR}/usr/bin/llvm-min-tblgen \ LLVM_TBLGEN=${TOOLSDIR}/usr/bin/llvm-tblgen \ CLANG_TBLGEN=${TOOLSDIR}/usr/bin/clang-tblgen \ -DWITH_STAGING \ diff --git a/targets/pseudo/bootstrap-tools/Makefile.depend.host b/targets/pseudo/bootstrap-tools/Makefile.depend.host index aa5205f50b98..d3ddeb5c1b80 100644 --- a/targets/pseudo/bootstrap-tools/Makefile.depend.host +++ b/targets/pseudo/bootstrap-tools/Makefile.depend.host @@ -1,4 +1,3 @@ -# $FreeBSD$ # This file is not autogenerated - take care! diff --git a/targets/pseudo/clang/Makefile b/targets/pseudo/clang/Makefile index 265f86d1ed55..d3b5cbd3a79b 100644 --- a/targets/pseudo/clang/Makefile +++ b/targets/pseudo/clang/Makefile @@ -1,3 +1,2 @@ -# $FreeBSD$ .include "../Makefile.inc" diff --git a/targets/pseudo/clang/Makefile.depend b/targets/pseudo/clang/Makefile.depend index 29ac41e06ef2..7b094a258fa0 100644 --- a/targets/pseudo/clang/Makefile.depend +++ b/targets/pseudo/clang/Makefile.depend @@ -1,4 +1,3 @@ -# $FreeBSD$ # This file is not autogenerated - take care! @@ -9,6 +8,7 @@ DIRDEPS = \ share/doc/llvm/clang \ usr.bin/clang/clang \ usr.bin/clang/clang-tblgen \ + usr.bin/clang/llvm-min-tblgen \ usr.bin/clang/llvm-objdump \ usr.bin/clang/llvm-tblgen \ diff --git a/targets/pseudo/gcc/Makefile b/targets/pseudo/gcc/Makefile index 265f86d1ed55..d3b5cbd3a79b 100644 --- a/targets/pseudo/gcc/Makefile +++ b/targets/pseudo/gcc/Makefile @@ -1,3 +1,2 @@ -# $FreeBSD$ .include "../Makefile.inc" diff --git a/targets/pseudo/gcc/Makefile.depend b/targets/pseudo/gcc/Makefile.depend index daf2dfc0f95e..19e6d638291f 100644 --- a/targets/pseudo/gcc/Makefile.depend +++ b/targets/pseudo/gcc/Makefile.depend @@ -1,4 +1,3 @@ -# $FreeBSD$ # This file is not autogenerated - take care! diff --git a/targets/pseudo/host-tools/Makefile b/targets/pseudo/host-tools/Makefile new file mode 100644 index 000000000000..01b5f23410c8 --- /dev/null +++ b/targets/pseudo/host-tools/Makefile @@ -0,0 +1 @@ +.include "../Makefile.inc" diff --git a/targets/pseudo/host-tools/Makefile.depend.host b/targets/pseudo/host-tools/Makefile.depend.host new file mode 100644 index 000000000000..7ec04928d055 --- /dev/null +++ b/targets/pseudo/host-tools/Makefile.depend.host @@ -0,0 +1,17 @@ +DIRDEPS= \ + sbin/md5 \ + usr.bin/awk \ + usr.bin/cap_mkdb \ + usr.bin/file2c \ + usr.bin/lex \ + usr.bin/mkdep \ + usr.bin/mkimg \ + usr.bin/rpcgen \ + usr.bin/sed \ + usr.bin/tar \ + usr.bin/yacc \ + usr.sbin/makefs \ + usr.sbin/nmtree \ + +.include <dirdeps.mk> + diff --git a/targets/pseudo/hosttools/Makefile b/targets/pseudo/hosttools/Makefile index 265f86d1ed55..d3b5cbd3a79b 100644 --- a/targets/pseudo/hosttools/Makefile +++ b/targets/pseudo/hosttools/Makefile @@ -1,3 +1,2 @@ -# $FreeBSD$ .include "../Makefile.inc" diff --git a/targets/pseudo/hosttools/Makefile.depend.host b/targets/pseudo/hosttools/Makefile.depend.host index 3d6ab127eec9..a54437970d59 100644 --- a/targets/pseudo/hosttools/Makefile.depend.host +++ b/targets/pseudo/hosttools/Makefile.depend.host @@ -1,4 +1,3 @@ -# $FreeBSD$ # This file is not autogenerated - take care! @@ -10,6 +9,7 @@ DIRDEPS = \ usr.bin/clang/clang-tblgen \ + usr.bin/clang/llvm-min-tblgen \ usr.bin/clang/llvm-tblgen \ usr.bin/localedef \ usr.bin/mkcsmapper \ diff --git a/targets/pseudo/kernel/Makefile b/targets/pseudo/kernel/Makefile index 586e349184ab..052532a532f4 100644 --- a/targets/pseudo/kernel/Makefile +++ b/targets/pseudo/kernel/Makefile @@ -1,4 +1,3 @@ -# $FreeBSD$ # Build the kernel ${KERNCONF} KERNCONF?= ${KERNEL:UGENERIC} diff --git a/targets/pseudo/kernel/Makefile.depend b/targets/pseudo/kernel/Makefile.depend index 3ab3962f7470..5a4e8b865e18 100644 --- a/targets/pseudo/kernel/Makefile.depend +++ b/targets/pseudo/kernel/Makefile.depend @@ -1,4 +1,3 @@ -# $FreeBSD$ # This file is not autogenerated - take care! diff --git a/targets/pseudo/loader/Makefile b/targets/pseudo/loader/Makefile new file mode 100644 index 000000000000..01b5f23410c8 --- /dev/null +++ b/targets/pseudo/loader/Makefile @@ -0,0 +1 @@ +.include "../Makefile.inc" diff --git a/targets/pseudo/loader/Makefile.depend.amd64 b/targets/pseudo/loader/Makefile.depend.amd64 new file mode 100644 index 000000000000..8e9a786ba236 --- /dev/null +++ b/targets/pseudo/loader/Makefile.depend.amd64 @@ -0,0 +1,7 @@ +# This file is not autogenerated - take care! + +DIRDEPS = \ + stand/efi/loader \ + + +.include <dirdeps.mk> diff --git a/targets/pseudo/loader/Makefile.depend.arm b/targets/pseudo/loader/Makefile.depend.arm new file mode 100644 index 000000000000..d23148b537fe --- /dev/null +++ b/targets/pseudo/loader/Makefile.depend.arm @@ -0,0 +1,8 @@ +# This file is not autogenerated - take care! + +DIRDEPS = \ + stand/efi/loader \ + stand/uboot \ + + +.include <dirdeps.mk> diff --git a/targets/pseudo/loader/Makefile.depend.arm64 b/targets/pseudo/loader/Makefile.depend.arm64 new file mode 100644 index 000000000000..8e9a786ba236 --- /dev/null +++ b/targets/pseudo/loader/Makefile.depend.arm64 @@ -0,0 +1,7 @@ +# This file is not autogenerated - take care! + +DIRDEPS = \ + stand/efi/loader \ + + +.include <dirdeps.mk> diff --git a/targets/pseudo/loader/Makefile.depend.i386 b/targets/pseudo/loader/Makefile.depend.i386 new file mode 100644 index 000000000000..29a2092b8203 --- /dev/null +++ b/targets/pseudo/loader/Makefile.depend.i386 @@ -0,0 +1,7 @@ +# This file is not autogenerated - take care! + +DIRDEPS = \ + stand/i386/loader \ + + +.include <dirdeps.mk> diff --git a/targets/pseudo/loader/Makefile.depend.powerpc b/targets/pseudo/loader/Makefile.depend.powerpc new file mode 100644 index 000000000000..6c481c73d253 --- /dev/null +++ b/targets/pseudo/loader/Makefile.depend.powerpc @@ -0,0 +1,7 @@ +# This file is not autogenerated - take care! + +DIRDEPS = \ + stand/uboot \ + + +.include <dirdeps.mk> diff --git a/targets/pseudo/loader/Makefile.depend.riscv b/targets/pseudo/loader/Makefile.depend.riscv new file mode 100644 index 000000000000..8e9a786ba236 --- /dev/null +++ b/targets/pseudo/loader/Makefile.depend.riscv @@ -0,0 +1,7 @@ +# This file is not autogenerated - take care! + +DIRDEPS = \ + stand/efi/loader \ + + +.include <dirdeps.mk> diff --git a/targets/pseudo/stage/Makefile b/targets/pseudo/stage/Makefile index ed3217d9f743..ac02e1c9099e 100644 --- a/targets/pseudo/stage/Makefile +++ b/targets/pseudo/stage/Makefile @@ -1,9 +1,9 @@ -# $FreeBSD$ # this makefile gets hooked into everyone's dependencies so that # distrib-dirs can be done in STAGE_OBJTOP all: +.if ${.MAKE.OS} == "FreeBSD" # mtree makes a lot of noise if we are not root, # we don't need to see it. stage-distrib-dirs: .META ${META_DEPS} @@ -11,6 +11,21 @@ stage-distrib-dirs: .META ${META_DEPS} INSTALL="sh ${SRCTOP}/tools/install.sh" ${.MAKE} -C ${SRCTOP}/etc \ distrib-dirs -DNO_FSCHG -DWITH_TESTS DESTDIR=${STAGE_OBJTOP} +.else +std_dirs= \ + /bin \ + /etc \ + /sbin \ + /usr/bin \ + /usr/include/sys \ + /usr/lib \ + /usr/sbin \ + +stage-distrib-dirs: .META + mkdir -p ${std_dirs:@d@${STAGE_OBJTOP}$d@} + +.endif + .include <bsd.prog.mk> .if ${.MAKE.LEVEL} > 0 && ${MK_STAGING} == "yes" diff --git a/targets/pseudo/tests/Makefile b/targets/pseudo/tests/Makefile index 265f86d1ed55..d3b5cbd3a79b 100644 --- a/targets/pseudo/tests/Makefile +++ b/targets/pseudo/tests/Makefile @@ -1,3 +1,2 @@ -# $FreeBSD$ .include "../Makefile.inc" diff --git a/targets/pseudo/tests/Makefile.depend b/targets/pseudo/tests/Makefile.depend index 937b3d79f149..54aa2f7ff52f 100644 --- a/targets/pseudo/tests/Makefile.depend +++ b/targets/pseudo/tests/Makefile.depend @@ -1,4 +1,3 @@ -# $FreeBSD$ # This file is not autogenerated - take care! @@ -266,6 +265,7 @@ DIRDEPS= \ tests/sys/vm \ usr.bin/apply/tests \ usr.bin/basename/tests \ + usr.bin/bintrans/tests \ usr.bin/bmake/tests \ usr.bin/bmake/tests/archives \ usr.bin/bmake/tests/archives/fmt_44bsd \ @@ -358,8 +358,6 @@ DIRDEPS= \ usr.bin/truncate/tests \ usr.bin/uniq/tests \ usr.bin/units/tests \ - usr.bin/uudecode/tests \ - usr.bin/uuencode/tests \ usr.bin/xargs/tests \ usr.bin/xinstall/tests \ usr.bin/xo/tests \ diff --git a/targets/pseudo/the-lot/Makefile b/targets/pseudo/the-lot/Makefile index 265f86d1ed55..d3b5cbd3a79b 100644 --- a/targets/pseudo/the-lot/Makefile +++ b/targets/pseudo/the-lot/Makefile @@ -1,3 +1,2 @@ -# $FreeBSD$ .include "../Makefile.inc" diff --git a/targets/pseudo/the-lot/Makefile.depend b/targets/pseudo/the-lot/Makefile.depend index 6903eab45d38..5ffafd8f7ecb 100644 --- a/targets/pseudo/the-lot/Makefile.depend +++ b/targets/pseudo/the-lot/Makefile.depend @@ -1,4 +1,3 @@ -# $FreeBSD$ .include <src.opts.mk> diff --git a/targets/pseudo/toolchain/Makefile b/targets/pseudo/toolchain/Makefile index 265f86d1ed55..d3b5cbd3a79b 100644 --- a/targets/pseudo/toolchain/Makefile +++ b/targets/pseudo/toolchain/Makefile @@ -1,3 +1,2 @@ -# $FreeBSD$ .include "../Makefile.inc" diff --git a/targets/pseudo/toolchain/Makefile.depend b/targets/pseudo/toolchain/Makefile.depend index 9ac651b4963b..286b072dfcd9 100644 --- a/targets/pseudo/toolchain/Makefile.depend +++ b/targets/pseudo/toolchain/Makefile.depend @@ -1,4 +1,3 @@ -# $FreeBSD$ # This file is not autogenerated - take care! diff --git a/targets/pseudo/universe/Makefile b/targets/pseudo/universe/Makefile index 838c4a4178c4..1a9e17ffa122 100644 --- a/targets/pseudo/universe/Makefile +++ b/targets/pseudo/universe/Makefile @@ -1,4 +1,3 @@ -# $FreeBSD$ # This target is "special". # diff --git a/targets/pseudo/universe/Makefile.depend b/targets/pseudo/universe/Makefile.depend index a7d141f7fc4f..f2a6736ad994 100644 --- a/targets/pseudo/universe/Makefile.depend +++ b/targets/pseudo/universe/Makefile.depend @@ -1,4 +1,3 @@ -# $FreeBSD$ # This file is not autogenerated - take care! diff --git a/targets/pseudo/userland/Makefile b/targets/pseudo/userland/Makefile index 265f86d1ed55..d3b5cbd3a79b 100644 --- a/targets/pseudo/userland/Makefile +++ b/targets/pseudo/userland/Makefile @@ -1,3 +1,2 @@ -# $FreeBSD$ .include "../Makefile.inc" diff --git a/targets/pseudo/userland/Makefile.depend b/targets/pseudo/userland/Makefile.depend index 42b196559040..f6733e3228b4 100644 --- a/targets/pseudo/userland/Makefile.depend +++ b/targets/pseudo/userland/Makefile.depend @@ -1,4 +1,3 @@ -# $FreeBSD$ # This file is not autogenerated - take care! @@ -69,7 +68,6 @@ DIRDEPS+= \ sbin/fsck_msdosfs \ sbin/fsdb \ sbin/fsirand \ - sbin/gbde \ sbin/geom/core \ sbin/ggate/ggatec \ sbin/ggate/ggated \ @@ -147,6 +145,7 @@ DIRDEPS+= \ usr.bin/basename \ usr.bin/bc \ usr.bin/biff \ + usr.bin/bintrans \ usr.bin/bluetooth/bthost \ usr.bin/bluetooth/btsockstat \ usr.bin/bluetooth/rfcomm_sppd \ @@ -365,8 +364,6 @@ DIRDEPS+= \ usr.bin/usbhidaction \ usr.bin/usbhidctl \ usr.bin/users \ - usr.bin/uudecode \ - usr.bin/uuencode \ usr.bin/vacation \ usr.bin/vgrind \ usr.bin/vi \ @@ -646,9 +643,6 @@ DIRDEPS+= \ usr.sbin/pmccontrol \ usr.sbin/pmcstat \ usr.sbin/pmcstudy \ - usr.sbin/portsnap/make_index \ - usr.sbin/portsnap/phttpget \ - usr.sbin/portsnap/portsnap \ usr.sbin/powerd \ usr.sbin/ppp \ usr.sbin/pppctl \ @@ -701,7 +695,6 @@ DIRDEPS+= \ usr.sbin/timed/timedc \ usr.sbin/traceroute \ usr.sbin/traceroute6 \ - usr.sbin/trpt \ usr.sbin/tzsetup \ usr.sbin/uathload \ usr.sbin/uefisign \ @@ -786,7 +779,6 @@ DIRDEPS.i386= \ sbin/bsdlabel \ sbin/fdisk \ sbin/nvmecontrol \ - sbin/sconfig \ usr.sbin/apm \ usr.sbin/apmd \ usr.sbin/btxld \ @@ -807,17 +799,6 @@ DIRDEPS.arm64= \ usr.sbin/acpi \ usr.sbin/ofwdump -DIRDEPS.mips= \ - sbin/bsdlabel \ - sbin/fdisk - -DIRDEPS.sparc64= \ - sbin/bsdlabel \ - sbin/sunlabel \ - usr.sbin/eeprom \ - usr.sbin/ofwdump \ - usr.sbin/sade - DIRDEPS.powerpc= \ usr.sbin/nvram \ usr.sbin/ofwdump diff --git a/targets/pseudo/userland/Makefile.inc b/targets/pseudo/userland/Makefile.inc index 265f86d1ed55..d3b5cbd3a79b 100644 --- a/targets/pseudo/userland/Makefile.inc +++ b/targets/pseudo/userland/Makefile.inc @@ -1,3 +1,2 @@ -# $FreeBSD$ .include "../Makefile.inc" diff --git a/targets/pseudo/userland/cddl/Makefile b/targets/pseudo/userland/cddl/Makefile index 265f86d1ed55..d3b5cbd3a79b 100644 --- a/targets/pseudo/userland/cddl/Makefile +++ b/targets/pseudo/userland/cddl/Makefile @@ -1,3 +1,2 @@ -# $FreeBSD$ .include "../Makefile.inc" diff --git a/targets/pseudo/userland/cddl/Makefile.depend b/targets/pseudo/userland/cddl/Makefile.depend index b24b1bbf63d5..41042893cb79 100644 --- a/targets/pseudo/userland/cddl/Makefile.depend +++ b/targets/pseudo/userland/cddl/Makefile.depend @@ -1,4 +1,3 @@ -# $FreeBSD$ # This file is not autogenerated - take care! diff --git a/targets/pseudo/userland/games/Makefile b/targets/pseudo/userland/games/Makefile index 265f86d1ed55..d3b5cbd3a79b 100644 --- a/targets/pseudo/userland/games/Makefile +++ b/targets/pseudo/userland/games/Makefile @@ -1,3 +1,2 @@ -# $FreeBSD$ .include "../Makefile.inc" diff --git a/targets/pseudo/userland/games/Makefile.depend b/targets/pseudo/userland/games/Makefile.depend index 151a3686f827..13227c60e0ce 100644 --- a/targets/pseudo/userland/games/Makefile.depend +++ b/targets/pseudo/userland/games/Makefile.depend @@ -1,4 +1,3 @@ -# $FreeBSD$ # This file is not autogenerated - take care! diff --git a/targets/pseudo/userland/gnu/Makefile b/targets/pseudo/userland/gnu/Makefile index 265f86d1ed55..d3b5cbd3a79b 100644 --- a/targets/pseudo/userland/gnu/Makefile +++ b/targets/pseudo/userland/gnu/Makefile @@ -1,3 +1,2 @@ -# $FreeBSD$ .include "../Makefile.inc" diff --git a/targets/pseudo/userland/gnu/Makefile.depend b/targets/pseudo/userland/gnu/Makefile.depend index d0007cbc8efd..33ca85f86e69 100644 --- a/targets/pseudo/userland/gnu/Makefile.depend +++ b/targets/pseudo/userland/gnu/Makefile.depend @@ -1,4 +1,3 @@ -# $FreeBSD$ .include "${SRCTOP}/share/mk/src.opts.mk" diff --git a/targets/pseudo/userland/include/Makefile b/targets/pseudo/userland/include/Makefile index 265f86d1ed55..d3b5cbd3a79b 100644 --- a/targets/pseudo/userland/include/Makefile +++ b/targets/pseudo/userland/include/Makefile @@ -1,3 +1,2 @@ -# $FreeBSD$ .include "../Makefile.inc" diff --git a/targets/pseudo/userland/include/Makefile.depend b/targets/pseudo/userland/include/Makefile.depend index 73999ca2fb64..6bbeb95c6474 100644 --- a/targets/pseudo/userland/include/Makefile.depend +++ b/targets/pseudo/userland/include/Makefile.depend @@ -1,4 +1,3 @@ -# $FreeBSD$ # This file is not autogenerated - take care! diff --git a/targets/pseudo/userland/kerberos5/Makefile b/targets/pseudo/userland/kerberos5/Makefile index 265f86d1ed55..d3b5cbd3a79b 100644 --- a/targets/pseudo/userland/kerberos5/Makefile +++ b/targets/pseudo/userland/kerberos5/Makefile @@ -1,3 +1,2 @@ -# $FreeBSD$ .include "../Makefile.inc" diff --git a/targets/pseudo/userland/kerberos5/Makefile.depend b/targets/pseudo/userland/kerberos5/Makefile.depend index 837087da09f9..09de4a621e5d 100644 --- a/targets/pseudo/userland/kerberos5/Makefile.depend +++ b/targets/pseudo/userland/kerberos5/Makefile.depend @@ -1,4 +1,3 @@ -# $FreeBSD$ # This file is not autogenerated - take care! diff --git a/targets/pseudo/userland/lib/Makefile b/targets/pseudo/userland/lib/Makefile index 265f86d1ed55..d3b5cbd3a79b 100644 --- a/targets/pseudo/userland/lib/Makefile +++ b/targets/pseudo/userland/lib/Makefile @@ -1,3 +1,2 @@ -# $FreeBSD$ .include "../Makefile.inc" diff --git a/targets/pseudo/userland/lib/Makefile.depend b/targets/pseudo/userland/lib/Makefile.depend index 4a5de018a311..5af2280ec053 100644 --- a/targets/pseudo/userland/lib/Makefile.depend +++ b/targets/pseudo/userland/lib/Makefile.depend @@ -1,9 +1,10 @@ -# $FreeBSD$ # This file is not autogenerated - take care! .include <src.opts.mk> +DEP_MACHINE_CPUARCH?= ${MACHINE_CPUARCH} + DIRDEPS = \ lib/${CSU_DIR} \ lib/atf/libatf-c \ @@ -35,9 +36,11 @@ DIRDEPS = \ lib/libalias/modules/smedia \ lib/libarchive \ lib/libauditd \ + lib/libbe \ lib/libbegemot \ lib/libblocksruntime \ lib/libbluetooth \ + lib/libbsddialog \ lib/libbsdstat \ lib/libbsm \ lib/libbsnmp/libbsnmp \ @@ -64,6 +67,7 @@ DIRDEPS = \ lib/libedit/edit/readline \ lib/libelf \ lib/libelftc \ + lib/libevent1 \ lib/libevent \ lib/libexecinfo \ lib/libexpat \ @@ -97,6 +101,7 @@ DIRDEPS = \ lib/libifconfig \ lib/libipsec \ lib/libipx \ + lib/libiscsiutil \ lib/libjail \ lib/libkiconv \ lib/libkvm \ @@ -107,11 +112,11 @@ DIRDEPS = \ lib/libmd \ lib/libmemstat \ lib/libmilter \ + lib/libmixer \ lib/libmp \ lib/libnetgraph \ lib/libngatm \ lib/libnv \ - lib/libopie \ lib/libpam/libpam \ lib/libpam/modules/pam_chroot \ lib/libpam/modules/pam_deny \ @@ -125,8 +130,6 @@ DIRDEPS = \ lib/libpam/modules/pam_lastlog \ lib/libpam/modules/pam_login_access \ lib/libpam/modules/pam_nologin \ - lib/libpam/modules/pam_opie \ - lib/libpam/modules/pam_opieaccess \ lib/libpam/modules/pam_passwdqc \ lib/libpam/modules/pam_permit \ lib/libpam/modules/pam_radius \ @@ -145,6 +148,7 @@ DIRDEPS = \ lib/libproc \ lib/libprocstat \ lib/libradius \ + lib/libregex \ lib/librpcsec_gss \ lib/librpcsvc \ lib/librss \ @@ -158,6 +162,7 @@ DIRDEPS = \ lib/libsmdb \ lib/libsmutil \ lib/libsqlite3 \ + lib/libstats \ lib/libstdbuf \ lib/libstdthreads \ lib/libsysdecode \ @@ -176,6 +181,7 @@ DIRDEPS = \ lib/libvgl \ lib/libvmmapi \ lib/libwrap \ + lib/libxo \ lib/liby \ lib/libyaml \ lib/libypclnt \ @@ -192,8 +198,8 @@ DIRDEPS = \ lib/ncurses/panelw \ .if ${MK_CLANG} != "no" && \ - (${MACHINE_CPUARCH} == "aarch64" || ${MACHINE_CPUARCH} == "amd64" || \ - ${MACHINE_CPUARCH} == "arm" || ${MACHINE_CPUARCH} == "i386") + (${DEP_MACHINE_CPUARCH} == "aarch64" || ${DEP_MACHINE_CPUARCH} == "amd64" || \ + ${DEP_MACHINE_CPUARCH} == "arm" || ${DEP_MACHINE_CPUARCH} == "i386") DIRDEPS+= \ lib/libclang_rt/asan-preinit \ lib/libclang_rt/asan \ @@ -209,8 +215,8 @@ DIRDEPS+= \ .endif -.if ${MACHINE_CPUARCH} == "amd64" || ${MACHINE_CPUARCH} == "i386" || \ - ${MACHINE_CPUARCH} == "powerpc" +.if ${DEP_MACHINE_CPUARCH} == "amd64" || ${DEP_MACHINE_CPUARCH} == "i386" || \ + ${DEP_MACHINE_CPUARCH} == "powerpc" DIRDEPS+= stand/libsa32 .endif @@ -250,4 +256,8 @@ DIRDEPS+= \ DIRDEPS+= lib/libblacklist .endif +.if ${MK_ZFS} != "no" +DIRDEPS+= cddl/lib/libzutil +.endif + .include <dirdeps.mk> diff --git a/targets/pseudo/userland/libexec/Makefile b/targets/pseudo/userland/libexec/Makefile index 265f86d1ed55..d3b5cbd3a79b 100644 --- a/targets/pseudo/userland/libexec/Makefile +++ b/targets/pseudo/userland/libexec/Makefile @@ -1,3 +1,2 @@ -# $FreeBSD$ .include "../Makefile.inc" diff --git a/targets/pseudo/userland/libexec/Makefile.depend b/targets/pseudo/userland/libexec/Makefile.depend index 4c1e7a118410..034e2a2ea08f 100644 --- a/targets/pseudo/userland/libexec/Makefile.depend +++ b/targets/pseudo/userland/libexec/Makefile.depend @@ -1,4 +1,3 @@ -# $FreeBSD$ # This file is not autogenerated - take care! @@ -34,7 +33,6 @@ DIRDEPS = \ libexec/smrsh \ libexec/talkd \ libexec/tcpd \ - libexec/telnetd \ libexec/tftp-proxy \ libexec/tftpd \ libexec/ulog-helper \ diff --git a/targets/pseudo/userland/misc/Makefile b/targets/pseudo/userland/misc/Makefile index 265f86d1ed55..d3b5cbd3a79b 100644 --- a/targets/pseudo/userland/misc/Makefile +++ b/targets/pseudo/userland/misc/Makefile @@ -1,3 +1,2 @@ -# $FreeBSD$ .include "../Makefile.inc" diff --git a/targets/pseudo/userland/misc/Makefile.depend b/targets/pseudo/userland/misc/Makefile.depend index a4723e8dff1b..203e446dca50 100644 --- a/targets/pseudo/userland/misc/Makefile.depend +++ b/targets/pseudo/userland/misc/Makefile.depend @@ -1,4 +1,3 @@ -# $FreeBSD$ # This file is not autogenerated - take care! @@ -6,6 +5,8 @@ .include <src.opts.mk> .endif +DEP_MACHINE?= ${MACHINE} + _sys_boot_efi= stand/efi/loader stand/efi/boot1 .if ${MK_FDT} != "no" _sys_boot_fdt= stand/fdt stand/efi/fdt @@ -85,9 +86,13 @@ DIRDEPS.arm= ${_sys_boot_fdt} ${_sys_boot_efi} DIRDEPS.arm64= ${_sys_boot_fdt} ${_sys_boot_efi} DIRDEPS.i386= ${DIRDEPS.x86sys} ${_sys_boot_efi} DIRDEPS.powerpc= ${_sys_boot_fdt} stand/libsa32 stand/ofw stand/uboot -DIRDEPS.sparc64= stand/ofw ${_sys_boot_zfs} .endif -DIRDEPS+= ${DIRDEPS.${MACHINE}:U} +DIRDEPS+= ${DIRDEPS.${DEP_MACHINE}:U} + +.if ${DEP_MACHINE} == "amd64" +# do not build stand/i386 for amd64 +DIRDEPS:= ${DIRDEPS:Nstand/i386*} ${DIRDEPS:Mstand/i386*:S/$/.i386,i386/} +.endif .include <dirdeps.mk> diff --git a/targets/pseudo/userland/secure/Makefile b/targets/pseudo/userland/secure/Makefile index 265f86d1ed55..d3b5cbd3a79b 100644 --- a/targets/pseudo/userland/secure/Makefile +++ b/targets/pseudo/userland/secure/Makefile @@ -1,3 +1,2 @@ -# $FreeBSD$ .include "../Makefile.inc" diff --git a/targets/pseudo/userland/secure/Makefile.depend b/targets/pseudo/userland/secure/Makefile.depend index b00e889489bb..f6bfb82ddd9c 100644 --- a/targets/pseudo/userland/secure/Makefile.depend +++ b/targets/pseudo/userland/secure/Makefile.depend @@ -1,4 +1,3 @@ -# $FreeBSD$ # This file is not autogenerated - take care! diff --git a/targets/pseudo/userland/share/Makefile b/targets/pseudo/userland/share/Makefile index 265f86d1ed55..d3b5cbd3a79b 100644 --- a/targets/pseudo/userland/share/Makefile +++ b/targets/pseudo/userland/share/Makefile @@ -1,3 +1,2 @@ -# $FreeBSD$ .include "../Makefile.inc" diff --git a/targets/pseudo/userland/share/Makefile.depend b/targets/pseudo/userland/share/Makefile.depend index 9946a8370552..a56f022ecdd7 100644 --- a/targets/pseudo/userland/share/Makefile.depend +++ b/targets/pseudo/userland/share/Makefile.depend @@ -1,4 +1,3 @@ -# $FreeBSD$ # This file is not autogenerated - take care! |