Date: Fri, 26 Aug 2016 17:31:21 +0000 (UTC) From: Mark Johnston <markj@FreeBSD.org> To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r304852 - in user/alc/PQ_LAUNDRY: . bin/dd bin/ls/tests cddl/lib/libdtrace contrib/binutils/bfd contrib/sqlite3 contrib/sqlite3/tea crypto/heimdal/lib/hx509 crypto/openssl/crypto/bn/asm... Message-ID: <201608261731.u7QHVLCS015188@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: markj Date: Fri Aug 26 17:31:20 2016 New Revision: 304852 URL: https://svnweb.freebsd.org/changeset/base/304852 Log: MFH r289108 Added: user/alc/PQ_LAUNDRY/contrib/sqlite3/Makefile.msc - copied unchanged from r304851, head/contrib/sqlite3/Makefile.msc user/alc/PQ_LAUNDRY/contrib/sqlite3/Replace.cs - copied unchanged from r304851, head/contrib/sqlite3/Replace.cs user/alc/PQ_LAUNDRY/contrib/sqlite3/compile - copied unchanged from r304851, head/contrib/sqlite3/compile user/alc/PQ_LAUNDRY/contrib/sqlite3/sqlite3.rc - copied unchanged from r304851, head/contrib/sqlite3/sqlite3.rc user/alc/PQ_LAUNDRY/contrib/sqlite3/tea/ - copied from r304851, head/contrib/sqlite3/tea/ user/alc/PQ_LAUNDRY/lib/libifc/ - copied from r304851, head/lib/libifc/ user/alc/PQ_LAUNDRY/secure/lib/libcrypto/arm/ - copied from r304851, head/secure/lib/libcrypto/arm/ user/alc/PQ_LAUNDRY/share/examples/libifc/ - copied from r304851, head/share/examples/libifc/ user/alc/PQ_LAUNDRY/sys/amd64/cloudabi32/ - copied from r304851, head/sys/amd64/cloudabi32/ user/alc/PQ_LAUNDRY/sys/arm/allwinner/aw_ts.c - copied unchanged from r304851, head/sys/arm/allwinner/aw_ts.c user/alc/PQ_LAUNDRY/sys/contrib/cloudabi/cloudabi_vdso_i686.S - copied unchanged from r304851, head/sys/contrib/cloudabi/cloudabi_vdso_i686.S user/alc/PQ_LAUNDRY/sys/contrib/cloudabi/cloudabi_vdso_i686_on_64bit.S - copied unchanged from r304851, head/sys/contrib/cloudabi/cloudabi_vdso_i686_on_64bit.S user/alc/PQ_LAUNDRY/sys/dev/hyperv/netvsc/ndis.h - copied unchanged from r304851, head/sys/dev/hyperv/netvsc/ndis.h user/alc/PQ_LAUNDRY/sys/dev/hyperv/utilities/vmbus_icreg.h - copied unchanged from r304851, head/sys/dev/hyperv/utilities/vmbus_icreg.h user/alc/PQ_LAUNDRY/sys/i386/cloudabi32/ - copied from r304851, head/sys/i386/cloudabi32/ user/alc/PQ_LAUNDRY/sys/modules/cloudabi32/ - copied from r304851, head/sys/modules/cloudabi32/ user/alc/PQ_LAUNDRY/sys/net/rndis.h - copied unchanged from r304851, head/sys/net/rndis.h Deleted: user/alc/PQ_LAUNDRY/sys/contrib/cloudabi/cloudabi_types.h Modified: user/alc/PQ_LAUNDRY/Makefile.inc1 user/alc/PQ_LAUNDRY/Makefile.libcompat user/alc/PQ_LAUNDRY/UPDATING user/alc/PQ_LAUNDRY/bin/dd/dd.1 user/alc/PQ_LAUNDRY/bin/ls/tests/ls_tests.sh user/alc/PQ_LAUNDRY/cddl/lib/libdtrace/psinfo.d user/alc/PQ_LAUNDRY/contrib/binutils/bfd/config.bfd user/alc/PQ_LAUNDRY/contrib/sqlite3/Makefile.am user/alc/PQ_LAUNDRY/contrib/sqlite3/Makefile.in user/alc/PQ_LAUNDRY/contrib/sqlite3/configure user/alc/PQ_LAUNDRY/contrib/sqlite3/configure.ac user/alc/PQ_LAUNDRY/contrib/sqlite3/shell.c user/alc/PQ_LAUNDRY/contrib/sqlite3/sqlite3.c user/alc/PQ_LAUNDRY/contrib/sqlite3/sqlite3.h user/alc/PQ_LAUNDRY/contrib/sqlite3/sqlite3ext.h user/alc/PQ_LAUNDRY/crypto/heimdal/lib/hx509/version-script.map user/alc/PQ_LAUNDRY/crypto/openssl/crypto/bn/asm/armv4-gf2m.pl user/alc/PQ_LAUNDRY/crypto/openssl/crypto/sha/asm/sha256-armv4.pl user/alc/PQ_LAUNDRY/etc/newsyslog.conf user/alc/PQ_LAUNDRY/etc/ntp/leap-seconds (contents, props changed) user/alc/PQ_LAUNDRY/etc/rc.d/ntpd user/alc/PQ_LAUNDRY/include/xlocale/_locale.h user/alc/PQ_LAUNDRY/lib/Makefile user/alc/PQ_LAUNDRY/lib/libc/gen/__getosreldate.c user/alc/PQ_LAUNDRY/lib/libc/nls/msgcat.c user/alc/PQ_LAUNDRY/lib/libc/stdio/fgetln.c user/alc/PQ_LAUNDRY/lib/libc/stdio/fgetwc.c user/alc/PQ_LAUNDRY/lib/libc/stdio/fgetwln.c user/alc/PQ_LAUNDRY/lib/libc/stdio/fputwc.c user/alc/PQ_LAUNDRY/lib/libc/stdio/getdelim.c user/alc/PQ_LAUNDRY/lib/libc/stdio/vfprintf.c user/alc/PQ_LAUNDRY/lib/libc/stdio/vfwprintf.c user/alc/PQ_LAUNDRY/lib/libpam/modules/pam_ssh/pam_ssh.8 user/alc/PQ_LAUNDRY/lib/libpam/modules/pam_ssh/pam_ssh.c user/alc/PQ_LAUNDRY/lib/libstand/dosfs.c user/alc/PQ_LAUNDRY/libexec/rtld-elf/mips/reloc.c user/alc/PQ_LAUNDRY/sbin/camcontrol/camcontrol.c user/alc/PQ_LAUNDRY/sbin/ggate/ggatec/ggatec.8 user/alc/PQ_LAUNDRY/sbin/ggate/ggated/ggated.8 user/alc/PQ_LAUNDRY/sbin/resolvconf/Makefile user/alc/PQ_LAUNDRY/secure/lib/libcrypto/Makefile user/alc/PQ_LAUNDRY/secure/lib/libcrypto/Makefile.asm user/alc/PQ_LAUNDRY/secure/lib/libcrypto/Makefile.inc user/alc/PQ_LAUNDRY/secure/lib/libcrypto/amd64/aes-x86_64.S user/alc/PQ_LAUNDRY/secure/lib/libcrypto/amd64/aesni-gcm-x86_64.S user/alc/PQ_LAUNDRY/secure/lib/libcrypto/amd64/aesni-mb-x86_64.S user/alc/PQ_LAUNDRY/secure/lib/libcrypto/amd64/aesni-sha1-x86_64.S user/alc/PQ_LAUNDRY/secure/lib/libcrypto/amd64/aesni-sha256-x86_64.S user/alc/PQ_LAUNDRY/secure/lib/libcrypto/amd64/aesni-x86_64.S user/alc/PQ_LAUNDRY/secure/lib/libcrypto/amd64/bsaes-x86_64.S user/alc/PQ_LAUNDRY/secure/lib/libcrypto/amd64/cmll-x86_64.S user/alc/PQ_LAUNDRY/secure/lib/libcrypto/amd64/ecp_nistz256-x86_64.S user/alc/PQ_LAUNDRY/secure/lib/libcrypto/amd64/ghash-x86_64.S user/alc/PQ_LAUNDRY/secure/lib/libcrypto/amd64/md5-x86_64.S user/alc/PQ_LAUNDRY/secure/lib/libcrypto/amd64/rc4-md5-x86_64.S user/alc/PQ_LAUNDRY/secure/lib/libcrypto/amd64/rc4-x86_64.S user/alc/PQ_LAUNDRY/secure/lib/libcrypto/amd64/rsaz-avx2.S user/alc/PQ_LAUNDRY/secure/lib/libcrypto/amd64/rsaz-x86_64.S user/alc/PQ_LAUNDRY/secure/lib/libcrypto/amd64/sha1-mb-x86_64.S user/alc/PQ_LAUNDRY/secure/lib/libcrypto/amd64/sha1-x86_64.S user/alc/PQ_LAUNDRY/secure/lib/libcrypto/amd64/sha256-mb-x86_64.S user/alc/PQ_LAUNDRY/secure/lib/libcrypto/amd64/sha256-x86_64.S user/alc/PQ_LAUNDRY/secure/lib/libcrypto/amd64/sha512-x86_64.S user/alc/PQ_LAUNDRY/secure/lib/libcrypto/amd64/vpaes-x86_64.S user/alc/PQ_LAUNDRY/secure/lib/libcrypto/amd64/wp-x86_64.S user/alc/PQ_LAUNDRY/secure/lib/libcrypto/amd64/x86_64-gf2m.S user/alc/PQ_LAUNDRY/secure/lib/libcrypto/amd64/x86_64-mont.S user/alc/PQ_LAUNDRY/secure/lib/libcrypto/amd64/x86_64-mont5.S user/alc/PQ_LAUNDRY/secure/lib/libcrypto/amd64/x86_64cpuid.S user/alc/PQ_LAUNDRY/secure/lib/libcrypto/i386/aes-586.S user/alc/PQ_LAUNDRY/secure/lib/libcrypto/i386/aesni-x86.S user/alc/PQ_LAUNDRY/secure/lib/libcrypto/i386/bf-586.S user/alc/PQ_LAUNDRY/secure/lib/libcrypto/i386/bf-686.S user/alc/PQ_LAUNDRY/secure/lib/libcrypto/i386/bn-586.S user/alc/PQ_LAUNDRY/secure/lib/libcrypto/i386/cmll-x86.S user/alc/PQ_LAUNDRY/secure/lib/libcrypto/i386/co-586.S user/alc/PQ_LAUNDRY/secure/lib/libcrypto/i386/crypt586.S user/alc/PQ_LAUNDRY/secure/lib/libcrypto/i386/des-586.S user/alc/PQ_LAUNDRY/secure/lib/libcrypto/i386/ghash-x86.S user/alc/PQ_LAUNDRY/secure/lib/libcrypto/i386/md5-586.S user/alc/PQ_LAUNDRY/secure/lib/libcrypto/i386/rc4-586.S user/alc/PQ_LAUNDRY/secure/lib/libcrypto/i386/rc5-586.S user/alc/PQ_LAUNDRY/secure/lib/libcrypto/i386/rmd-586.S user/alc/PQ_LAUNDRY/secure/lib/libcrypto/i386/sha1-586.S user/alc/PQ_LAUNDRY/secure/lib/libcrypto/i386/sha256-586.S user/alc/PQ_LAUNDRY/secure/lib/libcrypto/i386/sha512-586.S user/alc/PQ_LAUNDRY/secure/lib/libcrypto/i386/vpaes-x86.S user/alc/PQ_LAUNDRY/secure/lib/libcrypto/i386/wp-mmx.S user/alc/PQ_LAUNDRY/secure/lib/libcrypto/i386/x86-gf2m.S user/alc/PQ_LAUNDRY/secure/lib/libcrypto/i386/x86-mont.S user/alc/PQ_LAUNDRY/secure/lib/libcrypto/i386/x86cpuid.S user/alc/PQ_LAUNDRY/share/i18n/esdb/Makefile.part user/alc/PQ_LAUNDRY/share/man/man4/cloudabi.4 user/alc/PQ_LAUNDRY/share/man/man4/man4.i386/ep.4 user/alc/PQ_LAUNDRY/share/man/man4/sn.4 user/alc/PQ_LAUNDRY/share/man/man5/src.conf.5 user/alc/PQ_LAUNDRY/share/mk/bsd.dep.mk user/alc/PQ_LAUNDRY/share/mk/bsd.libnames.mk user/alc/PQ_LAUNDRY/share/mk/bsd.obj.mk user/alc/PQ_LAUNDRY/share/mk/bsd.subdir.mk user/alc/PQ_LAUNDRY/share/mk/src.libnames.mk user/alc/PQ_LAUNDRY/share/mk/src.opts.mk user/alc/PQ_LAUNDRY/share/mk/src.sys.env.mk user/alc/PQ_LAUNDRY/sys/amd64/cloudabi64/cloudabi64_sysvec.c user/alc/PQ_LAUNDRY/sys/amd64/conf/NOTES user/alc/PQ_LAUNDRY/sys/amd64/include/intr_machdep.h user/alc/PQ_LAUNDRY/sys/arm/allwinner/a10_gpio.c user/alc/PQ_LAUNDRY/sys/arm/allwinner/aw_rtc.c user/alc/PQ_LAUNDRY/sys/arm/allwinner/axp81x.c user/alc/PQ_LAUNDRY/sys/arm/allwinner/clk/aw_gate.c user/alc/PQ_LAUNDRY/sys/arm/allwinner/clk/aw_modclk.c user/alc/PQ_LAUNDRY/sys/arm/allwinner/clk/aw_pll.c user/alc/PQ_LAUNDRY/sys/arm/allwinner/files.allwinner user/alc/PQ_LAUNDRY/sys/arm/arm/elf_trampoline.c user/alc/PQ_LAUNDRY/sys/arm64/arm64/busdma_bounce.c user/alc/PQ_LAUNDRY/sys/arm64/arm64/gic_v3.c user/alc/PQ_LAUNDRY/sys/arm64/arm64/pmap.c user/alc/PQ_LAUNDRY/sys/arm64/arm64/trap.c user/alc/PQ_LAUNDRY/sys/arm64/cloudabi64/cloudabi64_sysvec.c user/alc/PQ_LAUNDRY/sys/arm64/conf/GENERIC user/alc/PQ_LAUNDRY/sys/arm64/include/pmap.h user/alc/PQ_LAUNDRY/sys/boot/common/dev_net.c user/alc/PQ_LAUNDRY/sys/boot/efi/libefi/Makefile user/alc/PQ_LAUNDRY/sys/boot/efi/loader/Makefile user/alc/PQ_LAUNDRY/sys/boot/efi/loader/conf.c user/alc/PQ_LAUNDRY/sys/boot/efi/loader/devicename.c user/alc/PQ_LAUNDRY/sys/boot/userboot/userboot/main.c user/alc/PQ_LAUNDRY/sys/cam/ctl/ctl_frontend_iscsi.c user/alc/PQ_LAUNDRY/sys/cam/ctl/ctl_frontend_iscsi.h user/alc/PQ_LAUNDRY/sys/cam/ctl/ctl_ioctl.h user/alc/PQ_LAUNDRY/sys/cddl/boot/zfs/zfssubr.c user/alc/PQ_LAUNDRY/sys/compat/ia32/ia32_signal.h user/alc/PQ_LAUNDRY/sys/conf/files.amd64 user/alc/PQ_LAUNDRY/sys/conf/files.arm64 user/alc/PQ_LAUNDRY/sys/conf/files.i386 user/alc/PQ_LAUNDRY/sys/conf/kern.post.mk user/alc/PQ_LAUNDRY/sys/ddb/db_command.c user/alc/PQ_LAUNDRY/sys/dev/bhnd/bhndb/bhndb.c user/alc/PQ_LAUNDRY/sys/dev/cxgbe/cxgbei/cxgbei.c user/alc/PQ_LAUNDRY/sys/dev/cxgbe/cxgbei/cxgbei.h user/alc/PQ_LAUNDRY/sys/dev/cxgbe/cxgbei/icl_cxgbei.c user/alc/PQ_LAUNDRY/sys/dev/hyperv/include/vmbus.h user/alc/PQ_LAUNDRY/sys/dev/hyperv/netvsc/hv_net_vsc.c user/alc/PQ_LAUNDRY/sys/dev/hyperv/netvsc/hv_net_vsc.h user/alc/PQ_LAUNDRY/sys/dev/hyperv/netvsc/hv_netvsc_drv_freebsd.c user/alc/PQ_LAUNDRY/sys/dev/hyperv/netvsc/hv_rndis.h user/alc/PQ_LAUNDRY/sys/dev/hyperv/netvsc/hv_rndis_filter.c user/alc/PQ_LAUNDRY/sys/dev/hyperv/netvsc/hv_rndis_filter.h user/alc/PQ_LAUNDRY/sys/dev/hyperv/netvsc/if_hnvar.h user/alc/PQ_LAUNDRY/sys/dev/hyperv/storvsc/hv_storvsc_drv_freebsd.c user/alc/PQ_LAUNDRY/sys/dev/hyperv/storvsc/hv_vstorage.h user/alc/PQ_LAUNDRY/sys/dev/hyperv/utilities/hv_heartbeat.c user/alc/PQ_LAUNDRY/sys/dev/hyperv/utilities/hv_shutdown.c user/alc/PQ_LAUNDRY/sys/dev/hyperv/utilities/hv_timesync.c user/alc/PQ_LAUNDRY/sys/dev/hyperv/utilities/hv_util.c user/alc/PQ_LAUNDRY/sys/dev/hyperv/utilities/hv_util.h user/alc/PQ_LAUNDRY/sys/dev/hyperv/vmbus/vmbus_brvar.h user/alc/PQ_LAUNDRY/sys/dev/hyperv/vmbus/vmbus_chan.c user/alc/PQ_LAUNDRY/sys/dev/intpm/intpm.c user/alc/PQ_LAUNDRY/sys/dev/ioat/ioat.c user/alc/PQ_LAUNDRY/sys/dev/iscsi/icl.c user/alc/PQ_LAUNDRY/sys/dev/iscsi/icl.h user/alc/PQ_LAUNDRY/sys/dev/iscsi/icl_soft.c user/alc/PQ_LAUNDRY/sys/dev/iscsi/iscsi.c user/alc/PQ_LAUNDRY/sys/dev/iscsi/iscsi.h user/alc/PQ_LAUNDRY/sys/dev/iscsi/iscsi_ioctl.h user/alc/PQ_LAUNDRY/sys/dev/iser/icl_iser.c user/alc/PQ_LAUNDRY/sys/dev/mlx5/mlx5_en/en.h user/alc/PQ_LAUNDRY/sys/dev/syscons/syscons.c user/alc/PQ_LAUNDRY/sys/dev/syscons/syscons.h user/alc/PQ_LAUNDRY/sys/dev/usb/controller/xhci.c user/alc/PQ_LAUNDRY/sys/dev/usb/input/uep.c user/alc/PQ_LAUNDRY/sys/dev/usb/input/ukbd.c user/alc/PQ_LAUNDRY/sys/dev/usb/net/if_urndis.c user/alc/PQ_LAUNDRY/sys/dev/usb/net/if_urndisreg.h user/alc/PQ_LAUNDRY/sys/i386/conf/NOTES user/alc/PQ_LAUNDRY/sys/i386/include/intr_machdep.h user/alc/PQ_LAUNDRY/sys/kern/kern_umtx.c user/alc/PQ_LAUNDRY/sys/kern/subr_witness.c user/alc/PQ_LAUNDRY/sys/modules/Makefile user/alc/PQ_LAUNDRY/sys/netinet/cc/cc.h user/alc/PQ_LAUNDRY/sys/netinet/cc/cc_newreno.c user/alc/PQ_LAUNDRY/sys/netinet/sctp_input.c user/alc/PQ_LAUNDRY/sys/netinet/sctputil.c user/alc/PQ_LAUNDRY/sys/netinet/tcp_input.c user/alc/PQ_LAUNDRY/sys/netinet/tcp_lro.c user/alc/PQ_LAUNDRY/sys/netinet/tcp_var.h user/alc/PQ_LAUNDRY/sys/netinet/udp_usrreq.c user/alc/PQ_LAUNDRY/sys/netinet6/ip6_output.c user/alc/PQ_LAUNDRY/sys/netinet6/udp6_usrreq.c user/alc/PQ_LAUNDRY/sys/ofed/drivers/infiniband/core/iwcm.c user/alc/PQ_LAUNDRY/sys/powerpc/booke/booke_machdep.c user/alc/PQ_LAUNDRY/sys/powerpc/booke/pmap.c user/alc/PQ_LAUNDRY/sys/powerpc/include/pmap.h user/alc/PQ_LAUNDRY/sys/powerpc/powerpc/machdep.c user/alc/PQ_LAUNDRY/sys/powerpc/pseries/platform_chrp.c user/alc/PQ_LAUNDRY/sys/sys/mbuf.h user/alc/PQ_LAUNDRY/sys/sys/param.h user/alc/PQ_LAUNDRY/sys/x86/x86/msi.c user/alc/PQ_LAUNDRY/sys/x86/xen/hvm.c user/alc/PQ_LAUNDRY/tests/sys/kqueue/kqueue_test.sh user/alc/PQ_LAUNDRY/tests/sys/kqueue/vnode.c user/alc/PQ_LAUNDRY/tools/tools/nanobsd/defaults.sh user/alc/PQ_LAUNDRY/usr.bin/bsdiff/bspatch/bspatch.c user/alc/PQ_LAUNDRY/usr.bin/getconf/getconf.c user/alc/PQ_LAUNDRY/usr.bin/getconf/pathconf.gperf user/alc/PQ_LAUNDRY/usr.bin/indent/args.c user/alc/PQ_LAUNDRY/usr.bin/indent/indent.c user/alc/PQ_LAUNDRY/usr.bin/indent/io.c user/alc/PQ_LAUNDRY/usr.bin/indent/lexi.c user/alc/PQ_LAUNDRY/usr.bin/indent/parse.c user/alc/PQ_LAUNDRY/usr.bin/iscsictl/iscsictl.c user/alc/PQ_LAUNDRY/usr.sbin/cdcontrol/cdcontrol.1 user/alc/PQ_LAUNDRY/usr.sbin/cdcontrol/cdcontrol.c user/alc/PQ_LAUNDRY/usr.sbin/ctladm/ctladm.c user/alc/PQ_LAUNDRY/usr.sbin/ctld/chap.c user/alc/PQ_LAUNDRY/usr.sbin/ctld/ctld.c user/alc/PQ_LAUNDRY/usr.sbin/ctld/ctld.h user/alc/PQ_LAUNDRY/usr.sbin/ctld/kernel.c user/alc/PQ_LAUNDRY/usr.sbin/ctld/keys.c user/alc/PQ_LAUNDRY/usr.sbin/ctld/login.c user/alc/PQ_LAUNDRY/usr.sbin/ctld/pdu.c user/alc/PQ_LAUNDRY/usr.sbin/fifolog/lib/fifolog_int.c user/alc/PQ_LAUNDRY/usr.sbin/fifolog/lib/fifolog_reader.c user/alc/PQ_LAUNDRY/usr.sbin/iscsid/chap.c user/alc/PQ_LAUNDRY/usr.sbin/iscsid/iscsid.c user/alc/PQ_LAUNDRY/usr.sbin/iscsid/iscsid.h user/alc/PQ_LAUNDRY/usr.sbin/iscsid/keys.c user/alc/PQ_LAUNDRY/usr.sbin/iscsid/login.c user/alc/PQ_LAUNDRY/usr.sbin/iscsid/pdu.c user/alc/PQ_LAUNDRY/usr.sbin/kldxref/kldxref.c user/alc/PQ_LAUNDRY/usr.sbin/ntp/doc/sntp.8 user/alc/PQ_LAUNDRY/usr.sbin/pc-sysinstall/backend/functions-mountoptical.sh Directory Properties: user/alc/PQ_LAUNDRY/ (props changed) user/alc/PQ_LAUNDRY/cddl/ (props changed) user/alc/PQ_LAUNDRY/contrib/binutils/ (props changed) user/alc/PQ_LAUNDRY/contrib/sqlite3/ (props changed) user/alc/PQ_LAUNDRY/crypto/heimdal/ (props changed) user/alc/PQ_LAUNDRY/crypto/openssl/ (props changed) Modified: user/alc/PQ_LAUNDRY/Makefile.inc1 ============================================================================== --- user/alc/PQ_LAUNDRY/Makefile.inc1 Fri Aug 26 17:28:57 2016 (r304851) +++ user/alc/PQ_LAUNDRY/Makefile.inc1 Fri Aug 26 17:31:20 2016 (r304852) @@ -550,8 +550,18 @@ CROSSENV+= CC="${XCC} ${XCFLAGS}" CXX="$ BFLAGS+= -B${CROSS_BINUTILS_PREFIX} .endif -# External compiler needs sysroot and target flags. -.if ${MK_CLANG_BOOTSTRAP} == "no" && ${MK_GCC_BOOTSTRAP} == "no" + +# The internal bootstrap compiler has a default sysroot set by TOOLS_PREFIX +# and target set by TARGET/TARGET_ARCH. However, there are several needs to +# always pass an explicit --sysroot and -target. +# - External compiler needs sysroot and target flags. +# - External ld needs sysroot. +# - To be clear about the use of a sysroot when using the internal compiler. +# - Easier debugging. +# - Allowing WITH_SYSTEM_COMPILER+WITH_META_MODE to work together due to +# the flip-flopping build command when sometimes using external and +# sometimes using internal. +# - Allow using lld which has no support for default paths. .if !defined(CROSS_BINUTILS_PREFIX) || !exists(${CROSS_BINUTILS_PREFIX}) BFLAGS+= -B${WORLDTMP}/usr/bin .endif @@ -562,24 +572,28 @@ TARGET_ABI= gnueabihf TARGET_ABI= gnueabi .endif .endif -.if defined(X_COMPILER_TYPE) && ${X_COMPILER_TYPE} == gcc +.if ${WANT_COMPILER_TYPE} == gcc || \ + (defined(X_COMPILER_TYPE) && ${X_COMPILER_TYPE} == gcc) # GCC requires -isystem and -L when using a cross-compiler. --sysroot # won't set header path and -L is used to ensure the base library path # is added before the port PREFIX library path. XCFLAGS+= -isystem ${WORLDTMP}/usr/include -L${WORLDTMP}/usr/lib +# GCC requires -B to find /usr/lib/crti.o when using a cross-compiler +# combined with --sysroot. +XCFLAGS+= -B${WORLDTMP}/usr/lib # Force using libc++ for external GCC. # XXX: This should be checking MK_GNUCXX == no .if ${X_COMPILER_VERSION} >= 40800 XCXXFLAGS+= -isystem ${WORLDTMP}/usr/include/c++/v1 -std=c++11 \ -nostdinc++ -L${WORLDTMP}/../lib/libc++ .endif -.else +.elif ${WANT_COMPILER_TYPE} == clang || \ + (defined(X_COMPILER_TYPE) && ${X_COMPILER_TYPE} == clang) TARGET_ABI?= unknown TARGET_TRIPLE?= ${TARGET_ARCH:C/amd64/x86_64/}-${TARGET_ABI}-freebsd12.0 XCFLAGS+= -target ${TARGET_TRIPLE} .endif XCFLAGS+= --sysroot=${WORLDTMP} -.endif # ${MK_CLANG_BOOTSTRAP} == "no" && ${MK_GCC_BOOTSTRAP} == "no" .if !empty(BFLAGS) XCFLAGS+= ${BFLAGS} Modified: user/alc/PQ_LAUNDRY/Makefile.libcompat ============================================================================== --- user/alc/PQ_LAUNDRY/Makefile.libcompat Fri Aug 26 17:28:57 2016 (r304851) +++ user/alc/PQ_LAUNDRY/Makefile.libcompat Fri Aug 26 17:31:20 2016 (r304852) @@ -73,7 +73,8 @@ LIBCOMPATCFLAGS+= ${LIBCOMPATCPUFLAGS} \ # Clang/GCC. LIBCOMPATCFLAGS+= -B${LIBCOMPATTMP}/usr/lib${libcompat} -.if defined(X_COMPILER_TYPE) && ${X_COMPILER_TYPE} == gcc +.if ${WANT_COMPILER_TYPE} == gcc || \ + (defined(X_COMPILER_TYPE) && ${X_COMPILER_TYPE} == gcc) # GCC requires -isystem when using a cross-compiler and --sysroot. Note that # Makefile.inc1 only applies this with an external compiler but libcompat # always does since even in-tree GCC 4.2 needs this to override the built-in Modified: user/alc/PQ_LAUNDRY/UPDATING ============================================================================== --- user/alc/PQ_LAUNDRY/UPDATING Fri Aug 26 17:28:57 2016 (r304851) +++ user/alc/PQ_LAUNDRY/UPDATING Fri Aug 26 17:31:20 2016 (r304852) @@ -31,6 +31,12 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 12 disable the most expensive debugging functionality run "ln -s 'abort:false,junk:false' /etc/malloc.conf".) +20160824: + r304787 changed some ioctl interfaces between the iSCSI userspace + programs and the kernel. ctladm, ctld, iscsictl, and iscsid must be + rebuilt to work with new kernels. __FreeBSD_version has been bumped + to 1200005. + 20160818: The UDP receive code has been updated to only treat incoming UDP packets that were addressed to an L2 broadcast address as L3 Modified: user/alc/PQ_LAUNDRY/bin/dd/dd.1 ============================================================================== --- user/alc/PQ_LAUNDRY/bin/dd/dd.1 Fri Aug 26 17:28:57 2016 (r304851) +++ user/alc/PQ_LAUNDRY/bin/dd/dd.1 Fri Aug 26 17:31:20 2016 (r304852) @@ -32,7 +32,7 @@ .\" @(#)dd.1 8.2 (Berkeley) 1/13/94 .\" $FreeBSD$ .\" -.Dd February 28, 2016 +.Dd August 25, 2016 .Dt DD 1 .Os .Sh NAME @@ -414,7 +414,7 @@ Check for (even) parity errors on a file To create an image of a Mode-1 CD-ROM, which is a commonly used format for data CD-ROM disks, use a block size of 2048 bytes: .Pp -.Dl "dd if=/dev/acd0 of=filename.iso bs=2048" +.Dl "dd if=/dev/cd0 of=filename.iso bs=2048" .Pp Write a filesystem image to a memory stick, padding the end with zeros, if necessary, to a 1MiB boundary: Modified: user/alc/PQ_LAUNDRY/bin/ls/tests/ls_tests.sh ============================================================================== --- user/alc/PQ_LAUNDRY/bin/ls/tests/ls_tests.sh Fri Aug 26 17:28:57 2016 (r304851) +++ user/alc/PQ_LAUNDRY/bin/ls/tests/ls_tests.sh Fri Aug 26 17:31:20 2016 (r304852) @@ -84,6 +84,14 @@ create_test_inputs2() { create_test_dir + if ! getconf MIN_HOLE_SIZE "$(pwd)"; then + echo "getconf MIN_HOLE_SIZE $(pwd) failed; sparse files probably" \ + "not supported by file system" + mount + atf_skip "Test's work directory does not support sparse files;" \ + "try with a different TMPDIR?" + fi + for filesize in 1 512 $(( 2 * $KB )) $(( 10 * $KB )) $(( 512 * $KB )); \ do atf_check -e ignore -o empty -s exit:0 \ Modified: user/alc/PQ_LAUNDRY/cddl/lib/libdtrace/psinfo.d ============================================================================== --- user/alc/PQ_LAUNDRY/cddl/lib/libdtrace/psinfo.d Fri Aug 26 17:28:57 2016 (r304851) +++ user/alc/PQ_LAUNDRY/cddl/lib/libdtrace/psinfo.d Fri Aug 26 17:31:20 2016 (r304852) @@ -59,7 +59,7 @@ translator psinfo_t < struct proc *T > { pr_gid = T->p_ucred->cr_rgid; pr_egid = T->p_ucred->cr_groups[0]; pr_addr = 0; - pr_psargs = (T->p_args->ar_args == 0) ? "" : + pr_psargs = (T->p_args == 0) ? "" : memstr(T->p_args->ar_args, ' ', T->p_args->ar_length); pr_arglen = T->p_args->ar_length; pr_jailid = T->p_ucred->cr_prison->pr_id; Modified: user/alc/PQ_LAUNDRY/contrib/binutils/bfd/config.bfd ============================================================================== --- user/alc/PQ_LAUNDRY/contrib/binutils/bfd/config.bfd Fri Aug 26 17:28:57 2016 (r304851) +++ user/alc/PQ_LAUNDRY/contrib/binutils/bfd/config.bfd Fri Aug 26 17:31:20 2016 (r304852) @@ -875,11 +875,11 @@ case "${targ}" in ;; mips*el-*-freebsd*) targ_defvec=bfd_elf32_tradlittlemips_vec - targ_selvecs="bfd_elf32_tradbigmips_vec bfd_elf32_ntradbigmisp_vec bfd_elf32_ntradlittlemips_vec bfd_elf64_tradbigmips_vec bfd_elf64_tradlittlemips_vec ecoff_big_vec ecoff_little_vec" + targ_selvecs="bfd_elf32_tradbigmips_vec bfd_elf32_ntradbigmips_vec bfd_elf32_ntradlittlemips_vec bfd_elf64_tradbigmips_vec bfd_elf64_tradlittlemips_vec ecoff_big_vec ecoff_little_vec" ;; mips*-*-freebsd*) targ_defvec=bfd_elf32_tradbigmips_vec - targ_selvecs="bfd_elf32_tradlittlemips_vec bfd_elf32_ntradbigmisp_vec bfd_elf32_ntradlittlemips_vec bfd_elf64_tradbigmips_vec bfd_elf64_tradlittlemips_vec ecoff_big_vec ecoff_little_vec" + targ_selvecs="bfd_elf32_tradlittlemips_vec bfd_elf32_ntradbigmips_vec bfd_elf32_ntradlittlemips_vec bfd_elf64_tradbigmips_vec bfd_elf64_tradlittlemips_vec ecoff_big_vec ecoff_little_vec" ;; mips*-dec-* | mips*el-*-ecoff*) targ_defvec=ecoff_little_vec Modified: user/alc/PQ_LAUNDRY/contrib/sqlite3/Makefile.am ============================================================================== --- user/alc/PQ_LAUNDRY/contrib/sqlite3/Makefile.am Fri Aug 26 17:28:57 2016 (r304851) +++ user/alc/PQ_LAUNDRY/contrib/sqlite3/Makefile.am Fri Aug 26 17:31:20 2016 (r304852) @@ -1,5 +1,5 @@ -AM_CFLAGS = @THREADSAFE_FLAGS@ @DYNAMIC_EXTENSION_FLAGS@ @FTS5_FLAGS@ @JSON1_FLAGS@ -DSQLITE_ENABLE_FTS3 -DSQLITE_ENABLE_RTREE +AM_CFLAGS = @THREADSAFE_FLAGS@ @DYNAMIC_EXTENSION_FLAGS@ @FTS5_FLAGS@ @JSON1_FLAGS@ @SESSION_FLAGS@ -DSQLITE_ENABLE_FTS3 -DSQLITE_ENABLE_RTREE lib_LTLIBRARIES = libsqlite3.la libsqlite3_la_SOURCES = sqlite3.c Modified: user/alc/PQ_LAUNDRY/contrib/sqlite3/Makefile.in ============================================================================== --- user/alc/PQ_LAUNDRY/contrib/sqlite3/Makefile.in Fri Aug 26 17:28:57 2016 (r304851) +++ user/alc/PQ_LAUNDRY/contrib/sqlite3/Makefile.in Fri Aug 26 17:31:20 2016 (r304852) @@ -305,6 +305,7 @@ PATH_SEPARATOR = @PATH_SEPARATOR@ RANLIB = @RANLIB@ READLINE_LIBS = @READLINE_LIBS@ SED = @SED@ +SESSION_FLAGS = @SESSION_FLAGS@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ @@ -362,7 +363,7 @@ target_alias = @target_alias@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -AM_CFLAGS = @THREADSAFE_FLAGS@ @DYNAMIC_EXTENSION_FLAGS@ @FTS5_FLAGS@ @JSON1_FLAGS@ -DSQLITE_ENABLE_FTS3 -DSQLITE_ENABLE_RTREE +AM_CFLAGS = @THREADSAFE_FLAGS@ @DYNAMIC_EXTENSION_FLAGS@ @FTS5_FLAGS@ @JSON1_FLAGS@ @SESSION_FLAGS@ -DSQLITE_ENABLE_FTS3 -DSQLITE_ENABLE_RTREE lib_LTLIBRARIES = libsqlite3.la libsqlite3_la_SOURCES = sqlite3.c libsqlite3_la_LDFLAGS = -no-undefined -version-info 8:6:8 Copied: user/alc/PQ_LAUNDRY/contrib/sqlite3/Makefile.msc (from r304851, head/contrib/sqlite3/Makefile.msc) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/alc/PQ_LAUNDRY/contrib/sqlite3/Makefile.msc Fri Aug 26 17:31:20 2016 (r304852, copy of r304851, head/contrib/sqlite3/Makefile.msc) @@ -0,0 +1,971 @@ +#### DO NOT EDIT #### +# This makefile is automatically generated from the Makefile.msc at +# the root of the canonical SQLite source tree (not the +# amalgamation tarball) using the tool/mkmsvcmin.tcl +# script. +# + +# +# nmake Makefile for SQLite +# +############################################################################### +############################## START OF OPTIONS ############################### +############################################################################### + +# The toplevel directory of the source tree. This is the directory +# that contains this "Makefile.msc". +# +TOP = . + + +# Set this non-0 to enable full warnings (-W4, etc) when compiling. +# +!IFNDEF USE_FULLWARN +USE_FULLWARN = 0 +!ENDIF + +# Set this non-0 to enable full runtime error checks (-RTC1, etc). This +# has no effect if (any) optimizations are enabled. +# +!IFNDEF USE_RUNTIME_CHECKS +USE_RUNTIME_CHECKS = 0 +!ENDIF + +# Set this non-0 to use "stdcall" calling convention for the core library +# and shell executable. +# +!IFNDEF USE_STDCALL +USE_STDCALL = 0 +!ENDIF + +# Set this non-0 to have the shell executable link against the core dynamic +# link library. +# +!IFNDEF DYNAMIC_SHELL +DYNAMIC_SHELL = 0 +!ENDIF + +# Set this non-0 to enable extra code that attempts to detect misuse of the +# SQLite API. +# +!IFNDEF API_ARMOR +API_ARMOR = 0 +!ENDIF + +# If necessary, create a list of harmless compiler warnings to disable when +# compiling the various tools. For the SQLite source code itself, warnings, +# if any, will be disabled from within it. +# +!IFNDEF NO_WARN +!IF $(USE_FULLWARN)!=0 +NO_WARN = -wd4054 -wd4055 -wd4100 -wd4127 -wd4130 -wd4152 -wd4189 -wd4206 +NO_WARN = $(NO_WARN) -wd4210 -wd4232 -wd4305 -wd4306 -wd4702 -wd4706 +!ENDIF +!ENDIF + +# Set this non-0 to use the library paths and other options necessary for +# Windows Phone 8.1. +# +!IFNDEF USE_WP81_OPTS +USE_WP81_OPTS = 0 +!ENDIF + +# Set this non-0 to split the SQLite amalgamation file into chunks to +# be used for debugging with Visual Studio. +# +!IFNDEF SPLIT_AMALGAMATION +SPLIT_AMALGAMATION = 0 +!ENDIF + + +# Set this non-0 to dynamically link to the MSVC runtime library. +# +!IFNDEF USE_CRT_DLL +USE_CRT_DLL = 0 +!ENDIF + +# Set this non-0 to link to the RPCRT4 library. +# +!IFNDEF USE_RPCRT4_LIB +USE_RPCRT4_LIB = 0 +!ENDIF + +# Set this non-0 to generate assembly code listings for the source code +# files. +# +!IFNDEF USE_LISTINGS +USE_LISTINGS = 0 +!ENDIF + +# Set this non-0 to attempt setting the native compiler automatically +# for cross-compiling the command line tools needed during the compilation +# process. +# +!IFNDEF XCOMPILE +XCOMPILE = 0 +!ENDIF + +# Set this non-0 to use the native libraries paths for cross-compiling +# the command line tools needed during the compilation process. +# +!IFNDEF USE_NATIVE_LIBPATHS +USE_NATIVE_LIBPATHS = 0 +!ENDIF + +# Set this 0 to skip the compiling and embedding of version resources. +# +!IFNDEF USE_RC +USE_RC = 1 +!ENDIF + +# Set this non-0 to compile binaries suitable for the WinRT environment. +# This setting does not apply to any binaries that require Tcl to operate +# properly (i.e. the text fixture, etc). +# +!IFNDEF FOR_WINRT +FOR_WINRT = 0 +!ENDIF + +# Set this non-0 to compile binaries suitable for the UWP environment. +# This setting does not apply to any binaries that require Tcl to operate +# properly (i.e. the text fixture, etc). +# +!IFNDEF FOR_UWP +FOR_UWP = 0 +!ENDIF + +# Set this non-0 to compile binaries suitable for the Windows 10 platform. +# +!IFNDEF FOR_WIN10 +FOR_WIN10 = 0 +!ENDIF + + +# Set this to non-0 to create and use PDBs. +# +!IFNDEF SYMBOLS +SYMBOLS = 1 +!ENDIF + +# Set this to non-0 to use the SQLite debugging heap subsystem. +# +!IFNDEF MEMDEBUG +MEMDEBUG = 0 +!ENDIF + +# Set this to non-0 to use the Win32 native heap subsystem. +# +!IFNDEF WIN32HEAP +WIN32HEAP = 0 +!ENDIF + +# Set this to non-0 to enable OSTRACE() macros, which can be useful when +# debugging. +# +!IFNDEF OSTRACE +OSTRACE = 0 +!ENDIF + +# Set this to one of the following values to enable various debugging +# features. Each level includes the debugging options from the previous +# levels. Currently, the recognized values for DEBUG are: +# +# 0 == NDEBUG: Disables assert() and other runtime diagnostics. +# 1 == SQLITE_ENABLE_API_ARMOR: extra attempts to detect misuse of the API. +# 2 == Disables NDEBUG and all optimizations and then enables PDBs. +# 3 == SQLITE_DEBUG: Enables various diagnostics messages and code. +# 4 == SQLITE_WIN32_MALLOC_VALIDATE: Validate the Win32 native heap per call. +# 5 == SQLITE_DEBUG_OS_TRACE: Enables output from the OSTRACE() macros. +# 6 == SQLITE_ENABLE_IOTRACE: Enables output from the IOTRACE() macros. +# +!IFNDEF DEBUG +DEBUG = 0 +!ENDIF + +# Enable use of available compiler optimizations? Normally, this should be +# non-zero. Setting this to zero, thus disabling all compiler optimizations, +# can be useful for testing. +# +!IFNDEF OPTIMIZATIONS +OPTIMIZATIONS = 2 +!ENDIF + +# Set this to non-0 to enable support for the session extension. +# +!IFNDEF SESSION +SESSION = 0 +!ENDIF + +# Set the source code file to be used by executables and libraries when +# they need the amalgamation. +# +!IFNDEF SQLITE3C +!IF $(SPLIT_AMALGAMATION)!=0 +SQLITE3C = sqlite3-all.c +!ELSE +SQLITE3C = sqlite3.c +!ENDIF +!ENDIF + +# Set the include code file to be used by executables and libraries when +# they need SQLite. +# +!IFNDEF SQLITE3H +SQLITE3H = sqlite3.h +!ENDIF + +# This is the name to use for the SQLite dynamic link library (DLL). +# +!IFNDEF SQLITE3DLL +!IF $(FOR_WIN10)!=0 +SQLITE3DLL = winsqlite3.dll +!ELSE +SQLITE3DLL = sqlite3.dll +!ENDIF +!ENDIF + +# This is the name to use for the SQLite import library (LIB). +# +!IFNDEF SQLITE3LIB +!IF $(FOR_WIN10)!=0 +SQLITE3LIB = winsqlite3.lib +!ELSE +SQLITE3LIB = sqlite3.lib +!ENDIF +!ENDIF + +# This is the name to use for the SQLite shell executable (EXE). +# +!IFNDEF SQLITE3EXE +!IF $(FOR_WIN10)!=0 +SQLITE3EXE = winsqlite3shell.exe +!ELSE +SQLITE3EXE = sqlite3.exe +!ENDIF +!ENDIF + +# This is the argument used to set the program database (PDB) file for the +# SQLite shell executable (EXE). +# +!IFNDEF SQLITE3EXEPDB +!IF $(FOR_WIN10)!=0 +SQLITE3EXEPDB = +!ELSE +SQLITE3EXEPDB = /pdb:sqlite3sh.pdb +!ENDIF +!ENDIF + +# These are the "standard" SQLite compilation options used when compiling for +# the Windows platform. +# +!IFNDEF OPT_FEATURE_FLAGS +OPT_FEATURE_FLAGS = $(OPT_FEATURE_FLAGS) -DSQLITE_ENABLE_FTS3=1 +OPT_FEATURE_FLAGS = $(OPT_FEATURE_FLAGS) -DSQLITE_ENABLE_RTREE=1 +OPT_FEATURE_FLAGS = $(OPT_FEATURE_FLAGS) -DSQLITE_ENABLE_COLUMN_METADATA=1 +!ENDIF + +# Should the session extension be enabled? If so, add compilation options +# to enable it. +# +!IF $(SESSION)!=0 +OPT_FEATURE_FLAGS = $(OPT_FEATURE_FLAGS) -DSQLITE_ENABLE_SESSION=1 +OPT_FEATURE_FLAGS = $(OPT_FEATURE_FLAGS) -DSQLITE_ENABLE_PREUPDATE_HOOK=1 +!ENDIF + +# These are the "extended" SQLite compilation options used when compiling for +# the Windows 10 platform. +# +!IFNDEF EXT_FEATURE_FLAGS +!IF $(FOR_WIN10)!=0 +EXT_FEATURE_FLAGS = $(EXT_FEATURE_FLAGS) -DSQLITE_ENABLE_FTS4=1 +EXT_FEATURE_FLAGS = $(EXT_FEATURE_FLAGS) -DSQLITE_SYSTEM_MALLOC=1 +EXT_FEATURE_FLAGS = $(EXT_FEATURE_FLAGS) -DSQLITE_OMIT_LOCALTIME=1 +!ELSE +EXT_FEATURE_FLAGS = +!ENDIF +!ENDIF + +############################################################################### +############################### END OF OPTIONS ################################ +############################################################################### + +# When compiling for the Windows 10 platform, the PLATFORM macro must be set +# to an appropriate value (e.g. x86, x64, arm, arm64, etc). +# +!IF $(FOR_WIN10)!=0 +!IFNDEF PLATFORM +!ERROR Using the FOR_WIN10 option requires a value for PLATFORM. +!ENDIF +!ENDIF + +# This assumes that MSVC is always installed in 32-bit Program Files directory +# and sets the variable for use in locating other 32-bit installs accordingly. +# +PROGRAMFILES_X86 = $(VCINSTALLDIR)\..\.. +PROGRAMFILES_X86 = $(PROGRAMFILES_X86:\\=\) + +# Check for the predefined command macro CC. This should point to the compiler +# binary for the target platform. If it is not defined, simply define it to +# the legacy default value 'cl.exe'. +# +!IFNDEF CC +CC = cl.exe +!ENDIF + +# Check for the predefined command macro CSC. This should point to a working +# C Sharp compiler binary. If it is not defined, simply define it to the +# legacy default value 'csc.exe'. +# +!IFNDEF CSC +CSC = csc.exe +!ENDIF + +# Check for the command macro LD. This should point to the linker binary for +# the target platform. If it is not defined, simply define it to the legacy +# default value 'link.exe'. +# +!IFNDEF LD +LD = link.exe +!ENDIF + +# Check for the predefined command macro RC. This should point to the resource +# compiler binary for the target platform. If it is not defined, simply define +# it to the legacy default value 'rc.exe'. +# +!IFNDEF RC +RC = rc.exe +!ENDIF + +# Check for the MSVC runtime library path macro. Otherwise, this value will +# default to the 'lib' directory underneath the MSVC installation directory. +# +!IFNDEF CRTLIBPATH +CRTLIBPATH = $(VCINSTALLDIR)\lib +!ENDIF + +CRTLIBPATH = $(CRTLIBPATH:\\=\) + +# Check for the command macro NCC. This should point to the compiler binary +# for the platform the compilation process is taking place on. If it is not +# defined, simply define it to have the same value as the CC macro. When +# cross-compiling, it is suggested that this macro be modified via the command +# line (since nmake itself does not provide a built-in method to guess it). +# For example, to use the x86 compiler when cross-compiling for x64, a command +# line similar to the following could be used (all on one line): +# +# nmake /f Makefile.msc sqlite3.dll +# XCOMPILE=1 USE_NATIVE_LIBPATHS=1 +# +# Alternatively, the full path and file name to the compiler binary for the +# platform the compilation process is taking place may be specified (all on +# one line): +# +# nmake /f Makefile.msc sqlite3.dll +# "NCC=""%VCINSTALLDIR%\bin\cl.exe""" +# USE_NATIVE_LIBPATHS=1 +# +!IFDEF NCC +NCC = $(NCC:\\=\) +!ELSEIF $(XCOMPILE)!=0 +NCC = "$(VCINSTALLDIR)\bin\$(CC)" +NCC = $(NCC:\\=\) +!ELSE +NCC = $(CC) +!ENDIF + +# Check for the MSVC native runtime library path macro. Otherwise, +# this value will default to the 'lib' directory underneath the MSVC +# installation directory. +# +!IFNDEF NCRTLIBPATH +NCRTLIBPATH = $(VCINSTALLDIR)\lib +!ENDIF + +NCRTLIBPATH = $(NCRTLIBPATH:\\=\) + +# Check for the Platform SDK library path macro. Otherwise, this +# value will default to the 'lib' directory underneath the Windows +# SDK installation directory (the environment variable used appears +# to be available when using Visual C++ 2008 or later via the +# command line). +# +!IFNDEF NSDKLIBPATH +NSDKLIBPATH = $(WINDOWSSDKDIR)\lib +!ENDIF + +NSDKLIBPATH = $(NSDKLIBPATH:\\=\) + +# Check for the UCRT library path macro. Otherwise, this value will +# default to the version-specific, platform-specific 'lib' directory +# underneath the Windows SDK installation directory. +# +!IFNDEF UCRTLIBPATH +UCRTLIBPATH = $(WINDOWSSDKDIR)\lib\$(WINDOWSSDKLIBVERSION)\ucrt\$(PLATFORM) +!ENDIF + +UCRTLIBPATH = $(UCRTLIBPATH:\\=\) + +# C compiler and options for use in building executables that +# will run on the platform that is doing the build. +# +!IF $(USE_FULLWARN)!=0 +BCC = $(NCC) -nologo -W4 $(CCOPTS) $(BCCOPTS) +!ELSE +BCC = $(NCC) -nologo -W3 $(CCOPTS) $(BCCOPTS) +!ENDIF + +# Check if assembly code listings should be generated for the source +# code files to be compiled. +# +!IF $(USE_LISTINGS)!=0 +BCC = $(BCC) -FAcs +!ENDIF + +# Check if the native library paths should be used when compiling +# the command line tools used during the compilation process. If +# so, set the necessary macro now. +# +!IF $(USE_NATIVE_LIBPATHS)!=0 +NLTLIBPATHS = "/LIBPATH:$(NCRTLIBPATH)" "/LIBPATH:$(NSDKLIBPATH)" + +!IFDEF NUCRTLIBPATH +NUCRTLIBPATH = $(NUCRTLIBPATH:\\=\) +NLTLIBPATHS = $(NLTLIBPATHS) "/LIBPATH:$(NUCRTLIBPATH)" +!ENDIF +!ENDIF + +# C compiler and options for use in building executables that +# will run on the target platform. (BCC and TCC are usually the +# same unless your are cross-compiling.) +# +!IF $(USE_FULLWARN)!=0 +TCC = $(CC) -nologo -W4 -DINCLUDE_MSVC_H=1 $(CCOPTS) $(TCCOPTS) +!ELSE +TCC = $(CC) -nologo -W3 $(CCOPTS) $(TCCOPTS) +!ENDIF + +TCC = $(TCC) -DSQLITE_OS_WIN=1 -I. -I$(TOP) -fp:precise +RCC = $(RC) -DSQLITE_OS_WIN=1 -I. -I$(TOP) $(RCOPTS) $(RCCOPTS) + +# Check if we want to use the "stdcall" calling convention when compiling. +# This is not supported by the compilers for non-x86 platforms. It should +# also be noted here that building any target with these "stdcall" options +# will most likely fail if the Tcl library is also required. This is due +# to how the Tcl library functions are declared and exported (i.e. without +# an explicit calling convention, which results in "cdecl"). +# +!IF $(USE_STDCALL)!=0 || $(FOR_WIN10)!=0 +!IF "$(PLATFORM)"=="x86" +CORE_CCONV_OPTS = -Gz -DSQLITE_CDECL=__cdecl -DSQLITE_APICALL=__stdcall -DSQLITE_CALLBACK=__stdcall -DSQLITE_SYSAPI=__stdcall +SHELL_CCONV_OPTS = -Gz -DSQLITE_CDECL=__cdecl -DSQLITE_APICALL=__stdcall -DSQLITE_CALLBACK=__stdcall -DSQLITE_SYSAPI=__stdcall +!ELSE +!IFNDEF PLATFORM +CORE_CCONV_OPTS = -Gz -DSQLITE_CDECL=__cdecl -DSQLITE_APICALL=__stdcall -DSQLITE_CALLBACK=__stdcall -DSQLITE_SYSAPI=__stdcall +SHELL_CCONV_OPTS = -Gz -DSQLITE_CDECL=__cdecl -DSQLITE_APICALL=__stdcall -DSQLITE_CALLBACK=__stdcall -DSQLITE_SYSAPI=__stdcall +!ELSE +CORE_CCONV_OPTS = +SHELL_CCONV_OPTS = +!ENDIF +!ENDIF +!ELSE +CORE_CCONV_OPTS = +SHELL_CCONV_OPTS = +!ENDIF + +# These are additional compiler options used for the core library. +# +!IFNDEF CORE_COMPILE_OPTS +!IF $(DYNAMIC_SHELL)!=0 || $(FOR_WIN10)!=0 +CORE_COMPILE_OPTS = $(CORE_CCONV_OPTS) -DSQLITE_API=__declspec(dllexport) +!ELSE +CORE_COMPILE_OPTS = $(CORE_CCONV_OPTS) +!ENDIF +!ENDIF + +# These are the additional targets that the core library should depend on +# when linking. +# +!IFNDEF CORE_LINK_DEP +!IF $(DYNAMIC_SHELL)!=0 +CORE_LINK_DEP = +!ELSEIF $(FOR_WIN10)==0 || "$(PLATFORM)"=="x86" +CORE_LINK_DEP = sqlite3.def +!ELSE +CORE_LINK_DEP = +!ENDIF +!ENDIF + +# These are additional linker options used for the core library. +# +!IFNDEF CORE_LINK_OPTS +!IF $(DYNAMIC_SHELL)!=0 +CORE_LINK_OPTS = +!ELSEIF $(FOR_WIN10)==0 || "$(PLATFORM)"=="x86" +CORE_LINK_OPTS = /DEF:sqlite3.def +!ELSE +CORE_LINK_OPTS = +!ENDIF +!ENDIF + +# These are additional compiler options used for the shell executable. +# +!IFNDEF SHELL_COMPILE_OPTS +!IF $(DYNAMIC_SHELL)!=0 || $(FOR_WIN10)!=0 +SHELL_COMPILE_OPTS = $(SHELL_CCONV_OPTS) -DSQLITE_API=__declspec(dllimport) +!ELSE +SHELL_COMPILE_OPTS = $(SHELL_CCONV_OPTS) +!ENDIF +!ENDIF + +# This is the source code that the shell executable should be compiled +# with. +# +!IFNDEF SHELL_CORE_SRC +!IF $(DYNAMIC_SHELL)!=0 || $(FOR_WIN10)!=0 +SHELL_CORE_SRC = +!ELSE +SHELL_CORE_SRC = $(SQLITE3C) +!ENDIF +!ENDIF + +# This is the core library that the shell executable should depend on. +# +!IFNDEF SHELL_CORE_DEP +!IF $(DYNAMIC_SHELL)!=0 || $(FOR_WIN10)!=0 +SHELL_CORE_DEP = $(SQLITE3DLL) +!ELSE +SHELL_CORE_DEP = +!ENDIF +!ENDIF + +# This is the core library that the shell executable should link with. +# +!IFNDEF SHELL_CORE_LIB +!IF $(DYNAMIC_SHELL)!=0 || $(FOR_WIN10)!=0 +SHELL_CORE_LIB = $(SQLITE3LIB) +!ELSE +SHELL_CORE_LIB = +!ENDIF +!ENDIF + +# These are additional linker options used for the shell executable. +# +!IFNDEF SHELL_LINK_OPTS +SHELL_LINK_OPTS = $(SHELL_CORE_LIB) +!ENDIF + +# Check if assembly code listings should be generated for the source +# code files to be compiled. +# +!IF $(USE_LISTINGS)!=0 +TCC = $(TCC) -FAcs +!ENDIF + +# When compiling the library for use in the WinRT environment, +# the following compile-time options must be used as well to +# disable use of Win32 APIs that are not available and to enable +# use of Win32 APIs that are specific to Windows 8 and/or WinRT. +# +!IF $(FOR_WINRT)!=0 +TCC = $(TCC) -DSQLITE_OS_WINRT=1 +RCC = $(RCC) -DSQLITE_OS_WINRT=1 +TCC = $(TCC) -DWINAPI_FAMILY=WINAPI_FAMILY_APP +RCC = $(RCC) -DWINAPI_FAMILY=WINAPI_FAMILY_APP +!ENDIF + +# C compiler options for the Windows 10 platform (needs MSVC 2015). +# +!IF $(FOR_WIN10)!=0 +TCC = $(TCC) /d2guard4 -D_ARM_WINAPI_PARTITION_DESKTOP_SDK_AVAILABLE +BCC = $(BCC) /d2guard4 -D_ARM_WINAPI_PARTITION_DESKTOP_SDK_AVAILABLE +!ENDIF + +# Also, we need to dynamically link to the correct MSVC runtime +# when compiling for WinRT (e.g. debug or release) OR if the +# USE_CRT_DLL option is set to force dynamically linking to the +# MSVC runtime library. +# +!IF $(FOR_WINRT)!=0 || $(USE_CRT_DLL)!=0 +!IF $(DEBUG)>1 +TCC = $(TCC) -MDd +BCC = $(BCC) -MDd +!ELSE +TCC = $(TCC) -MD +BCC = $(BCC) -MD +!ENDIF +!ELSE +!IF $(DEBUG)>1 +TCC = $(TCC) -MTd +BCC = $(BCC) -MTd +!ELSE +TCC = $(TCC) -MT +BCC = $(BCC) -MT +!ENDIF +!ENDIF + + +# Define -DNDEBUG to compile without debugging (i.e., for production usage) +# Omitting the define will cause extra debugging code to be inserted and +# includes extra comments when "EXPLAIN stmt" is used. +# +!IF $(DEBUG)==0 +TCC = $(TCC) -DNDEBUG +BCC = $(BCC) -DNDEBUG +RCC = $(RCC) -DNDEBUG +!ENDIF + +!IF $(DEBUG)>0 || $(API_ARMOR)!=0 || $(FOR_WIN10)!=0 +TCC = $(TCC) -DSQLITE_ENABLE_API_ARMOR=1 +RCC = $(RCC) -DSQLITE_ENABLE_API_ARMOR=1 +!ENDIF + +!IF $(DEBUG)>2 +TCC = $(TCC) -DSQLITE_DEBUG=1 +RCC = $(RCC) -DSQLITE_DEBUG=1 +!ENDIF + +!IF $(DEBUG)>4 || $(OSTRACE)!=0 +TCC = $(TCC) -DSQLITE_FORCE_OS_TRACE=1 -DSQLITE_DEBUG_OS_TRACE=1 +RCC = $(RCC) -DSQLITE_FORCE_OS_TRACE=1 -DSQLITE_DEBUG_OS_TRACE=1 +!ENDIF + +!IF $(DEBUG)>5 +TCC = $(TCC) -DSQLITE_ENABLE_IOTRACE=1 +RCC = $(RCC) -DSQLITE_ENABLE_IOTRACE=1 +!ENDIF + +# Prevent warnings about "insecure" MSVC runtime library functions +# being used. +# +TCC = $(TCC) -D_CRT_SECURE_NO_DEPRECATE -D_CRT_SECURE_NO_WARNINGS +BCC = $(BCC) -D_CRT_SECURE_NO_DEPRECATE -D_CRT_SECURE_NO_WARNINGS +RCC = $(RCC) -D_CRT_SECURE_NO_DEPRECATE -D_CRT_SECURE_NO_WARNINGS + +# Prevent warnings about "deprecated" POSIX functions being used. +# +TCC = $(TCC) -D_CRT_NONSTDC_NO_DEPRECATE -D_CRT_NONSTDC_NO_WARNINGS +BCC = $(BCC) -D_CRT_NONSTDC_NO_DEPRECATE -D_CRT_NONSTDC_NO_WARNINGS +RCC = $(RCC) -D_CRT_NONSTDC_NO_DEPRECATE -D_CRT_NONSTDC_NO_WARNINGS + +# Use the SQLite debugging heap subsystem? +# +!IF $(MEMDEBUG)!=0 +TCC = $(TCC) -DSQLITE_MEMDEBUG=1 +RCC = $(RCC) -DSQLITE_MEMDEBUG=1 + +# Use native Win32 heap subsystem instead of malloc/free? +# +!ELSEIF $(WIN32HEAP)!=0 +TCC = $(TCC) -DSQLITE_WIN32_MALLOC=1 +RCC = $(RCC) -DSQLITE_WIN32_MALLOC=1 + +# Validate the heap on every call into the native Win32 heap subsystem? +# +!IF $(DEBUG)>3 +TCC = $(TCC) -DSQLITE_WIN32_MALLOC_VALIDATE=1 +RCC = $(RCC) -DSQLITE_WIN32_MALLOC_VALIDATE=1 +!ENDIF +!ENDIF + + +# Compiler options needed for programs that use the readline() library. +# +!IFNDEF READLINE_FLAGS +READLINE_FLAGS = -DHAVE_READLINE=0 +!ENDIF + +# The library that programs using readline() must link against. +# +!IFNDEF LIBREADLINE +LIBREADLINE = +!ENDIF + +# Should the database engine be compiled threadsafe +# +TCC = $(TCC) -DSQLITE_THREADSAFE=1 +RCC = $(RCC) -DSQLITE_THREADSAFE=1 + +# Do threads override each others locks by default (1), or do we test (-1) +# +TCC = $(TCC) -DSQLITE_THREAD_OVERRIDE_LOCK=-1 +RCC = $(RCC) -DSQLITE_THREAD_OVERRIDE_LOCK=-1 + +# Any target libraries which libsqlite must be linked against +# +!IFNDEF TLIBS +TLIBS = +!ENDIF + +# Flags controlling use of the in memory btree implementation +# +# SQLITE_TEMP_STORE is 0 to force temporary tables to be in a file, 1 to +# default to file, 2 to default to memory, and 3 to force temporary +# tables to always be in memory. +# +TCC = $(TCC) -DSQLITE_TEMP_STORE=1 +RCC = $(RCC) -DSQLITE_TEMP_STORE=1 + +# Enable/disable loadable extensions, and other optional features +# based on configuration. (-DSQLITE_OMIT*, -DSQLITE_ENABLE*). +# The same set of OMIT and ENABLE flags should be passed to the +# LEMON parser generator and the mkkeywordhash tool as well. + +# These are the required SQLite compilation options used when compiling for +# the Windows platform. +# +REQ_FEATURE_FLAGS = $(REQ_FEATURE_FLAGS) -DSQLITE_MAX_TRIGGER_DEPTH=100 + +# If we are linking to the RPCRT4 library, enable features that need it. +# +!IF $(USE_RPCRT4_LIB)!=0 +REQ_FEATURE_FLAGS = $(REQ_FEATURE_FLAGS) -DSQLITE_WIN32_USE_UUID=1 +!ENDIF + +# Add the required and optional SQLite compilation options into the command +# lines used to invoke the MSVC code and resource compilers. +# +TCC = $(TCC) $(REQ_FEATURE_FLAGS) $(OPT_FEATURE_FLAGS) $(EXT_FEATURE_FLAGS) +RCC = $(RCC) $(REQ_FEATURE_FLAGS) $(OPT_FEATURE_FLAGS) $(EXT_FEATURE_FLAGS) + +# Add in any optional parameters specified on the commane line, e.g. +# nmake /f Makefile.msc all "OPTS=-DSQLITE_ENABLE_FOO=1 -DSQLITE_OMIT_FOO=1" +# +TCC = $(TCC) $(OPTS) +RCC = $(RCC) $(OPTS) + +# If compiling for debugging, add some defines. +# +!IF $(DEBUG)>1 +TCC = $(TCC) -D_DEBUG +BCC = $(BCC) -D_DEBUG +RCC = $(RCC) -D_DEBUG +!ENDIF + +# If optimizations are enabled or disabled (either implicitly or +# explicitly), add the necessary flags. +# +!IF $(DEBUG)>1 || $(OPTIMIZATIONS)==0 +TCC = $(TCC) -Od +BCC = $(BCC) -Od +!IF $(USE_RUNTIME_CHECKS)!=0 +TCC = $(TCC) -RTC1 +BCC = $(BCC) -RTC1 +!ENDIF +!ELSEIF $(OPTIMIZATIONS)>=3 +TCC = $(TCC) -Ox +BCC = $(BCC) -Ox +!ELSEIF $(OPTIMIZATIONS)==2 +TCC = $(TCC) -O2 +BCC = $(BCC) -O2 +!ELSEIF $(OPTIMIZATIONS)==1 +TCC = $(TCC) -O1 +BCC = $(BCC) -O1 +!ENDIF + +# If symbols are enabled (or compiling for debugging), enable PDBs. +# +!IF $(DEBUG)>1 || $(SYMBOLS)!=0 +TCC = $(TCC) -Zi +BCC = $(BCC) -Zi +!ENDIF + + +# Command line prefixes for compiling code, compiling resources, +# linking, etc. +# +LTCOMPILE = $(TCC) -Fo$@ +LTRCOMPILE = $(RCC) -r +LTLIB = lib.exe +LTLINK = $(TCC) -Fe$@ + +# If requested, link to the RPCRT4 library. +# +!IF $(USE_RPCRT4_LIB)!=0 +LTLINK = $(LTLINK) rpcrt4.lib +!ENDIF + +# If a platform was set, force the linker to target that. +# Note that the vcvars*.bat family of batch files typically +# set this for you. Otherwise, the linker will attempt +# to deduce the binary type based on the object files. +!IFDEF PLATFORM +LTLINKOPTS = /NOLOGO /MACHINE:$(PLATFORM) +LTLIBOPTS = /NOLOGO /MACHINE:$(PLATFORM) +!ELSE +LTLINKOPTS = /NOLOGO +LTLIBOPTS = /NOLOGO +!ENDIF + +# When compiling for use in the WinRT environment, the following +# linker option must be used to mark the executable as runnable +# only in the context of an application container. +# +!IF $(FOR_WINRT)!=0 +LTLINKOPTS = $(LTLINKOPTS) /APPCONTAINER +!IF "$(VISUALSTUDIOVERSION)"=="12.0" || "$(VISUALSTUDIOVERSION)"=="14.0" +!IFNDEF STORELIBPATH +!IF "$(PLATFORM)"=="x86" +STORELIBPATH = $(CRTLIBPATH)\store +!ELSEIF "$(PLATFORM)"=="x64" +STORELIBPATH = $(CRTLIBPATH)\store\amd64 +!ELSEIF "$(PLATFORM)"=="ARM" +STORELIBPATH = $(CRTLIBPATH)\store\arm +!ELSE +STORELIBPATH = $(CRTLIBPATH)\store +!ENDIF +!ENDIF +STORELIBPATH = $(STORELIBPATH:\\=\) +LTLINKOPTS = $(LTLINKOPTS) "/LIBPATH:$(STORELIBPATH)" +!ENDIF +!ENDIF + +# When compiling for Windows Phone 8.1, an extra library path is +# required. *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201608261731.u7QHVLCS015188>