svn commit: r292006 - in user/ngie/more-tests2: . bin/freebsd-version bin/ls bin/ls/tests bin/sh/tests/parameters cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printa cddl/contrib/opensolaris...
Garrett Cooper
ngie at FreeBSD.org
Wed Dec 9 05:35:51 UTC 2015
Author: ngie
Date: Wed Dec 9 05:35:46 2015
New Revision: 292006
URL: https://svnweb.freebsd.org/changeset/base/292006
Log:
MFhead @ r292005
Added:
user/ngie/more-tests2/bin/sh/tests/parameters/positional9.0
- copied unchanged from r292005, head/bin/sh/tests/parameters/positional9.0
user/ngie/more-tests2/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.sameprovmulti.ksh
- copied unchanged from r292005, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.sameprovmulti.ksh
user/ngie/more-tests2/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.sameprovmulti.ksh.out
- copied unchanged from r292005, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.sameprovmulti.ksh.out
user/ngie/more-tests2/lib/libc/aarch64/sys/__vdso_gettc.c
- copied unchanged from r292005, head/lib/libc/aarch64/sys/__vdso_gettc.c
user/ngie/more-tests2/lib/libc/arm/sys/__vdso_gettc.c
- copied unchanged from r292005, head/lib/libc/arm/sys/__vdso_gettc.c
user/ngie/more-tests2/share/man/man9/proc_rwmem.9
- copied unchanged from r292005, head/share/man/man9/proc_rwmem.9
user/ngie/more-tests2/sys/dev/mlx5/eswitch_vacl.h
- copied unchanged from r292005, head/sys/dev/mlx5/eswitch_vacl.h
user/ngie/more-tests2/sys/dev/mlx5/mlx5_core/mlx5_eswitch_vacl.c
- copied unchanged from r292005, head/sys/dev/mlx5/mlx5_core/mlx5_eswitch_vacl.c
user/ngie/more-tests2/sys/netinet/in_fib.c
- copied unchanged from r292005, head/sys/netinet/in_fib.c
user/ngie/more-tests2/sys/netinet/in_fib.h
- copied unchanged from r292005, head/sys/netinet/in_fib.h
user/ngie/more-tests2/sys/netinet6/in6_fib.c
- copied unchanged from r292005, head/sys/netinet6/in6_fib.c
user/ngie/more-tests2/sys/netinet6/in6_fib.h
- copied unchanged from r292005, head/sys/netinet6/in6_fib.h
user/ngie/more-tests2/sys/x86/include/x86_smp.h
- copied unchanged from r292005, head/sys/x86/include/x86_smp.h
user/ngie/more-tests2/sys/x86/include/x86_var.h
- copied unchanged from r292005, head/sys/x86/include/x86_var.h
Modified:
user/ngie/more-tests2/Makefile.inc1
user/ngie/more-tests2/UPDATING
user/ngie/more-tests2/bin/freebsd-version/Makefile
user/ngie/more-tests2/bin/ls/print.c
user/ngie/more-tests2/bin/ls/tests/ls_tests.sh
user/ngie/more-tests2/bin/sh/tests/parameters/Makefile
user/ngie/more-tests2/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/tst.walltimestamp.ksh.out
user/ngie/more-tests2/cddl/contrib/opensolaris/lib/libdtrace/common/dt_pid.c
user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/proc/Makefile
user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/usdt/Makefile
user/ngie/more-tests2/contrib/bmake/ChangeLog
user/ngie/more-tests2/contrib/bmake/Makefile
user/ngie/more-tests2/contrib/bmake/boot-strap
user/ngie/more-tests2/contrib/bmake/cond.c
user/ngie/more-tests2/contrib/bmake/config.h.in
user/ngie/more-tests2/contrib/bmake/configure
user/ngie/more-tests2/contrib/bmake/configure.in
user/ngie/more-tests2/contrib/bmake/main.c
user/ngie/more-tests2/contrib/bmake/meta.c
user/ngie/more-tests2/contrib/bmake/mk/ChangeLog
user/ngie/more-tests2/contrib/bmake/mk/host-target.mk
user/ngie/more-tests2/contrib/bmake/mk/init.mk
user/ngie/more-tests2/contrib/bmake/mk/install-mk
user/ngie/more-tests2/contrib/bmake/mk/lib.mk
user/ngie/more-tests2/contrib/bmake/mk/meta.autodep.mk
user/ngie/more-tests2/contrib/bmake/mk/meta.stage.mk
user/ngie/more-tests2/contrib/bmake/mk/meta.subdir.mk
user/ngie/more-tests2/contrib/bmake/mk/meta.sys.mk
user/ngie/more-tests2/contrib/bmake/mk/own.mk
user/ngie/more-tests2/contrib/bmake/mk/sys.mk
user/ngie/more-tests2/contrib/bmake/os.sh
user/ngie/more-tests2/contrib/bmake/parse.c
user/ngie/more-tests2/contrib/bmake/unit-tests/Makefile.in
user/ngie/more-tests2/contrib/bmake/unit-tests/cond2.mk
user/ngie/more-tests2/contrib/bmake/unit-tests/doterror.exp
user/ngie/more-tests2/contrib/bmake/unit-tests/modts.mk
user/ngie/more-tests2/contrib/bmake/var.c
user/ngie/more-tests2/contrib/elftoolchain/elfcopy/binary.c
user/ngie/more-tests2/include/resolv.h
user/ngie/more-tests2/kerberos5/lib/libgssapi_krb5/Makefile.depend
user/ngie/more-tests2/kerberos5/lib/libgssapi_ntlm/Makefile.depend
user/ngie/more-tests2/kerberos5/lib/libhdb/Makefile.depend
user/ngie/more-tests2/kerberos5/lib/libheimntlm/Makefile.depend
user/ngie/more-tests2/kerberos5/lib/libkadm5clnt/Makefile.depend
user/ngie/more-tests2/kerberos5/lib/libkadm5srv/Makefile.depend
user/ngie/more-tests2/kerberos5/lib/libkafs5/Makefile.depend
user/ngie/more-tests2/kerberos5/lib/libkdc/Makefile.depend
user/ngie/more-tests2/lib/csu/aarch64/crt1.c
user/ngie/more-tests2/lib/csu/amd64/crt1.c
user/ngie/more-tests2/lib/csu/arm/crt1.c
user/ngie/more-tests2/lib/csu/i386/crt1_c.c
user/ngie/more-tests2/lib/csu/mips/crt1.c
user/ngie/more-tests2/lib/csu/powerpc/crt1.c
user/ngie/more-tests2/lib/csu/powerpc64/crt1.c
user/ngie/more-tests2/lib/csu/sparc64/crt1.c
user/ngie/more-tests2/lib/lib80211/Makefile.depend
user/ngie/more-tests2/lib/libc/aarch64/sys/Makefile.inc
user/ngie/more-tests2/lib/libc/arm/sys/Makefile.inc
user/ngie/more-tests2/lib/libc/gen/getnetgrent.c
user/ngie/more-tests2/lib/libc/stdio/open_memstream.c
user/ngie/more-tests2/lib/libc/stdio/open_wmemstream.c
user/ngie/more-tests2/lib/libc/tests/stdio/getdelim_test.c
user/ngie/more-tests2/lib/libc/tests/stdio/printbasic_test.c
user/ngie/more-tests2/lib/libc/tests/stdio/printfloat_test.c
user/ngie/more-tests2/lib/libpam/modules/pam_krb5/Makefile.depend
user/ngie/more-tests2/lib/libpam/modules/pam_ksu/Makefile.depend
user/ngie/more-tests2/lib/libpam/modules/pam_ssh/Makefile
user/ngie/more-tests2/sbin/newfs_msdos/mkfs_msdos.c
user/ngie/more-tests2/sbin/swapon/swapon.c
user/ngie/more-tests2/secure/lib/libssh/Makefile
user/ngie/more-tests2/secure/libexec/sftp-server/Makefile
user/ngie/more-tests2/secure/libexec/ssh-keysign/Makefile
user/ngie/more-tests2/secure/libexec/ssh-pkcs11-helper/Makefile
user/ngie/more-tests2/secure/usr.bin/scp/Makefile
user/ngie/more-tests2/secure/usr.bin/sftp/Makefile
user/ngie/more-tests2/secure/usr.bin/ssh-add/Makefile
user/ngie/more-tests2/secure/usr.bin/ssh-agent/Makefile
user/ngie/more-tests2/secure/usr.bin/ssh-keygen/Makefile
user/ngie/more-tests2/secure/usr.bin/ssh-keyscan/Makefile
user/ngie/more-tests2/secure/usr.bin/ssh/Makefile
user/ngie/more-tests2/secure/usr.sbin/sshd/Makefile
user/ngie/more-tests2/share/examples/etc/make.conf
user/ngie/more-tests2/share/man/man5/src.conf.5
user/ngie/more-tests2/share/man/man7/release.7
user/ngie/more-tests2/share/man/man7/tests.7
user/ngie/more-tests2/share/man/man9/Makefile
user/ngie/more-tests2/share/man/man9/g_bio.9
user/ngie/more-tests2/share/misc/bsd-family-tree
user/ngie/more-tests2/share/mk/atf.test.mk
user/ngie/more-tests2/share/mk/bsd.compiler.mk
user/ngie/more-tests2/share/mk/bsd.dep.mk
user/ngie/more-tests2/share/mk/bsd.lib.mk
user/ngie/more-tests2/share/mk/bsd.opts.mk
user/ngie/more-tests2/share/mk/local.meta.sys.mk
user/ngie/more-tests2/share/mk/src.opts.mk
user/ngie/more-tests2/share/mk/suite.test.mk
user/ngie/more-tests2/sys/amd64/amd64/machdep.c
user/ngie/more-tests2/sys/amd64/amd64/pmap.c
user/ngie/more-tests2/sys/amd64/include/md_var.h
user/ngie/more-tests2/sys/amd64/include/smp.h
user/ngie/more-tests2/sys/arm/arm/elf_machdep.c
user/ngie/more-tests2/sys/arm/arm/generic_timer.c
user/ngie/more-tests2/sys/arm/arm/machdep.c
user/ngie/more-tests2/sys/arm/include/md_var.h
user/ngie/more-tests2/sys/arm/include/vdso.h
user/ngie/more-tests2/sys/arm/include/vmparam.h
user/ngie/more-tests2/sys/arm64/arm64/elf_machdep.c
user/ngie/more-tests2/sys/arm64/arm64/machdep.c
user/ngie/more-tests2/sys/arm64/include/md_var.h
user/ngie/more-tests2/sys/arm64/include/vdso.h
user/ngie/more-tests2/sys/arm64/include/vmparam.h
user/ngie/more-tests2/sys/boot/userboot/test/Makefile.depend
user/ngie/more-tests2/sys/cam/cam_ccb.h
user/ngie/more-tests2/sys/cam/cam_xpt.c
user/ngie/more-tests2/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c
user/ngie/more-tests2/sys/cddl/contrib/opensolaris/uts/common/dtrace/fasttrap.c
user/ngie/more-tests2/sys/cddl/contrib/opensolaris/uts/common/sys/dtrace.h
user/ngie/more-tests2/sys/cddl/contrib/opensolaris/uts/intel/dtrace/fasttrap_isa.c
user/ngie/more-tests2/sys/cddl/contrib/opensolaris/uts/powerpc/dtrace/fasttrap_isa.c
user/ngie/more-tests2/sys/cddl/dev/dtrace/dtrace_ioctl.c
user/ngie/more-tests2/sys/conf/files
user/ngie/more-tests2/sys/conf/files.arm
user/ngie/more-tests2/sys/conf/files.arm64
user/ngie/more-tests2/sys/dev/iscsi/iscsi.c
user/ngie/more-tests2/sys/dev/mlx5/device.h
user/ngie/more-tests2/sys/dev/mlx5/driver.h
user/ngie/more-tests2/sys/dev/mlx5/mlx5_core/mlx5_eq.c
user/ngie/more-tests2/sys/dev/mlx5/mlx5_core/mlx5_vport.c
user/ngie/more-tests2/sys/dev/mlx5/mlx5_en/en.h
user/ngie/more-tests2/sys/dev/mlx5/mlx5_en/mlx5_en_ethtool.c
user/ngie/more-tests2/sys/dev/mlx5/mlx5_en/mlx5_en_main.c
user/ngie/more-tests2/sys/dev/mlx5/mlx5_en/mlx5_en_rx.c
user/ngie/more-tests2/sys/dev/mlx5/mlx5_en/mlx5_en_tx.c
user/ngie/more-tests2/sys/dev/mlx5/vport.h
user/ngie/more-tests2/sys/dev/sfxge/common/efsys.h
user/ngie/more-tests2/sys/dev/sfxge/common/efx.h
user/ngie/more-tests2/sys/dev/sfxge/common/efx_check.h
user/ngie/more-tests2/sys/dev/sfxge/common/efx_crc32.c
user/ngie/more-tests2/sys/dev/sfxge/common/efx_impl.h
user/ngie/more-tests2/sys/dev/sfxge/common/efx_mcdi.c
user/ngie/more-tests2/sys/dev/sfxge/common/efx_nvram.c
user/ngie/more-tests2/sys/dev/sfxge/common/efx_tx.c
user/ngie/more-tests2/sys/dev/sfxge/common/hunt_impl.h
user/ngie/more-tests2/sys/dev/sfxge/common/hunt_mcdi.c
user/ngie/more-tests2/sys/dev/sfxge/common/hunt_nic.c
user/ngie/more-tests2/sys/dev/sfxge/common/hunt_nvram.c
user/ngie/more-tests2/sys/dev/sfxge/common/hunt_tx.c
user/ngie/more-tests2/sys/dev/sfxge/common/siena_impl.h
user/ngie/more-tests2/sys/dev/sfxge/common/siena_mcdi.c
user/ngie/more-tests2/sys/dev/sfxge/common/siena_nic.c
user/ngie/more-tests2/sys/dev/sfxge/sfxge_tx.c
user/ngie/more-tests2/sys/dev/usb/net/if_smsc.c
user/ngie/more-tests2/sys/dev/usb/wlan/if_urtwn.c
user/ngie/more-tests2/sys/dev/usb/wlan/if_urtwnvar.h
user/ngie/more-tests2/sys/i386/i386/mp_machdep.c
user/ngie/more-tests2/sys/i386/i386/pmap.c
user/ngie/more-tests2/sys/i386/i386/sys_machdep.c
user/ngie/more-tests2/sys/i386/include/md_var.h
user/ngie/more-tests2/sys/i386/include/smp.h
user/ngie/more-tests2/sys/kern/imgact_elf.c
user/ngie/more-tests2/sys/kern/kern_proc.c
user/ngie/more-tests2/sys/kern/sys_process.c
user/ngie/more-tests2/sys/kern/vfs_bio.c
user/ngie/more-tests2/sys/mips/mips/pm_machdep.c
user/ngie/more-tests2/sys/modules/ahci/Makefile
user/ngie/more-tests2/sys/modules/cam/Makefile
user/ngie/more-tests2/sys/modules/mlx5/Makefile
user/ngie/more-tests2/sys/modules/mlx5en/Makefile
user/ngie/more-tests2/sys/net/route.h
user/ngie/more-tests2/sys/netinet/in_gif.c
user/ngie/more-tests2/sys/netinet/ip_options.c
user/ngie/more-tests2/sys/netinet/sctp_input.c
user/ngie/more-tests2/sys/netinet/sctp_output.c
user/ngie/more-tests2/sys/netinet/sctp_pcb.c
user/ngie/more-tests2/sys/netinet/sctp_pcb.h
user/ngie/more-tests2/sys/netinet/sctp_usrreq.c
user/ngie/more-tests2/sys/netinet/sctputil.c
user/ngie/more-tests2/sys/netinet/sctputil.h
user/ngie/more-tests2/sys/netinet/tcp_input.c
user/ngie/more-tests2/sys/netinet/tcp_sack.c
user/ngie/more-tests2/sys/netinet/tcp_var.h
user/ngie/more-tests2/sys/netinet6/in6_gif.c
user/ngie/more-tests2/sys/netinet6/scope6.c
user/ngie/more-tests2/sys/netinet6/scope6_var.h
user/ngie/more-tests2/sys/netinet6/sctp6_usrreq.c
user/ngie/more-tests2/sys/netpfil/ipfw/ip_fw2.c
user/ngie/more-tests2/sys/sys/elf_common.h
user/ngie/more-tests2/sys/sys/ptrace.h
user/ngie/more-tests2/sys/ufs/ufs/ufs_vnops.c
user/ngie/more-tests2/sys/vm/vm_fault.c
user/ngie/more-tests2/targets/pseudo/gcc/Makefile.depend
user/ngie/more-tests2/targets/pseudo/universe/Makefile
user/ngie/more-tests2/tools/regression/mac/mac_portacl/misc.sh
user/ngie/more-tests2/tools/regression/tls/ttls2/ttls2.c
user/ngie/more-tests2/tools/regression/tls/ttls4/ttls4.c
user/ngie/more-tests2/tools/tools/nanobsd/defaults.sh
user/ngie/more-tests2/tools/tools/nanobsd/embedded/README
user/ngie/more-tests2/tools/tools/nanobsd/embedded/beaglebone.cfg
user/ngie/more-tests2/tools/tools/nanobsd/embedded/common
user/ngie/more-tests2/tools/tools/nanobsd/embedded/qemu-amd64.cfg
user/ngie/more-tests2/tools/tools/nanobsd/embedded/qemu-i386.cfg
user/ngie/more-tests2/tools/tools/nanobsd/embedded/qemu-mips.cfg
user/ngie/more-tests2/tools/tools/nanobsd/embedded/qemu-mips64.cfg
user/ngie/more-tests2/tools/tools/nanobsd/embedded/qemu-powerpc.cfg
user/ngie/more-tests2/tools/tools/nanobsd/embedded/qemu-powerpc64.cfg
user/ngie/more-tests2/tools/tools/nanobsd/embedded/qemu-sparc64.cfg
user/ngie/more-tests2/tools/tools/nanobsd/embedded/rpi.cfg
user/ngie/more-tests2/tools/tools/nanobsd/embedded/rpi2.cfg
user/ngie/more-tests2/tools/tools/nanobsd/embedded/sam9260ek.cfg
user/ngie/more-tests2/tools/tools/nanobsd/embedded/sam9g20ek.cfg
user/ngie/more-tests2/tools/tools/nanobsd/mtree-dedup.awk
user/ngie/more-tests2/tools/tools/nanobsd/nanobsd.sh
user/ngie/more-tests2/usr.bin/bmake/Makefile
user/ngie/more-tests2/usr.bin/bmake/config.h
user/ngie/more-tests2/usr.bin/bmake/unit-tests/Makefile
user/ngie/more-tests2/usr.bin/clang/lldb/Makefile.depend
user/ngie/more-tests2/usr.bin/xo/tests/Makefile
user/ngie/more-tests2/usr.sbin/ofwdump/Makefile.depend
Directory Properties:
user/ngie/more-tests2/ (props changed)
user/ngie/more-tests2/cddl/ (props changed)
user/ngie/more-tests2/cddl/contrib/opensolaris/ (props changed)
user/ngie/more-tests2/contrib/bmake/ (props changed)
user/ngie/more-tests2/contrib/elftoolchain/ (props changed)
user/ngie/more-tests2/include/ (props changed)
user/ngie/more-tests2/lib/libc/ (props changed)
user/ngie/more-tests2/sbin/ (props changed)
user/ngie/more-tests2/share/ (props changed)
user/ngie/more-tests2/sys/ (props changed)
user/ngie/more-tests2/sys/boot/ (props changed)
user/ngie/more-tests2/sys/cddl/contrib/opensolaris/ (props changed)
user/ngie/more-tests2/sys/conf/ (props changed)
user/ngie/more-tests2/targets/ (props changed)
Modified: user/ngie/more-tests2/Makefile.inc1
==============================================================================
--- user/ngie/more-tests2/Makefile.inc1 Wed Dec 9 01:24:34 2015 (r292005)
+++ user/ngie/more-tests2/Makefile.inc1 Wed Dec 9 05:35:46 2015 (r292006)
@@ -163,7 +163,7 @@ OSRELDATE= 0
.endif
# Set VERSION for CTFMERGE to use via the default CTFFLAGS=-L VERSION.
-.if !defined(VERSION)
+.if !defined(VERSION) && !make(showconfig)
REVISION!= ${MAKE} -C ${SRCDIR}/release -V REVISION
BRANCH!= ${MAKE} -C ${SRCDIR}/release -V BRANCH
SRCRELDATE!= awk '/^\#define[[:space:]]*__FreeBSD_version/ { print $$3 }' \
@@ -195,11 +195,14 @@ _TARGET_CPUTYPE=${TARGET_CPUTYPE}
.else
_TARGET_CPUTYPE=dummy
.endif
+# Skip for showconfig as it is just wasted time and may invoke auto.obj.mk.
+.if !make(showconfig)
_CPUTYPE!= MAKEFLAGS= CPUTYPE=${_TARGET_CPUTYPE} ${MAKE} \
-f /dev/null -m ${.CURDIR}/share/mk -V CPUTYPE
.if ${_CPUTYPE} != ${_TARGET_CPUTYPE}
.error CPUTYPE global should be set with ?=.
.endif
+.endif
.if make(buildworld)
BUILD_ARCH!= uname -p
.if ${MACHINE_ARCH} != ${BUILD_ARCH}
@@ -666,7 +669,7 @@ everything:
@echo "--------------------------------------------------------------"
@echo ">>> stage 4.4: building everything"
@echo "--------------------------------------------------------------"
- ${_+_}cd ${.CURDIR}; _PARALLEL_SUBUDIR_OK=1 ${WMAKE} all
+ ${_+_}cd ${.CURDIR}; _PARALLEL_SUBDIR_OK=1 ${WMAKE} all
.if defined(LIB32TMP)
build32: .PHONY
@echo
@@ -2008,14 +2011,14 @@ _prebuild_libs: ${_prebuild_libs:S/$/__L
_generic_libs: ${_generic_libs:S/$/__L/}
# Enable SUBDIR_PARALLEL when not calling 'make all', unless called from
-# 'everything' with _PARALLEL_SUBUDIR_OK set. This is because it is unlikely
+# 'everything' with _PARALLEL_SUBDIR_OK set. This is because it is unlikely
# that running 'make all' from the top-level, especially with a SUBDIR_OVERRIDE
# or LOCAL_DIRS set, will have a reliable build if SUBDIRs are built in
# parallel. This is safe for the world stage of buildworld though since it has
# already built libraries in a proper order and installed includes into
# WORLDTMP. Special handling is done for SUBDIR ordering for 'install*' to
# avoid trashing a system if it crashes mid-install.
-.if !make(all) || defined(_PARALLEL_SUBUDIR_OK)
+.if !make(all) || defined(_PARALLEL_SUBDIR_OK)
SUBDIR_PARALLEL=
.endif
Modified: user/ngie/more-tests2/UPDATING
==============================================================================
--- user/ngie/more-tests2/UPDATING Wed Dec 9 01:24:34 2015 (r292005)
+++ user/ngie/more-tests2/UPDATING Wed Dec 9 05:35:46 2015 (r292006)
@@ -31,6 +31,13 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 11
disable the most expensive debugging functionality run
"ln -s 'abort:false,junk:false' /etc/malloc.conf".)
+20151207:
+ Debug data files are now built by default with 'make buildworld' and
+ installed with 'make installworld'. This facilitates debugging but
+ requires more disk space both during the build and for the installed
+ world. Debug files may be disabled by setting WITHOUT_DEBUG_FILES=yes
+ in src.conf(5).
+
20151130:
r291527 changed the internal interface between the nfsd.ko and
nfscommon.ko modules. As such, they must both be upgraded to-gether.
Modified: user/ngie/more-tests2/bin/freebsd-version/Makefile
==============================================================================
--- user/ngie/more-tests2/bin/freebsd-version/Makefile Wed Dec 9 01:24:34 2015 (r292005)
+++ user/ngie/more-tests2/bin/freebsd-version/Makefile Wed Dec 9 05:35:46 2015 (r292006)
@@ -2,7 +2,7 @@
SCRIPTS = freebsd-version
MAN = freebsd-version.1
-CLEANFILES = freebsd-version.sh
+CLEANFILES = freebsd-version freebsd-version.sh
NEWVERS = ${.CURDIR}/../../sys/conf/newvers.sh
freebsd-version.sh: ${.CURDIR}/freebsd-version.sh.in ${NEWVERS}
Modified: user/ngie/more-tests2/bin/ls/print.c
==============================================================================
--- user/ngie/more-tests2/bin/ls/print.c Wed Dec 9 01:24:34 2015 (r292005)
+++ user/ngie/more-tests2/bin/ls/print.c Wed Dec 9 05:35:46 2015 (r292006)
@@ -47,12 +47,14 @@ __FBSDID("$FreeBSD$");
#include <fts.h>
#include <langinfo.h>
#include <libutil.h>
+#include <limits.h>
#include <stdio.h>
#include <stdint.h>
#include <stdlib.h>
#include <string.h>
#include <time.h>
#include <unistd.h>
+#include <wchar.h>
#ifdef COLORLS
#include <ctype.h>
#include <termcap.h>
@@ -105,6 +107,9 @@ static struct {
} colors[C_NUMCOLORS];
#endif
+static size_t padding_for_month[12];
+static size_t month_max_size = 0;
+
void
printscol(const DISPLAY *dp)
{
@@ -138,6 +143,70 @@ printname(const char *field, const char
return rc;
}
+static const char *
+get_abmon(int mon)
+{
+
+ switch (mon) {
+ case 0: return (nl_langinfo(ABMON_1));
+ case 1: return (nl_langinfo(ABMON_2));
+ case 2: return (nl_langinfo(ABMON_3));
+ case 3: return (nl_langinfo(ABMON_4));
+ case 4: return (nl_langinfo(ABMON_5));
+ case 5: return (nl_langinfo(ABMON_6));
+ case 6: return (nl_langinfo(ABMON_7));
+ case 7: return (nl_langinfo(ABMON_8));
+ case 8: return (nl_langinfo(ABMON_9));
+ case 9: return (nl_langinfo(ABMON_10));
+ case 10: return (nl_langinfo(ABMON_11));
+ case 11: return (nl_langinfo(ABMON_12));
+ }
+
+ /* should never happen */
+ abort();
+}
+
+static size_t
+mbswidth(const char *month)
+{
+ wchar_t wc;
+ size_t width, donelen, clen, w;
+
+ width = donelen = 0;
+ while ((clen = mbrtowc(&wc, month + donelen, MB_LEN_MAX, NULL)) != 0) {
+ if (clen == (size_t)-1 || clen == (size_t)-2)
+ return (-1);
+ donelen += clen;
+ if ((w = wcwidth(wc)) == (size_t)-1)
+ return (-1);
+ width += w;
+ }
+
+ return (width);
+}
+
+static void
+compute_abbreviated_month_size(void)
+{
+ int i;
+ size_t width;
+ size_t months_width[12];
+
+ for (i = 0; i < 12; i++) {
+ width = mbswidth(get_abmon(i));
+ if (width == (size_t)-1) {
+ month_max_size = -1;
+ return;
+ }
+ months_width[i] = width;
+ if (width > month_max_size)
+ month_max_size = width;
+ }
+
+ for (i = 0; i < 12; i++)
+ padding_for_month[i] = month_max_size - months_width[i];
+}
+
/*
* print name in current style
*/
@@ -425,6 +494,31 @@ printdev(size_t width, dev_t dev)
xo_emit("{:device/%#*jx} ", (u_int)width, (uintmax_t)dev);
}
+static size_t
+ls_strftime(char *str, size_t len, const char *fmt, const struct tm *tm)
+{
+ char *posb, nfmt[BUFSIZ];
+ const char *format = fmt;
+ size_t ret;
+
+ if ((posb = strstr(fmt, "%b")) != NULL) {
+ if (month_max_size == 0) {
+ compute_abbreviated_month_size();
+ }
+ if (month_max_size > 0) {
+ snprintf(nfmt, sizeof(nfmt), "%.*s%s%*s%s",
+ (int)(posb - fmt), fmt,
+ get_abmon(tm->tm_mon),
+ (int)padding_for_month[tm->tm_mon],
+ "",
+ posb + 2);
+ format = nfmt;
+ }
+ }
+ ret = strftime(str, len, format, tm);
+ return (ret);
+}
+
static void
printtime(const char *field, time_t ftime)
{
@@ -451,7 +545,7 @@ printtime(const char *field, time_t ftim
else
/* mmm dd yyyy || dd mmm yyyy */
format = d_first ? "%e %b %Y" : "%b %e %Y";
- strftime(longstring, sizeof(longstring), format, localtime(&ftime));
+ ls_strftime(longstring, sizeof(longstring), format, localtime(&ftime));
snprintf(fmt, sizeof(fmt), "{d:%s/%%hs} ", field);
xo_attr("value", "%ld", (long) ftime);
Modified: user/ngie/more-tests2/bin/ls/tests/ls_tests.sh
==============================================================================
--- user/ngie/more-tests2/bin/ls/tests/ls_tests.sh Wed Dec 9 01:24:34 2015 (r292005)
+++ user/ngie/more-tests2/bin/ls/tests/ls_tests.sh Wed Dec 9 05:35:46 2015 (r292006)
@@ -170,8 +170,6 @@ B_flag_head()
B_flag_body()
{
- atf_skip "kyua report-jenkins doesn't properly escape non-printable chars: https://github.com/jmmv/kyua/issues/136"
-
atf_check -e empty -o empty -s exit:0 touch "$(printf "y\013z")"
atf_check -e empty -o match:'y\\013z' -s exit:0 ls -B
}
@@ -467,8 +465,6 @@ b_flag_head()
b_flag_body()
{
- atf_skip "kyua report-jenkins doesn't properly escape non-printable chars: https://github.com/jmmv/kyua/issues/136"
-
atf_check -e empty -o empty -s exit:0 touch "$(printf "y\013z")"
atf_check -e empty -o match:'y\\vz' -s exit:0 ls -b
}
@@ -747,8 +743,6 @@ q_flag_and_w_flag_head()
q_flag_and_w_flag_body()
{
- atf_skip "kyua report-jenkins doesn't properly escape non-printable chars: https://github.com/jmmv/kyua/issues/136"
-
create_test_dir
test_file="$(printf "y\01z")"
Modified: user/ngie/more-tests2/bin/sh/tests/parameters/Makefile
==============================================================================
--- user/ngie/more-tests2/bin/sh/tests/parameters/Makefile Wed Dec 9 01:24:34 2015 (r292005)
+++ user/ngie/more-tests2/bin/sh/tests/parameters/Makefile Wed Dec 9 05:35:46 2015 (r292006)
@@ -21,6 +21,7 @@ FILES+= positional5.0
FILES+= positional6.0
FILES+= positional7.0
FILES+= positional8.0
+FILES+= positional9.0
FILES+= pwd1.0
FILES+= pwd2.0
Copied: user/ngie/more-tests2/bin/sh/tests/parameters/positional9.0 (from r292005, head/bin/sh/tests/parameters/positional9.0)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ user/ngie/more-tests2/bin/sh/tests/parameters/positional9.0 Wed Dec 9 05:35:46 2015 (r292006, copy of r292005, head/bin/sh/tests/parameters/positional9.0)
@@ -0,0 +1,18 @@
+# $FreeBSD$
+# Although POSIX leaves the result of expanding ${#@} and ${#*} unspecified,
+# make sure it is at least numeric.
+
+set -- bb cc ddd
+set -f
+lengths=${#*}${#@}"${#*}${#@}"$(echo ${#*}${#@}"${#*}${#@}")
+IFS=
+lengths=$lengths${#*}${#@}"${#*}${#@}"$(echo ${#*}${#@}"${#*}${#@}")
+case $lengths in
+*[!0-9]*)
+ printf 'bad: %s\n' "$lengths"
+ exit 3 ;;
+????????????????*) ;;
+*)
+ printf 'too short: %s\n' "$lengths"
+ exit 3 ;;
+esac
Modified: user/ngie/more-tests2/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/tst.walltimestamp.ksh.out
==============================================================================
--- user/ngie/more-tests2/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/tst.walltimestamp.ksh.out Wed Dec 9 01:24:34 2015 (r292005)
+++ user/ngie/more-tests2/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/tst.walltimestamp.ksh.out Wed Dec 9 05:35:46 2015 (r292006)
@@ -1,2 +1,3 @@
Sun, 25 Jan 2004 13:00:00 PST
2004 Jan 25 13:00:00
+
Copied: user/ngie/more-tests2/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.sameprovmulti.ksh (from r292005, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.sameprovmulti.ksh)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ user/ngie/more-tests2/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.sameprovmulti.ksh Wed Dec 9 05:35:46 2015 (r292006, copy of r292005, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.sameprovmulti.ksh)
@@ -0,0 +1,99 @@
+#
+# This file and its contents are supplied under the terms of the
+# Common Development and Distribution License ("CDDL"), version 1.0.
+# You may only use this file in accordance with the terms of version
+# 1.0 of the CDDL.
+#
+# A full copy of the text of the CDDL should have accompanied this
+# source. A copy of the CDDL is also available via the Internet at
+# http://www.illumos.org/license/CDDL.
+#
+
+#
+# Copyright (c) 2015, Joyent, Inc. All rights reserved.
+#
+
+#
+# This test assures that we can have the same provider name across multiple
+# probe definitions, and that the result will be the union of those
+# definitions. In particular, libusdt depends on this when (for example)
+# node modules that create a provider are loaded multiple times due to
+# being included by different modules.
+#
+
+if [ $# != 1 ]; then
+ echo expected one argument: '<'dtrace-path'>'
+ exit 2
+fi
+
+dtrace=$1
+DIR=/var/tmp/dtest.$$
+
+mkdir $DIR
+cd $DIR
+
+cat > test.c <<EOF
+#include <unistd.h>
+
+void
+main()
+{
+EOF
+
+objs=
+
+for oogle in bagnoogle stalloogle cockoogle; do
+ cat > $oogle.c <<EOF
+#include <sys/sdt.h>
+
+void
+$oogle()
+{
+ DTRACE_PROBE(doogle, $oogle);
+}
+EOF
+
+ cat > $oogle.d <<EOF
+provider doogle {
+ probe $oogle();
+};
+EOF
+
+ cc -c $oogle.c
+
+ if [ $? -ne 0 ]; then
+ print -u2 "failed to compile $oogle.c"
+ exit 1
+ fi
+
+ $dtrace -G -s $oogle.d $oogle.o -o $oogle.d.o
+
+ if [ $? -ne 0 ]; then
+ print -u2 "failed to process $oogle.d"
+ exit 1
+ fi
+
+ objs="$objs $oogle.o $oogle.d.o"
+ echo $oogle'();' >> test.c
+done
+
+echo "}" >> test.c
+
+cc -o test test.c $objs
+
+if [ $? -ne 0 ]; then
+ print -u2 "failed to compile test.c"
+ exit 1
+fi
+
+$dtrace -n 'doogle$target:::{@[probename] = count()}' \
+ -n 'END{printa("%-10s %@d\n", @)}' -x quiet -x aggsortkey -Zc ./test
+
+if [ $? -ne 0 ]; then
+ print -u2 "failed to execute test"
+ exit 1
+fi
+
+cd /
+rm -rf $DIR
+exit 0
Copied: user/ngie/more-tests2/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.sameprovmulti.ksh.out (from r292005, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.sameprovmulti.ksh.out)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ user/ngie/more-tests2/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.sameprovmulti.ksh.out Wed Dec 9 05:35:46 2015 (r292006, copy of r292005, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.sameprovmulti.ksh.out)
@@ -0,0 +1,4 @@
+bagnoogle 1
+cockoogle 1
+stalloogle 1
+
Modified: user/ngie/more-tests2/cddl/contrib/opensolaris/lib/libdtrace/common/dt_pid.c
==============================================================================
--- user/ngie/more-tests2/cddl/contrib/opensolaris/lib/libdtrace/common/dt_pid.c Wed Dec 9 01:24:34 2015 (r292005)
+++ user/ngie/more-tests2/cddl/contrib/opensolaris/lib/libdtrace/common/dt_pid.c Wed Dec 9 05:35:46 2015 (r292006)
@@ -571,12 +571,6 @@ dt_pid_usdt_mapping(void *data, const pr
prsyminfo_t sip;
dof_helper_t dh;
GElf_Half e_type;
-#ifdef __FreeBSD__
- dof_hdr_t hdr;
- size_t sz;
- uint64_t dofmax;
- void *dof;
-#endif
const char *mname;
const char *syms[] = { "___SUNW_dof", "__SUNW_dof" };
int i, fd = -1;
@@ -606,61 +600,25 @@ dt_pid_usdt_mapping(void *data, const pr
continue;
}
-#ifdef __FreeBSD__
+ dh.dofhp_dof = sym.st_value;
dh.dofhp_addr = (e_type == ET_EXEC) ? 0 : pmp->pr_vaddr;
- if (Pread(P, &hdr, sizeof (hdr), sym.st_value) !=
- sizeof (hdr)) {
- dt_dprintf("read of DOF header failed\n");
- continue;
- }
-
- sz = sizeof(dofmax);
- if (sysctlbyname("kern.dtrace.dof_maxsize", &dofmax, &sz,
- NULL, 0) != 0) {
- dt_dprintf("failed to read dof_maxsize: %s\n",
- strerror(errno));
- continue;
- }
- if (dofmax < hdr.dofh_loadsz) {
- dt_dprintf("DOF load size exceeds maximum\n");
- continue;
- }
-
- if ((dof = malloc(hdr.dofh_loadsz)) == NULL)
- return (-1);
-
- if (Pread(P, dof, hdr.dofh_loadsz, sym.st_value) !=
- hdr.dofh_loadsz) {
- free(dof);
- dt_dprintf("read of DOF section failed\n");
- continue;
- }
-
- dh.dofhp_dof = (uintptr_t)dof;
- dh.dofhp_pid = proc_getpid(P);
dt_pid_objname(dh.dofhp_mod, sizeof (dh.dofhp_mod),
sip.prs_lmid, mname);
+#ifdef __FreeBSD__
+ dh.dofhp_pid = proc_getpid(P);
+
if (fd == -1 &&
(fd = open("/dev/dtrace/helper", O_RDWR, 0)) < 0) {
dt_dprintf("open of helper device failed: %s\n",
strerror(errno));
- free(dof);
return (-1); /* errno is set for us */
}
if (ioctl(fd, DTRACEHIOC_ADDDOF, &dh, sizeof (dh)) < 0)
dt_dprintf("DOF was rejected for %s\n", dh.dofhp_mod);
-
- free(dof);
#else
- dh.dofhp_dof = sym.st_value;
- dh.dofhp_addr = (e_type == ET_EXEC) ? 0 : pmp->pr_vaddr;
-
- dt_pid_objname(dh.dofhp_mod, sizeof (dh.dofhp_mod),
- sip.prs_lmid, mname);
-
if (fd == -1 &&
(fd = pr_open(P, "/dev/dtrace/helper", O_RDWR, 0)) < 0) {
dt_dprintf("pr_open of helper device failed: %s\n",
Modified: user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/proc/Makefile
==============================================================================
--- user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/proc/Makefile Wed Dec 9 01:24:34 2015 (r292005)
+++ user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/proc/Makefile Wed Dec 9 05:35:46 2015 (r292006)
@@ -24,6 +24,6 @@ CFILES= \
tst.sigwait.c \
-LIBADD.tst.sigwait.exe=rt
+LIBADD.tst.sigwait.exe+= rt
.include "../../dtrace.test.mk"
Modified: user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/usdt/Makefile
==============================================================================
--- user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/usdt/Makefile Wed Dec 9 01:24:34 2015 (r292005)
+++ user/ngie/more-tests2/cddl/usr.sbin/dtrace/tests/common/usdt/Makefile Wed Dec 9 05:35:46 2015 (r292006)
@@ -46,6 +46,8 @@ TESTFILES= \
tst.onlyenabled.ksh \
tst.reap.ksh \
tst.reeval.ksh \
+ tst.sameprovmulti.ksh \
+ tst.sameprovmulti.ksh.out \
tst.static.ksh \
tst.static.ksh.out \
tst.static2.ksh \
Modified: user/ngie/more-tests2/contrib/bmake/ChangeLog
==============================================================================
--- user/ngie/more-tests2/contrib/bmake/ChangeLog Wed Dec 9 01:24:34 2015 (r292005)
+++ user/ngie/more-tests2/contrib/bmake/ChangeLog Wed Dec 9 05:35:46 2015 (r292006)
@@ -1,3 +1,35 @@
+2015-12-01 Simon J. Gerraty <sjg at bad.crufty.net>
+
+ * Makefile (MAKE_VERSION): 20151201
+ Merge with NetBSD make, pick up
+ o cond.c: CondCvtArg: avoid access beyond end of empty buffer.
+ o meta.c: meta_oodate: use lstat(2) for checking link target
+ in case it is a symlink.
+ o var.c: avoid calling brk_string and Var_Export1 with empty
+ strings.
+
+2015-11-26 Simon J. Gerraty <sjg at bad.crufty.net>
+
+ * Makefile (MAKE_VERSION): 20151126
+ Merge with NetBSD make, pick up
+ o parse.c: ParseTrackInput don't access beyond
+ end of old value.
+
+2015-10-22 Simon J. Gerraty <sjg at bad.crufty.net>
+
+ * Makefile (MAKE_VERSION): 20151022
+
+ * Add support for BSD/OS which lacks inttypes.h
+ and really needs sys/param.h for sys/sysctl.h
+ also 'type' is not a shell builtin.
+
+ * var.c: eliminate uint32_t and need for inttypes.h
+
+ * main.c: PrintOnError flush stdout before run .ERROR
+
+ * parse.c: cope with _SC_PAGESIZE not being defined.
+
+
2015-10-20 Simon J. Gerraty <sjg at bad.crufty.net>
* Makefile (MAKE_VERSION): 20151020
Modified: user/ngie/more-tests2/contrib/bmake/Makefile
==============================================================================
--- user/ngie/more-tests2/contrib/bmake/Makefile Wed Dec 9 01:24:34 2015 (r292005)
+++ user/ngie/more-tests2/contrib/bmake/Makefile Wed Dec 9 05:35:46 2015 (r292006)
@@ -1,7 +1,7 @@
-# $Id: Makefile,v 1.44 2015/10/20 21:41:40 sjg Exp $
+# $Id: Makefile,v 1.48 2015/12/02 00:36:42 sjg Exp $
# Base version on src date
-MAKE_VERSION= 20151020
+MAKE_VERSION= 20151201
PROG= bmake
Modified: user/ngie/more-tests2/contrib/bmake/boot-strap
==============================================================================
--- user/ngie/more-tests2/contrib/bmake/boot-strap Wed Dec 9 01:24:34 2015 (r292005)
+++ user/ngie/more-tests2/contrib/bmake/boot-strap Wed Dec 9 05:35:46 2015 (r292006)
@@ -111,7 +111,7 @@
# Simon J. Gerraty <sjg at crufty.net>
# RCSid:
-# $Id: boot-strap,v 1.45 2014/04/05 22:56:54 sjg Exp $
+# $Id: boot-strap,v 1.48 2015/10/25 05:20:48 sjg Exp $
#
# @(#) Copyright (c) 2001 Simon J. Gerraty
#
@@ -395,8 +395,15 @@ Bmake() {
)
}
+# there is actually a shell where type is not a builtin
+# if type is missing, which(1) had better exists!
+if (type cat) > /dev/null 2>&1; then
+which() {
+ type "$@" | sed 's,[()],,g;s,^[^/][^/]*,,;q'
+}
+fi
# make sure test below uses the same diff that configure did
-TOOL_DIFF=`type diff | sed 's,[()],,g;s,^[^/][^/]*,,;q'`
+TOOL_DIFF=`which diff`
export TOOL_DIFF
op_configure() {
Modified: user/ngie/more-tests2/contrib/bmake/cond.c
==============================================================================
--- user/ngie/more-tests2/contrib/bmake/cond.c Wed Dec 9 01:24:34 2015 (r292005)
+++ user/ngie/more-tests2/contrib/bmake/cond.c Wed Dec 9 05:35:46 2015 (r292006)
@@ -1,4 +1,4 @@
-/* $NetBSD: cond.c,v 1.69 2015/10/11 04:51:24 sjg Exp $ */
+/* $NetBSD: cond.c,v 1.71 2015/12/02 00:28:24 sjg Exp $ */
/*
* Copyright (c) 1988, 1989, 1990 The Regents of the University of California.
@@ -70,14 +70,14 @@
*/
#ifndef MAKE_NATIVE
-static char rcsid[] = "$NetBSD: cond.c,v 1.69 2015/10/11 04:51:24 sjg Exp $";
+static char rcsid[] = "$NetBSD: cond.c,v 1.71 2015/12/02 00:28:24 sjg Exp $";
#else
#include <sys/cdefs.h>
#ifndef lint
#if 0
static char sccsid[] = "@(#)cond.c 8.2 (Berkeley) 1/2/94";
#else
-__RCSID("$NetBSD: cond.c,v 1.69 2015/10/11 04:51:24 sjg Exp $");
+__RCSID("$NetBSD: cond.c,v 1.71 2015/12/02 00:28:24 sjg Exp $");
#endif
#endif /* not lint */
#endif
@@ -490,6 +490,10 @@ CondCvtArg(char *str, double *value)
double d_val;
errno = 0;
+ if (!*str) {
+ *value = (double)0;
+ return TRUE;
+ }
l_val = strtoul(str, &eptr, str[1] == 'x' ? 16 : 10);
ech = *eptr;
if (ech == 0 && errno != ERANGE) {
Modified: user/ngie/more-tests2/contrib/bmake/config.h.in
==============================================================================
--- user/ngie/more-tests2/contrib/bmake/config.h.in Wed Dec 9 01:24:34 2015 (r292005)
+++ user/ngie/more-tests2/contrib/bmake/config.h.in Wed Dec 9 05:35:46 2015 (r292006)
@@ -59,6 +59,12 @@
/* Define to 1 if you have the `killpg' function. */
#undef HAVE_KILLPG
+/* Define to 1 if you have the <libgen.h> header file. */
+#undef HAVE_LIBGEN_H
+
+/* Define to 1 if you have the <limits.h> header file. */
+#undef HAVE_LIMITS_H
+
/* Define to 1 if you have the <memory.h> header file. */
#undef HAVE_MEMORY_H
@@ -158,6 +164,9 @@
*/
#undef HAVE_SYS_NDIR_H
+/* Define to 1 if you have the <sys/param.h> header file. */
+#undef HAVE_SYS_PARAM_H
+
/* Define to 1 if you have the <sys/select.h> header file. */
#undef HAVE_SYS_SELECT_H
@@ -304,6 +313,11 @@
/* Define to 1 if you need to in order for `stat' and other things to work. */
#undef _POSIX_SOURCE
+/* Define for Solaris 2.5.1 so the uint32_t typedef from <sys/synch.h>,
+ <pthread.h>, or <semaphore.h> is not used. If the typedef were allowed, the
+ #define below would cause a syntax error. */
+#undef _UINT32_T
+
/* C99 function name */
#undef __func__
@@ -319,5 +333,9 @@
/* Define to `unsigned int' if <sys/types.h> does not define. */
#undef size_t
+/* Define to the type of an unsigned integer type of width exactly 32 bits if
+ such a type exists and the standard includes do not define it. */
+#undef uint32_t
+
/* Define as `fork' if `vfork' does not work. */
#undef vfork
Modified: user/ngie/more-tests2/contrib/bmake/configure
==============================================================================
Binary file (source and/or target). No diff available.
Modified: user/ngie/more-tests2/contrib/bmake/configure.in
==============================================================================
--- user/ngie/more-tests2/contrib/bmake/configure.in Wed Dec 9 01:24:34 2015 (r292005)
+++ user/ngie/more-tests2/contrib/bmake/configure.in Wed Dec 9 05:35:46 2015 (r292006)
@@ -1,11 +1,11 @@
dnl
dnl RCSid:
-dnl $Id: configure.in,v 1.54 2015/10/10 04:17:10 sjg Exp $
+dnl $Id: configure.in,v 1.56 2015/10/25 05:20:48 sjg Exp $
dnl
dnl Process this file with autoconf to produce a configure script
dnl
AC_PREREQ(2.50)
-AC_INIT([bmake], [20151009], [sjg at NetBSD.org])
+AC_INIT([bmake], [20151022], [sjg at NetBSD.org])
AC_CONFIG_HEADERS(config.h)
dnl make srcdir absolute
@@ -101,10 +101,19 @@ AC_HEADER_STDC
AC_HEADER_SYS_WAIT
AC_HEADER_DIRENT
dnl Keep this list sorted
+AC_CHECK_HEADERS(sys/param.h)
+dnl On BSDi at least we really need sys/param.h for sys/sysctl.h
+AC_CHECK_HEADERS([sys/sysctl.h], [], [],
+[#ifdef HAVE_SYS_PARAM_H
+# include <sys/param.h>
+# endif
+])
+
AC_CHECK_HEADERS( \
ar.h \
err.h \
fcntl.h \
+ libgen.h \
limits.h \
paths.h \
poll.h \
@@ -113,7 +122,6 @@ AC_CHECK_HEADERS( \
sys/mman.h \
sys/select.h \
sys/socket.h \
- sys/sysctl.h \
sys/time.h \
sys/uio.h \
unistd.h \
@@ -143,6 +151,7 @@ AC_C_CONST
AC_TYPE_OFF_T
AC_TYPE_PID_T
AC_TYPE_SIZE_T
+AC_TYPE_UINT32_T
AC_DECL_SYS_SIGLIST
AC_HEADER_TIME
AC_STRUCT_TM
Modified: user/ngie/more-tests2/contrib/bmake/main.c
==============================================================================
--- user/ngie/more-tests2/contrib/bmake/main.c Wed Dec 9 01:24:34 2015 (r292005)
+++ user/ngie/more-tests2/contrib/bmake/main.c Wed Dec 9 05:35:46 2015 (r292006)
@@ -1,4 +1,4 @@
-/* $NetBSD: main.c,v 1.234 2015/10/11 04:51:24 sjg Exp $ */
+/* $NetBSD: main.c,v 1.235 2015/10/25 05:24:44 sjg Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -69,7 +69,7 @@
*/
#ifndef MAKE_NATIVE
-static char rcsid[] = "$NetBSD: main.c,v 1.234 2015/10/11 04:51:24 sjg Exp $";
+static char rcsid[] = "$NetBSD: main.c,v 1.235 2015/10/25 05:24:44 sjg Exp $";
#else
#include <sys/cdefs.h>
#ifndef lint
@@ -81,7 +81,7 @@ __COPYRIGHT("@(#) Copyright (c) 1988, 19
#if 0
static char sccsid[] = "@(#)main.c 8.3 (Berkeley) 3/19/94";
#else
-__RCSID("$NetBSD: main.c,v 1.234 2015/10/11 04:51:24 sjg Exp $");
+__RCSID("$NetBSD: main.c,v 1.235 2015/10/25 05:24:44 sjg Exp $");
#endif
#endif /* not lint */
#endif
@@ -1902,6 +1902,8 @@ PrintOnError(GNode *gn, const char *s)
printf("%s", cp);
free(cp);
}
+ fflush(stdout);
+
/*
* Finally, see if there is a .ERROR target, and run it if so.
*/
Modified: user/ngie/more-tests2/contrib/bmake/meta.c
==============================================================================
--- user/ngie/more-tests2/contrib/bmake/meta.c Wed Dec 9 01:24:34 2015 (r292005)
+++ user/ngie/more-tests2/contrib/bmake/meta.c Wed Dec 9 05:35:46 2015 (r292006)
@@ -1,4 +1,4 @@
-/* $NetBSD: meta.c,v 1.40 2015/10/11 04:51:24 sjg Exp $ */
+/* $NetBSD: meta.c,v 1.41 2015/11/30 23:37:56 sjg Exp $ */
/*
* Implement 'meta' mode.
@@ -38,7 +38,11 @@
#include <sys/stat.h>
#include <sys/ioctl.h>
#include <fcntl.h>
+#ifdef HAVE_LIBGEN_H
#include <libgen.h>
+#elif !defined(HAVE_DIRNAME)
+char * dirname(char *);
+#endif
#include <errno.h>
#if !defined(HAVE_CONFIG_H) || defined(HAVE_ERR_H)
#include <err.h>
@@ -1183,7 +1187,8 @@ meta_oodate(GNode *gn, Boolean oodate)
if ((strstr("tmp", p)))
break;
- if (stat(p, &fs) < 0) {
+ if ((link_src != NULL && lstat(p, &fs) < 0) ||
+ (link_src == NULL && stat(p, &fs) < 0)) {
Lst_AtEnd(missingFiles, bmake_strdup(p));
}
break;
Modified: user/ngie/more-tests2/contrib/bmake/mk/ChangeLog
==============================================================================
--- user/ngie/more-tests2/contrib/bmake/mk/ChangeLog Wed Dec 9 01:24:34 2015 (r292005)
+++ user/ngie/more-tests2/contrib/bmake/mk/ChangeLog Wed Dec 9 05:35:46 2015 (r292006)
@@ -1,3 +1,29 @@
+2015-11-14 Simon J. Gerraty <sjg at bad.crufty.net>
+
+ * install-mk (MK_VERSION): 20151111
+
+ * meta.sys.mk: include sys.dependfile.mk
+
+ * sys.mk (OPTIONS_DEFAULT_NO): use options.mk
+ to set MK_AUTO_OBJ and MK_DIRDEPS_BUILD
+ include local.sys.env.mk early
+ include local.sys.mk later
+
+ * own.mk (OPTIONS_DEFAULT_NO): AUTO_OBJ etc moved to sys.mk
+
+2015-11-13 Simon J. Gerraty <sjg at bad.crufty.net>
+
+ * meta.sys.mk (META_COOKIE_TOUCH):
+ add ${META_COOKIE_TOUCH} to the end of scripts to touch cookie
+
+ * meta.stage.mk: stage_libs should ignore SYMLINKS.
+
+2015-10-23 Simon J. Gerraty <sjg at bad.crufty.net>
+
+ * install-mk (MK_VERSION): 20151022
+
+ * sys.mk: BSD/OS does not have 'type' as a shell builtin.
+
2015-10-20 Simon J. Gerraty <sjg at bad.crufty.net>
* install-mk (MK_VERSION): 20151020
@@ -460,7 +486,7 @@
needed.
* gendirdeps.mk: only produce unqualified deps if no
.MAKE.DEPENDFILE_PREFERENCE ends in .${MACHINE}
- * meta.subdir.mk: apply SUBDIREPS_FILTER
+ * meta.subdir.mk: apply SUBDIRDEPS_FILTER
2012-04-20 Simon J. Gerraty <sjg at bad.crufty.net>
Modified: user/ngie/more-tests2/contrib/bmake/mk/host-target.mk
==============================================================================
--- user/ngie/more-tests2/contrib/bmake/mk/host-target.mk Wed Dec 9 01:24:34 2015 (r292005)
+++ user/ngie/more-tests2/contrib/bmake/mk/host-target.mk Wed Dec 9 05:35:46 2015 (r292006)
@@ -1,5 +1,5 @@
# RCSid:
-# $Id: host-target.mk,v 1.9 2015/09/10 18:42:57 sjg Exp $
+# $Id: host-target.mk,v 1.11 2015/10/25 00:07:20 sjg Exp $
# Host platform information; may be overridden
.if !defined(_HOST_OSNAME)
@@ -21,7 +21,7 @@ _HOST_ARCH := ${_HOST_MACHINE}
.else
_HOST_ARCH != uname -p 2> /dev/null || uname -m
# uname -p may produce garbage on linux
-.if ${_HOST_ARCH:[\#]} > 1
+.if ${_HOST_ARCH:[\#]} > 1 || ${_HOST_ARCH:Nunknown} == ""
_HOST_ARCH := ${_HOST_MACHINE}
.endif
.endif
@@ -33,10 +33,10 @@ HOST_MACHINE := ${_HOST_MACHINE}
.endif
HOST_OSMAJOR := ${_HOST_OSREL:C/[^0-9].*//}
-HOST_OSTYPE := ${_HOST_OSNAME}-${_HOST_OSREL:C/\([^\)]*\)//}-${_HOST_ARCH}
+HOST_OSTYPE := ${_HOST_OSNAME:S,/,,g}-${_HOST_OSREL:C/\([^\)]*\)//}-${_HOST_ARCH}
HOST_OS := ${_HOST_OSNAME}
host_os := ${_HOST_OSNAME:tl}
-HOST_TARGET := ${host_os}${HOST_OSMAJOR}-${_HOST_ARCH}
+HOST_TARGET := ${host_os:S,/,,g}${HOST_OSMAJOR}-${_HOST_ARCH}
# tr is insanely non-portable, accommodate the lowest common denominator
TR ?= tr
Modified: user/ngie/more-tests2/contrib/bmake/mk/init.mk
==============================================================================
--- user/ngie/more-tests2/contrib/bmake/mk/init.mk Wed Dec 9 01:24:34 2015 (r292005)
+++ user/ngie/more-tests2/contrib/bmake/mk/init.mk Wed Dec 9 05:35:46 2015 (r292006)
@@ -1,4 +1,4 @@
-# $Id: init.mk,v 1.9 2013/07/18 05:46:24 sjg Exp $
+# $Id: init.mk,v 1.10 2015/12/07 04:28:31 sjg Exp $
#
# @(#) Copyright (c) 2002, Simon J. Gerraty
#
@@ -47,4 +47,8 @@ PROFFLAGS?= -DGPROF -DPROF
_SKIP_BUILD = not building at level 0
.endif
+.if !empty(_SKIP_BUILD)
+all: .PHONY
+.warning ${_SKIP_BUILD}
+.endif
.endif
Modified: user/ngie/more-tests2/contrib/bmake/mk/install-mk
==============================================================================
--- user/ngie/more-tests2/contrib/bmake/mk/install-mk Wed Dec 9 01:24:34 2015 (r292005)
+++ user/ngie/more-tests2/contrib/bmake/mk/install-mk Wed Dec 9 05:35:46 2015 (r292006)
@@ -55,7 +55,7 @@
# Simon J. Gerraty <sjg at crufty.net>
# RCSid:
-# $Id: install-mk,v 1.115 2015/10/20 22:04:53 sjg Exp $
+# $Id: install-mk,v 1.117 2015/11/14 18:09:57 sjg Exp $
#
# @(#) Copyright (c) 1994 Simon J. Gerraty
#
@@ -70,7 +70,7 @@
# sjg at crufty.net
#
-MK_VERSION=20151020
+MK_VERSION=20151111
OWNER=
GROUP=
MODE=444
Modified: user/ngie/more-tests2/contrib/bmake/mk/lib.mk
==============================================================================
--- user/ngie/more-tests2/contrib/bmake/mk/lib.mk Wed Dec 9 01:24:34 2015 (r292005)
+++ user/ngie/more-tests2/contrib/bmake/mk/lib.mk Wed Dec 9 05:35:46 2015 (r292006)
@@ -1,4 +1,4 @@
-# $Id: lib.mk,v 1.51 2014/05/23 01:30:36 sjg Exp $
+# $Id: lib.mk,v 1.52 2015/11/14 18:09:57 sjg Exp $
.if !target(__${.PARSEFILE}__)
__${.PARSEFILE}__:
@@ -254,7 +254,7 @@ DLLIB ?= -ldl
# is a waste of time, this tells meta.autodep.mk to just pick one
# (typically .So)
# yes, 42 is a random number.
-.if ${MK_META_MODE} == "yes" && ${SRCS:Uno:[\#]} > 42
+.if ${MK_DIRDEPS_BUILD} == "yes" && ${SRCS:Uno:[\#]} > 42
OPTIMIZE_OBJECT_META_FILES ?= yes
.endif
Modified: user/ngie/more-tests2/contrib/bmake/mk/meta.autodep.mk
==============================================================================
--- user/ngie/more-tests2/contrib/bmake/mk/meta.autodep.mk Wed Dec 9 01:24:34 2015 (r292005)
+++ user/ngie/more-tests2/contrib/bmake/mk/meta.autodep.mk Wed Dec 9 05:35:46 2015 (r292006)
@@ -1,4 +1,4 @@
-# $Id: meta.autodep.mk,v 1.37 2015/06/16 06:29:17 sjg Exp $
+# $Id: meta.autodep.mk,v 1.39 2015/12/07 04:35:32 sjg Exp $
#
# @(#) Copyright (c) 2010, Simon J. Gerraty
@@ -50,6 +50,9 @@ UPDATE_DEPENDFILE = NO
.endif
_CURDIR ?= ${.CURDIR}
+_OBJDIR ?= ${.OBJDIR}
+_OBJTOP ?= ${OBJTOP}
+_OBJROOT ?= ${OBJROOT:U${_OBJTOP}}
_DEPENDFILE := ${_CURDIR}/${.MAKE.DEPENDFILE:T}
.if ${.MAKE.LEVEL} == 0
@@ -190,7 +193,7 @@ gendirdeps: ${_DEPENDFILE}
# anything which matches ${_OBJROOT}* but not ${_OBJTOP}*
# needs to be qualified in DIRDEPS
# The pseudo machine "host" is used for HOST_TARGET
-DIRDEPS = \
+DIRDEPS += \
${DPADD:M${_OBJTOP}*:H:C,${_OBJTOP}[^/]*/,,:N.:O:u} \
${DPADD:M${_OBJROOT}*:N${_OBJTOP}*:H:S,${_OBJROOT},,:C,^([^/]+)/(.*),\2.\1,:S,${HOST_TARGET}$,host,:N.*:O:u}
Modified: user/ngie/more-tests2/contrib/bmake/mk/meta.stage.mk
==============================================================================
--- user/ngie/more-tests2/contrib/bmake/mk/meta.stage.mk Wed Dec 9 01:24:34 2015 (r292005)
+++ user/ngie/more-tests2/contrib/bmake/mk/meta.stage.mk Wed Dec 9 05:35:46 2015 (r292006)
@@ -1,4 +1,4 @@
-# $Id: meta.stage.mk,v 1.40 2015/10/04 17:36:54 sjg Exp $
+# $Id: meta.stage.mk,v 1.41 2015/11/13 17:34:04 sjg Exp $
#
# @(#) Copyright (c) 2011, Simon J. Gerraty
#
@@ -155,7 +155,7 @@ stage_libs: .dirdep
@${STAGE_LINKS_SCRIPT}; StageLinks -s ${STAGE_LIBDIR:${STAGE_DIR_FILTER}} \
${SHLIB_LINKS:@t@${STAGE_LIBS:T:M$t.*} $t@}
.elif !empty(SHLIB_LINK) && !empty(SHLIB_NAME)
- @${STAGE_LINKS_SCRIPT}; StageLinks -s ${STAGE_LIBDIR:${STAGE_DIR_FILTER}} ${SHLIB_NAME} ${SHLIB_LINK} ${SYMLINKS:T}
+ @${STAGE_LINKS_SCRIPT}; StageLinks -s ${STAGE_LIBDIR:${STAGE_DIR_FILTER}} ${SHLIB_NAME} ${SHLIB_LINK}
.endif
.endif
@touch $@
Modified: user/ngie/more-tests2/contrib/bmake/mk/meta.subdir.mk
==============================================================================
--- user/ngie/more-tests2/contrib/bmake/mk/meta.subdir.mk Wed Dec 9 01:24:34 2015 (r292005)
+++ user/ngie/more-tests2/contrib/bmake/mk/meta.subdir.mk Wed Dec 9 05:35:46 2015 (r292006)
@@ -1,4 +1,4 @@
-# $Id: meta.subdir.mk,v 1.10 2012/07/03 05:26:46 sjg Exp $
+# $Id: meta.subdir.mk,v 1.11 2015/11/24 22:26:51 sjg Exp $
#
# @(#) Copyright (c) 2010, Simon J. Gerraty
@@ -62,7 +62,7 @@ _subdeps != cd ${.CURDIR} && \
DIRDEPS =
.else
# clean up if needed
-DIRDEPS := ${DIRDEPS:S,^./,,:S,/./,/,g:${SUBDIREPS_FILTER:Uu}}
+DIRDEPS := ${DIRDEPS:S,^./,,:S,/./,/,g:${SUBDIRDEPS_FILTER:Uu}}
.endif
# we just dealt with it, if we leave it defined,
# dirdeps.mk will compute some interesting combinations.
Modified: user/ngie/more-tests2/contrib/bmake/mk/meta.sys.mk
==============================================================================
--- user/ngie/more-tests2/contrib/bmake/mk/meta.sys.mk Wed Dec 9 01:24:34 2015 (r292005)
+++ user/ngie/more-tests2/contrib/bmake/mk/meta.sys.mk Wed Dec 9 05:35:46 2015 (r292006)
@@ -1,4 +1,4 @@
-# $Id: meta.sys.mk,v 1.22 2015/06/16 06:31:05 sjg Exp $
+# $Id: meta.sys.mk,v 1.26 2015/11/14 21:16:13 sjg Exp $
#
# @(#) Copyright (c) 2010, Simon J. Gerraty
@@ -51,17 +51,6 @@ META_MODE += silent=yes
.endif
.endif
-# make defaults .MAKE.DEPENDFILE to .depend
-# that won't work for us.
-.if ${.MAKE.DEPENDFILE} == ".depend"
-.undef .MAKE.DEPENDFILE
-.endif
-
-# if you don't cross build for multiple MACHINEs concurrently, then
-# .MAKE.DEPENDFILE = Makefile.depend
-# probably makes sense - you can set that in local.sys.mk
-.MAKE.DEPENDFILE ?= Makefile.depend.${MACHINE}
-
# we use the pseudo machine "host" for the build host.
# this should be taken care of before we get here
.if ${OBJTOP:Ua} == ${HOST_OBJTOP:Ub}
@@ -109,10 +98,27 @@ _metaError: .NOMETA .NOTMAIN
.endif
+META_COOKIE_TOUCH=
+# some targets need to be .PHONY in non-meta mode
+META_NOPHONY= .PHONY
# Are we, after all, in meta mode?
.if ${.MAKE.MODE:Mmeta*} != ""
MKDEP_MK = meta.autodep.mk
+.if ${.MAKE.MAKEFILES:M*sys.dependfile.mk} == ""
+# this does all the smarts of setting .MAKE.DEPENDFILE
+.-include <sys.dependfile.mk>
*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
More information about the svn-src-user
mailing list