Index: stable/12/gnu/usr.bin/gperf/Makefile =================================================================== --- stable/12/gnu/usr.bin/gperf/Makefile (revision 365820) +++ stable/12/gnu/usr.bin/gperf/Makefile (revision 365821) @@ -1,17 +1,17 @@ # $FreeBSD$ .include GPERFDIR= ${SRCTOP}/contrib/gperf .PATH: ${GPERFDIR}/src ${GPERFDIR}/lib ${GPERFDIR}/doc PROG_CXX= gperf SRCS= bool-array.cc hash-table.cc input.cc keyword-list.cc keyword.cc \ main.cc options.cc output.cc positions.cc search.cc version.cc \ getline.cc hash.cc -WARNS= 1 +WARNS?= 1 MAN= gperf.1 gperf.7 CXXFLAGS+= -I${GPERFDIR}/lib -I${.CURDIR} .include Index: stable/12/lib/libc++/Makefile =================================================================== --- stable/12/lib/libc++/Makefile (revision 365820) +++ stable/12/lib/libc++/Makefile (revision 365821) @@ -1,270 +1,270 @@ # $FreeBSD$ .include PACKAGE= clibs _LIBCXXRTDIR= ${SRCTOP}/contrib/libcxxrt HDRDIR= ${SRCTOP}/contrib/llvm-project/libcxx/include SRCDIR= ${SRCTOP}/contrib/llvm-project/libcxx/src CXXINCLUDEDIR= ${INCLUDEDIR}/c++/v${SHLIB_MAJOR} .if ${MACHINE_CPUARCH} == "arm" STATIC_CXXFLAGS+= -mlong-calls .endif .PATH: ${SRCDIR} LIB= c++ SHLIB_MAJOR= 1 SHLIB_LDSCRIPT= libc++.ldscript SRCS+= algorithm.cpp SRCS+= any.cpp SRCS+= bind.cpp SRCS+= charconv.cpp SRCS+= chrono.cpp SRCS+= condition_variable.cpp SRCS+= condition_variable_destructor.cpp SRCS+= debug.cpp SRCS+= exception.cpp SRCS+= filesystem/directory_iterator.cpp SRCS+= filesystem/int128_builtins.cpp SRCS+= filesystem/operations.cpp SRCS+= functional.cpp SRCS+= future.cpp SRCS+= hash.cpp SRCS+= ios.cpp SRCS+= iostream.cpp SRCS+= locale.cpp SRCS+= memory.cpp SRCS+= mutex.cpp SRCS+= mutex_destructor.cpp SRCS+= new.cpp SRCS+= optional.cpp SRCS+= random.cpp SRCS+= regex.cpp SRCS+= shared_mutex.cpp SRCS+= stdexcept.cpp SRCS+= string.cpp SRCS+= strstream.cpp SRCS+= system_error.cpp SRCS+= thread.cpp SRCS+= typeinfo.cpp SRCS+= utility.cpp SRCS+= valarray.cpp SRCS+= variant.cpp SRCS+= vector.cpp CXXRT_SRCS+= auxhelper.cc CXXRT_SRCS+= dynamic_cast.cc CXXRT_SRCS+= exception.cc CXXRT_SRCS+= guard.cc CXXRT_SRCS+= libelftc_dem_gnu3.c CXXRT_SRCS+= memory.cc CXXRT_SRCS+= stdexcept.cc CXXRT_SRCS+= terminate.cc CXXRT_SRCS+= typeinfo.cc .for _S in ${CXXRT_SRCS} CLEANFILES+= cxxrt_${_S} STATICOBJS+= cxxrt_${_S:R}.o cxxrt_${_S}: ${_LIBCXXRTDIR}/${_S} .NOMETA ln -sf ${.ALLSRC} ${.TARGET} .endfor -WARNS= 0 +WARNS?= 0 CFLAGS+= -isystem ${HDRDIR} CFLAGS+= -isystem ${_LIBCXXRTDIR} CFLAGS+= -nostdinc++ CFLAGS+= -nostdlib CFLAGS+= -D_LIBCPP_BUILDING_LIBRARY CFLAGS+= -DLIBCXXRT CFLAGS+= -ffunction-sections CFLAGS+= -fdata-sections CXXSTD?= c++14 LIBADD+= cxxrt INCSGROUPS= STD EXP EXT STD_HEADERS+= __bit_reference STD_HEADERS+= __bsd_locale_defaults.h STD_HEADERS+= __bsd_locale_fallbacks.h STD_HEADERS+= __config STD_HEADERS+= __debug STD_HEADERS+= __errc STD_HEADERS+= __functional_03 STD_HEADERS+= __functional_base STD_HEADERS+= __functional_base_03 STD_HEADERS+= __hash_table STD_HEADERS+= __libcpp_version STD_HEADERS+= __locale STD_HEADERS+= __mutex_base STD_HEADERS+= __node_handle STD_HEADERS+= __nullptr STD_HEADERS+= __split_buffer STD_HEADERS+= __sso_allocator STD_HEADERS+= __std_stream STD_HEADERS+= __string STD_HEADERS+= __threading_support STD_HEADERS+= __tree STD_HEADERS+= __tuple STD_HEADERS+= __undef_macros STD_HEADERS+= algorithm STD_HEADERS+= any STD_HEADERS+= array STD_HEADERS+= atomic STD_HEADERS+= bit STD_HEADERS+= bitset STD_HEADERS+= cassert STD_HEADERS+= ccomplex STD_HEADERS+= cctype STD_HEADERS+= cerrno STD_HEADERS+= cfenv STD_HEADERS+= cfloat STD_HEADERS+= charconv STD_HEADERS+= chrono STD_HEADERS+= cinttypes STD_HEADERS+= ciso646 STD_HEADERS+= climits STD_HEADERS+= clocale STD_HEADERS+= cmath STD_HEADERS+= codecvt STD_HEADERS+= compare STD_HEADERS+= complex STD_HEADERS+= complex.h STD_HEADERS+= condition_variable STD_HEADERS+= csetjmp STD_HEADERS+= csignal STD_HEADERS+= cstdarg STD_HEADERS+= cstdbool STD_HEADERS+= cstddef STD_HEADERS+= cstdint STD_HEADERS+= cstdio STD_HEADERS+= cstdlib STD_HEADERS+= cstring STD_HEADERS+= ctgmath STD_HEADERS+= ctime STD_HEADERS+= ctype.h STD_HEADERS+= cwchar STD_HEADERS+= cwctype STD_HEADERS+= deque STD_HEADERS+= errno.h STD_HEADERS+= exception STD_HEADERS+= fenv.h STD_HEADERS+= filesystem STD_HEADERS+= float.h STD_HEADERS+= forward_list STD_HEADERS+= fstream STD_HEADERS+= functional STD_HEADERS+= future STD_HEADERS+= initializer_list STD_HEADERS+= inttypes.h STD_HEADERS+= iomanip STD_HEADERS+= ios STD_HEADERS+= iosfwd STD_HEADERS+= iostream STD_HEADERS+= istream STD_HEADERS+= iterator STD_HEADERS+= limits STD_HEADERS+= limits.h STD_HEADERS+= list STD_HEADERS+= locale STD_HEADERS+= locale.h STD_HEADERS+= map STD_HEADERS+= math.h STD_HEADERS+= memory STD_HEADERS+= mutex STD_HEADERS+= new STD_HEADERS+= numeric STD_HEADERS+= optional STD_HEADERS+= ostream STD_HEADERS+= queue STD_HEADERS+= random STD_HEADERS+= ratio STD_HEADERS+= regex STD_HEADERS+= scoped_allocator STD_HEADERS+= set STD_HEADERS+= setjmp.h STD_HEADERS+= shared_mutex STD_HEADERS+= span STD_HEADERS+= sstream STD_HEADERS+= stack STD_HEADERS+= stdbool.h STD_HEADERS+= stddef.h STD_HEADERS+= stdexcept STD_HEADERS+= stdint.h STD_HEADERS+= stdio.h STD_HEADERS+= stdlib.h STD_HEADERS+= streambuf STD_HEADERS+= string STD_HEADERS+= string.h STD_HEADERS+= string_view STD_HEADERS+= strstream STD_HEADERS+= system_error STD_HEADERS+= tgmath.h STD_HEADERS+= thread STD_HEADERS+= tuple STD_HEADERS+= type_traits STD_HEADERS+= typeindex STD_HEADERS+= typeinfo STD_HEADERS+= unordered_map STD_HEADERS+= unordered_set STD_HEADERS+= utility STD_HEADERS+= valarray STD_HEADERS+= variant STD_HEADERS+= vector STD_HEADERS+= version STD_HEADERS+= wchar.h STD_HEADERS+= wctype.h RT_HEADERS+= cxxabi.h RT_HEADERS+= unwind-arm.h RT_HEADERS+= unwind-itanium.h RT_HEADERS+= unwind.h .for hdr in ${STD_HEADERS} STD+= ${HDRDIR}/${hdr} INCSLINKS+= ../${hdr} ${CXXINCLUDEDIR}/tr1/${hdr} .endfor .for hdr in ${RT_HEADERS} STD+= ${_LIBCXXRTDIR}/${hdr} .endfor STDDIR= ${CXXINCLUDEDIR} EXP_HEADERS+= __config EXP_HEADERS+= __memory EXP_HEADERS+= algorithm EXP_HEADERS+= coroutine EXP_HEADERS+= deque EXP_HEADERS+= filesystem EXP_HEADERS+= forward_list EXP_HEADERS+= functional EXP_HEADERS+= iterator EXP_HEADERS+= list EXP_HEADERS+= map EXP_HEADERS+= memory_resource EXP_HEADERS+= propagate_const EXP_HEADERS+= regex EXP_HEADERS+= set EXP_HEADERS+= simd EXP_HEADERS+= string EXP_HEADERS+= type_traits EXP_HEADERS+= unordered_map EXP_HEADERS+= unordered_set EXP_HEADERS+= utility EXP_HEADERS+= vector .for hdr in ${EXP_HEADERS} EXP+= ${HDRDIR}/experimental/${hdr} .endfor EXPDIR= ${CXXINCLUDEDIR}/experimental EXT_HEADERS+= __hash EXT_HEADERS+= hash_map EXT_HEADERS+= hash_set .for hdr in ${EXT_HEADERS} EXT+= ${HDRDIR}/ext/${hdr} .endfor EXTDIR= ${CXXINCLUDEDIR}/ext .include Index: stable/12/lib/libcxxrt/Makefile =================================================================== --- stable/12/lib/libcxxrt/Makefile (revision 365820) +++ stable/12/lib/libcxxrt/Makefile (revision 365821) @@ -1,28 +1,28 @@ # $FreeBSD$ PACKAGE= clibs SRCDIR= ${SRCTOP}/contrib/libcxxrt SHLIB_MAJOR= 1 SHLIBDIR?= /lib .PATH: ${SRCDIR} LIB= cxxrt SRCS+= libelftc_dem_gnu3.c\ terminate.cc\ dynamic_cast.cc\ memory.cc\ auxhelper.cc\ exception.cc\ stdexcept.cc\ typeinfo.cc\ guard.cc -WARNS= 0 +WARNS?= 0 CFLAGS+= -isystem ${SRCDIR} -nostdinc++ CXXSTD?= c++14 VERSION_MAP= ${.CURDIR}/Version.map .include Index: stable/12/lib/libopenbsd/Makefile =================================================================== --- stable/12/lib/libopenbsd/Makefile (revision 365820) +++ stable/12/lib/libopenbsd/Makefile (revision 365821) @@ -1,15 +1,15 @@ # $FreeBSD$ PACKAGE=lib${LIB} LIB= openbsd SRCS= getdtablecount.c \ imsg-buffer.c \ imsg.c \ ohash.c INTERNALLIB= CFLAGS+= -I${.CURDIR} -WARNS= 3 +WARNS?= 3 .include Index: stable/12/lib/libsqlite3/Makefile =================================================================== --- stable/12/lib/libsqlite3/Makefile (revision 365820) +++ stable/12/lib/libsqlite3/Makefile (revision 365821) @@ -1,38 +1,38 @@ # $FreeBSD$ PACKAGE=lib${LIB} PRIVATELIB= yes LIB= sqlite3 SHLIB_MAJOR?= 0 LIBADD+= pthread SRCS= sqlite3.c INCS= sqlite3.h sqlite3ext.h SQLITE= ${SRCTOP}/contrib/sqlite3 .PATH: ${SQLITE} -WARNS= 3 +WARNS?= 3 CFLAGS+= -I${SQLITE} \ -DUSE_PREAD=1 \ -DSTDC_HEADERS=1 \ -DHAVE_SYS_TYPES_H=1 \ -DHAVE_SYS_STAT_H=1 \ -DHAVE_STDLIB_H=1 \ -DHAVE_STRING_H=1 \ -DHAVE_MEMORY_H=1 \ -DHAVE_STRINGS_H=1 \ -DHAVE_INTTYPES_H=1 \ -DHAVE_STDINT_H=1 \ -DHAVE_UNISTD_H=1 \ -DHAVE_DLFCN_H=1 \ -DHAVE_USLEEP=1 \ -DHAVE_LOCALTIME_R=1 \ -DHAVE_GMTIME_R=1 \ -DHAVE_DECL_STRERROR_R=1 \ -DHAVE_STRERROR_R=1 \ -DHAVE_POSIX_FALLOCATE=1 \ -D_REENTRANT=1 \ -DSQLITE_THREADSAFE=1 .include Index: stable/12/lib/libucl/Makefile =================================================================== --- stable/12/lib/libucl/Makefile (revision 365820) +++ stable/12/lib/libucl/Makefile (revision 365821) @@ -1,34 +1,34 @@ # $FreeBSD$ LIBUCL= ${SRCTOP}/contrib/libucl PACKAGE=lib${LIB} LIB= ucl PRIVATELIB= true SHLIB_MAJOR= 1 SRCS= ucl_emitter_streamline.c \ ucl_emitter_utils.c \ ucl_emitter.c \ ucl_hash.c \ ucl_msgpack.c \ ucl_parser.c \ ucl_schema.c \ ucl_sexp.c \ ucl_util.c .PATH: ${LIBUCL}/src \ ${LIBUCL}/include \ ${LIBUCL}/doc INCS= ucl.h LIBADD= m -WARNS= 1 +WARNS?= 1 CFLAGS+= -I${LIBUCL}/include \ -I${LIBUCL}/src \ -I${LIBUCL}/uthash \ -I${LIBUCL}/klib MAN+= libucl.3 .include Index: stable/12/lib/libzstd/Makefile =================================================================== --- stable/12/lib/libzstd/Makefile (revision 365820) +++ stable/12/lib/libzstd/Makefile (revision 365821) @@ -1,53 +1,53 @@ # $FreeBSD$ LIB= zstd SRCS= entropy_common.c \ error_private.c \ fse_decompress.c \ pool.c \ threading.c \ xxhash.c \ zstd_common.c \ fse_compress.c \ huf_compress.c \ zstd_compress.c \ zstdmt_compress.c \ huf_decompress.c \ zstd_decompress.c \ zbuff_common.c \ zbuff_compress.c \ zbuff_decompress.c \ cover.c \ divsufsort.c \ zdict.c \ zstd_fast.c \ zstd_lazy.c \ zstd_ldm.c \ zstd_opt.c \ zstd_double_fast.c -WARNS= 2 +WARNS?= 2 INCS= zstd.h CFLAGS+= -I${ZSTDDIR}/lib -I${ZSTDDIR}/lib/common -DXXH_NAMESPACE=ZSTD_ \ -DZSTD_MULTITHREAD=1 LIBADD= pthread PRIVATELIB= yes ZSTDDIR= ${SRCTOP}/sys/contrib/zstd .PATH: ${ZSTDDIR}/lib/common ${ZSTDDIR}/lib/compress \ ${ZSTDDIR}/lib/decompress ${ZSTDDIR}/lib/deprecated \ ${ZSTDDIR}/lib/dictBuilder ${ZSTDDIR}/lib # Work around for LLVM bug 35023, https://bugs.llvm.org/show_bug.cgi?id=35023 .if ${MACHINE_ARCH:Marm*} != "" CFLAGS.zstd_compress.c+= -O0 .endif # Work around lack of __bswap[sd]i2() intrinsics on riscv. Probably should be # added to one of the runtime C libraries instead. .if ${MACHINE_CPUARCH} == "riscv" .PATH: ${ZSTDDIR}/lib/freebsd SRCS+= zstd_kfreebsd.c .endif .include Index: stable/12/libexec/dma/dma-mbox-create/Makefile =================================================================== --- stable/12/libexec/dma/dma-mbox-create/Makefile (revision 365820) +++ stable/12/libexec/dma/dma-mbox-create/Makefile (revision 365821) @@ -1,10 +1,10 @@ # $FreeBSD$ MAN= -WARNS= 2 +WARNS?= 2 PROG= dma-mbox-create BINMODE= 4554 .include Index: stable/12/libexec/dma/dmagent/Makefile =================================================================== --- stable/12/libexec/dma/dmagent/Makefile (revision 365820) +++ stable/12/libexec/dma/dmagent/Makefile (revision 365821) @@ -1,41 +1,41 @@ # $FreeBSD$ .include LIBADD= ssl crypto PROG= dma SRCS= aliases_parse.y \ aliases_scan.l \ base64.c \ conf.c \ crypto.c \ dma.c \ dns.c \ local.c \ mail.c \ net.c \ spool.c \ util.c MAN8= dma.8 CONFS= dma.conf CONFSDIR= ${CONFDIR}/dma YFLAGS+= -i CLEANFILES= aliases_parse.i FILES= mailer.conf FILESDIR= ${SHAREDIR}/examples/dma .if ${MK_SENDMAIL} == no CONFGROUPS= CONFS MAILER MAILERDIR= /etc/mail MAILER= mailer.conf .endif BINMODE= 2555 .include .if ${COMPILER_TYPE} == gcc -WARNS= 5 +WARNS?= 5 .endif .include Index: stable/12/sbin/gvinum/Makefile =================================================================== --- stable/12/sbin/gvinum/Makefile (revision 365820) +++ stable/12/sbin/gvinum/Makefile (revision 365821) @@ -1,15 +1,15 @@ # $FreeBSD$ PACKAGE=runtime PROG= gvinum SRCS= gvinum.c gvinum.h geom_vinum_share.c MAN= gvinum.8 -WARNS= 2 +WARNS?= 2 CFLAGS+= -I${SRCTOP}/sys -I${SYSROOT:U${DESTDIR}}/${INCLUDEDIR}/edit LIBADD= edit geom .PATH: ${SRCTOP}/sys/geom/vinum .include Index: stable/12/sbin/tunefs/Makefile =================================================================== --- stable/12/sbin/tunefs/Makefile (revision 365820) +++ stable/12/sbin/tunefs/Makefile (revision 365821) @@ -1,16 +1,16 @@ # @(#)Makefile 8.1 (Berkeley) 6/5/93 # $FreeBSD$ PACKAGE=runtime PROG= tunefs SRCS= tunefs.c getmntopts.c LIBADD= ufs MAN= tunefs.8 MOUNT= ${SRCTOP}/sbin/mount CFLAGS+= -I${MOUNT} .PATH: ${MOUNT} -WARNS= 3 +WARNS?= 3 .include Index: stable/12/stand/efi/boot1/Makefile =================================================================== --- stable/12/stand/efi/boot1/Makefile (revision 365820) +++ stable/12/stand/efi/boot1/Makefile (revision 365821) @@ -1,119 +1,119 @@ # $FreeBSD$ .include BOOT1?= boot1 PROG= ${BOOT1}.sym INTERNALPROG= -WARNS= 6 +WARNS?= 6 CFLAGS+= -DEFI_BOOT1 # We implement a slightly non-standard %S in that it always takes a # CHAR16 that's common in UEFI-land instead of a wchar_t. This only # seems to matter on arm64 where wchar_t defaults to an int instead # of a short. There's no good cast to use here so just ignore the # warnings for now. CWARNFLAGS.proto.c+= -Wno-format CWARNFLAGS.boot1.c+= -Wno-format # Disable bogus alignment issues CWARNFLAGS.ufs_module.c += -Wno-format CWARNFLAGS.ufs_module.c += -Wno-cast-align # Disable warnings that are currently incompatible with the zfs boot code CWARNFLAGS.zfs_module.c += -Wno-array-bounds CWARNFLAGS.zfs_module.c += -Wno-cast-align CWARNFLAGS.zfs_module.c += -Wno-cast-qual CWARNFLAGS.zfs_module.c += -Wno-missing-prototypes CWARNFLAGS.zfs_module.c += -Wno-sign-compare CWARNFLAGS.zfs_module.c += -Wno-unused-parameter CWARNFLAGS.zfs_module.c += -Wno-unused-function # architecture-specific loader code SRCS+= boot1.c proto.c self_reloc.c start.S ufs_module.c devpath.c .if ${MK_LOADER_ZFS} != "no" SRCS+= zfs_module.c CFLAGS.zfs_module.c+= -I${ZFSSRC} CFLAGS.zfs_module.c+= -I${SYSDIR}/cddl/boot/zfs CFLAGS.zfs_module.c+= -I${SYSDIR}/crypto/skein CFLAGS.zfs_module.c+= -I${SYSDIR}/cddl/contrib/opensolaris/uts/common CFLAGS.zfs_module.c+= -I${SYSDIR}/cddl/contrib/opensolaris/common/lz4 CFLAGS+= -DEFI_ZFS_BOOT .endif .if ${COMPILER_TYPE} == "gcc" && ${COMPILER_VERSION} > 40201 CWARNFLAGS.self_reloc.c+= -Wno-error=maybe-uninitialized .endif CFLAGS+= -I${EFIINC} CFLAGS+= -I${EFIINCMD} CFLAGS+= -I${SYSDIR}/contrib/dev/acpica/include CFLAGS+= -DEFI_UFS_BOOT .ifdef(EFI_DEBUG) CFLAGS+= -DEFI_DEBUG .endif # Always add MI sources and REGULAR efi loader bits .PATH: ${EFISRC}/loader/arch/${MACHINE} .PATH: ${EFISRC}/loader .PATH: ${LDRSRC} .PATH: ${EFISRC}/libefi CFLAGS+= -I${LDRSRC} FILES= ${BOOT1}.efi ${BOOT1}.efifat FILESMODE_${BOOT1}.efi= ${BINMODE} LDSCRIPT= ${EFISRC}/loader/arch/${MACHINE}/ldscript.${MACHINE} LDFLAGS+= -Wl,-T${LDSCRIPT},-Bsymbolic,-znotext -shared .if ${MACHINE_CPUARCH} == "aarch64" CFLAGS+= -mgeneral-regs-only .endif .if ${MACHINE_CPUARCH} == "amd64" || ${MACHINE_CPUARCH} == "i386" CFLAGS+= -fPIC LDFLAGS+= -Wl,-znocombreloc .endif LIBEFI= ${BOOTOBJ}/efi/libefi/libefi.a # # Add libstand for the runtime functions used by the compiler - for example # __aeabi_* (arm) or __divdi3 (i386). # as well as required string and memory functions for all platforms. # DPADD+= ${LIBEFI} ${LIBSA} LDADD+= ${LIBEFI} ${LIBSA} DPADD+= ${LDSCRIPT} ${BOOT1}.efi: ${PROG} if ${NM} ${.ALLSRC} | grep ' U '; then \ echo "Undefined symbols in ${.ALLSRC}"; \ exit 1; \ fi SOURCE_DATE_EPOCH=${SOURCE_DATE_EPOCH} \ ${OBJCOPY} -j .peheader -j .text -j .sdata -j .data \ -j .dynamic -j .dynsym -j .rel.dyn \ -j .rela.dyn -j .reloc -j .eh_frame \ --output-target=${EFI_TARGET} ${.ALLSRC} ${.TARGET} # The following inserts our objects into a template FAT file system # created by generate-fat.sh .include "Makefile.fat" ${BOOT1}.efifat: ${BOOT1}.efi @set -- `ls -l ${.ALLSRC}`; \ x=$$(($$5-${BOOT1_MAXSIZE})); \ if [ $$x -ge 0 ]; then \ echo "boot1 $$x bytes too large; regenerate FAT templates?" >&2 ;\ exit 1; \ fi echo ${.OBJDIR} xz -d -c ${BOOTSRC}/efi/boot1/fat-${MACHINE}.tmpl.xz > ${.TARGET} ${DD} if=${.ALLSRC} of=${.TARGET} seek=${BOOT1_OFFSET} conv=notrunc CLEANFILES+= ${BOOT1}.efi ${BOOT1}.efifat .include Index: stable/12/stand/efi/gptboot/Makefile =================================================================== --- stable/12/stand/efi/gptboot/Makefile (revision 365820) +++ stable/12/stand/efi/gptboot/Makefile (revision 365821) @@ -1,17 +1,17 @@ # $FreeBSD$ # ZFS is not supported, we want debugging until this is vetted and # we don't want the gptboot.efifat thing created. MK_LOADER_ZFS=no EFI_DEBUG=yes NOFAT=yes BOOT1?= gptboot .PATH: ${SRCTOP}/stand/efi/boot1 ${SRCTOP}/stand/libsa CFLAGS+= -I${SRCTOP}/stand/efi/boot1 CFLAGS+= -I${.CURDIR} CFLAGS+= -DBOOTPROG=\"gptboot.efi\" SRCS+= gpt.c CWARNFLAGS.gpt.c+= -Wno-sign-compare -Wno-cast-align -WARNS=6 +WARNS?=6 .include "${.CURDIR}/../boot1/Makefile" Index: stable/12/stand/liblua/Makefile =================================================================== --- stable/12/stand/liblua/Makefile (revision 365820) +++ stable/12/stand/liblua/Makefile (revision 365821) @@ -1,45 +1,45 @@ # $FreeBSD$ .include .PATH: ${LUASRC} .PATH: ${LIBLUASRC} .include "${BOOTSRC}/lua.mk" LIB= lua INTERNALLIB= # Core Lua. SRCS= lapi.c lcode.c lctype.c ldebug.c ldo.c ldump.c lfunc.c lgc.c llex.c \ lmem.c lobject.c lopcodes.c lparser.c lstate.c lstring.c ltable.c \ ltm.c lundump.c lvm.c lzio.c SRCS+= lauxlib.c lbaselib.c lstrlib.c loadlib.c # These aren't yet included, but link now, omitting them saves 15k #SRCS+= lcorolib.c ldblib.c lutf8lib.c # These aren't yet compatible with the boot environment, and some may never be #SRCS+= lbitlib.c liolib.c lmathlib.c loslib.c ltablib.c # Our utilities. SRCS+= lerrno.c lstd.c lutils.c .PATH: ${FLUASRC}/modules SRCS+= lfs.c -WARNS= 3 +WARNS?= 3 CFLAGS+= -DLUA_PATH=\"${LUAPATH}\" -DLUA_PATH_DEFAULT=\"${LUAPATH}/\?.lua\" CFLAGS+= -ffreestanding -nostdlib -DLUA_USE_POSIX CFLAGS+= -fno-stack-protector -D__BSD_VISIBLE CFLAGS+= -I${BOOTSRC}/include -I${LIBLUASRC} -I${LUASRC} -I${LDRSRC} .if ${MACHINE_CPUARCH} == "amd64" && ${DO32:U0} == 0 CFLAGS+= -fPIC .endif .if ${MK_LOADER_VERIEXEC} == "yes" CFLAGS+= -I${SRCTOP}/lib/libsecureboot/h -DLOADER_VERIEXEC .endif .include Index: stable/12/usr.bin/bmake/Makefile.inc =================================================================== --- stable/12/usr.bin/bmake/Makefile.inc (revision 365820) +++ stable/12/usr.bin/bmake/Makefile.inc (revision 365821) @@ -1,36 +1,36 @@ # $FreeBSD$ .sinclude .if defined(.PARSEDIR) # make sure this is available to unit-tests/Makefile .export SRCTOP .endif .if exists(${.CURDIR}/tests) PROG= make .endif .if !defined(MK_SHARED_TOOLCHAIN) || ${MK_SHARED_TOOLCHAIN} == "no" NO_SHARED?= YES .endif # hack to not add tests to tests subdir since this is included from # there and to avoid renaming things that require changes to generated # files. .if defined(MK_TESTS) && ${MK_TESTS} != no && exists(${.CURDIR}/tests) SUBDIR+= tests .endif -WARNS=3 +WARNS?=3 CFLAGS+= -DNO_PWD_OVERRIDE .if make(after-import) # use our preferred value DEFAULT_SYS_PATH= .../share/mk:/usr/share/mk .export DEFAULT_SYS_PATH .endif .if ${MACHINE} != "host" FILEMON_H ?= ${SRCTOP}/sys/dev/filemon/filemon.h .endif Index: stable/12/usr.bin/iscsictl/Makefile =================================================================== --- stable/12/usr.bin/iscsictl/Makefile (revision 365820) +++ stable/12/usr.bin/iscsictl/Makefile (revision 365821) @@ -1,19 +1,19 @@ # $FreeBSD$ PACKAGE= iscsi PROG= iscsictl SRCS= iscsictl.c periphs.c parse.y token.l y.tab.h CFLAGS+= -I${.CURDIR} CFLAGS+= -I${SRCTOP}/sys/dev/iscsi MAN= iscsi.conf.5 iscsictl.8 LIBADD= xo YFLAGS+= -v LFLAGS+= -i CLEANFILES= y.tab.c y.tab.h y.output -WARNS= 6 +WARNS?= 6 NO_WMISSING_VARIABLE_DECLARATIONS= .include Index: stable/12/usr.bin/localedef/Makefile =================================================================== --- stable/12/usr.bin/localedef/Makefile (revision 365820) +++ stable/12/usr.bin/localedef/Makefile (revision 365821) @@ -1,26 +1,26 @@ # $FreeBSD$ PROG= localedef SRCS= charmap.c \ collate.c \ ctype.c \ localedef.c \ messages.c \ monetary.c \ numeric.c \ parser.y \ scanner.c \ time.c \ wide.c -WARNS= 3 +WARNS?= 3 ${SRCS:M*.c}: parser.h parser.h: parser.y IGNORE_PRAGMA= yes CFLAGS+= -I. -I${.CURDIR} CFLAGS+= -I${SRCTOP}/lib/libc/locale CFLAGS+= -I${SRCTOP}/lib/libc/stdtime .include Index: stable/12/usr.bin/m4/Makefile =================================================================== --- stable/12/usr.bin/m4/Makefile (revision 365820) +++ stable/12/usr.bin/m4/Makefile (revision 365821) @@ -1,26 +1,26 @@ # $OpenBSD: Makefile,v 1.13 2014/05/12 19:11:19 espie Exp $ # $FreeBSD$ # -DEXTENDED # if you want the paste & spaste macros. .include PROG= m4 CFLAGS+=-DEXTENDED -I${.CURDIR} -I${SRCTOP}/lib/libopenbsd LIBADD= m openbsd NO_WMISSING_VARIABLE_DECLARATIONS= SRCS= eval.c expr.c look.c main.c misc.c gnum4.c trace.c parser.y tokenizer.l -WARNS= 3 +WARNS?= 3 tokenizer.o: parser.h CLEANFILES+= parser.c parser.h tokenizer.o HAS_TESTS= SUBDIR.${MK_TESTS}+= tests .include Index: stable/12/usr.bin/users/Makefile =================================================================== --- stable/12/usr.bin/users/Makefile (revision 365820) +++ stable/12/usr.bin/users/Makefile (revision 365821) @@ -1,8 +1,8 @@ # @(#)Makefile 8.1 (Berkeley) 6/6/93 # $FreeBSD$ -WARNS= 3 +WARNS?= 3 PROG_CXX= users CXXFLAGS+= -fno-rtti .include Index: stable/12/usr.bin/zstd/Makefile =================================================================== --- stable/12/usr.bin/zstd/Makefile (revision 365820) +++ stable/12/usr.bin/zstd/Makefile (revision 365821) @@ -1,29 +1,29 @@ # $FreeBSD$ PROG= zstd SRCS= bench.c \ datagen.c \ dibio.c \ fileio.c \ zstdcli.c CFLAGS+= -I${SRCTOP}/sys/contrib/zstd/programs \ -I${SRCTOP}/sys/contrib/zstd/lib/common \ -I${SRCTOP}/sys/contrib/zstd/lib/compress \ -I${SRCTOP}/sys/contrib/zstd/lib/dictBuilder \ -I${SRCTOP}/sys/contrib/zstd/lib \ -DXXH_NAMESPACE=ZSTD_ \ -DHAVE_THREAD=1 \ -DZSTD_MULTITHREAD=1 LINKS= ${BINDIR}/zstd ${BINDIR}/unzstd \ ${BINDIR}/zstd ${BINDIR}/zstdcat \ ${BINDIR}/zstd ${BINDIR}/zstdmt MLINKS= zstd.1 unzstd.1 \ zstd.1 zstdcat.1 \ zstd.1 zstdmt.1 -WARNS= 2 +WARNS?= 2 LIBADD= zstd .PATH: ${SRCTOP}/sys/contrib/zstd/programs .include Index: stable/12/usr.sbin/autofs/Makefile =================================================================== --- stable/12/usr.sbin/autofs/Makefile (revision 365820) +++ stable/12/usr.sbin/autofs/Makefile (revision 365821) @@ -1,36 +1,36 @@ # $FreeBSD$ CONFS= auto_master PACKAGE=autofs PROG= automountd SRCS= automount.c SRCS+= automountd.c SRCS+= autounmountd.c SRCS+= common.c SRCS+= defined.c SRCS+= getmntopts.c SRCS+= log.c SRCS+= popen.c SRCS+= token.l CFLAGS+=-I${.CURDIR} CFLAGS+=-I${SRCTOP}/sys/fs/autofs MAN= automount.8 automountd.8 autounmountd.8 auto_master.5 LIBADD= util # Needed for getmntopts.c MOUNT= ${SRCTOP}/sbin/mount CFLAGS+=-I${MOUNT} -WARNS= 6 +WARNS?= 6 LINKS= ${BINDIR}/automountd ${BINDIR}/automount LINKS+= ${BINDIR}/automountd ${BINDIR}/autounmountd .PATH: ${MOUNT} SUBDIR= autofs .include Index: stable/12/usr.sbin/iscsid/Makefile =================================================================== --- stable/12/usr.sbin/iscsid/Makefile (revision 365820) +++ stable/12/usr.sbin/iscsid/Makefile (revision 365821) @@ -1,16 +1,16 @@ # $FreeBSD$ PACKAGE= iscsi PROG= iscsid SRCS= chap.c discovery.c iscsid.c keys.c log.c login.c pdu.c CFLAGS+= -I${.CURDIR} CFLAGS+= -I${SRCTOP}/sys/cam CFLAGS+= -I${SRCTOP}/sys/dev/iscsi CFLAGS+= -DICL_KERNEL_PROXY MAN= iscsid.8 LIBADD= md util -WARNS= 6 +WARNS?= 6 .include Index: stable/12/usr.sbin/uefisign/Makefile =================================================================== --- stable/12/usr.sbin/uefisign/Makefile (revision 365820) +++ stable/12/usr.sbin/uefisign/Makefile (revision 365821) @@ -1,11 +1,11 @@ # $FreeBSD$ PROG= uefisign SRCS= uefisign.c child.c pe.c MAN= uefisign.8 LIBADD= crypto -WARNS= 6 +WARNS?= 6 .include Index: stable/12/usr.sbin/ypldap/Makefile =================================================================== --- stable/12/usr.sbin/ypldap/Makefile (revision 365820) +++ stable/12/usr.sbin/ypldap/Makefile (revision 365821) @@ -1,20 +1,20 @@ # $OpenBSD: Makefile,v 1.8 2015/09/09 15:33:18 deraadt Exp $ # $FreeBSD$ PROG= ypldap SRCS= parse.y ypldap.c log.c \ ldapclient.c entries.c yp.c \ aldap.c ber.c \ ypldap_dns.c MAN= ypldap.8 ypldap.conf.5 LIBADD= openbsd event util rpcsvc CFLAGS+=-I${.CURDIR} CFLAGS+=-I${SRCTOP}/contrib/pf/libevent CFLAGS+=-I${SRCTOP}/lib/libopenbsd -WARNS= 2 +WARNS?= 2 .include Index: stable/12 =================================================================== --- stable/12 (revision 365820) +++ stable/12 (revision 365821) Property changes on: stable/12 ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head:r365631