svn commit: r251189 - in user/attilio/vmobj-readlock: . contrib/atf/atf-c++ contrib/atf/atf-c++/detail contrib/byacc contrib/byacc/package contrib/byacc/package/debian contrib/byacc/test contrib/le...
Attilio Rao
attilio at FreeBSD.org
Fri May 31 18:27:24 UTC 2013
Author: attilio
Date: Fri May 31 18:27:21 2013
New Revision: 251189
URL: http://svnweb.freebsd.org/changeset/base/251189
Log:
MFC
Added:
user/attilio/vmobj-readlock/contrib/tcpdump/print-msnlb.c
- copied unchanged from r251185, user/attilio/vmcontention/contrib/tcpdump/print-msnlb.c
user/attilio/vmobj-readlock/contrib/tcpdump/print-otv.c
- copied unchanged from r251185, user/attilio/vmcontention/contrib/tcpdump/print-otv.c
user/attilio/vmobj-readlock/contrib/tcpdump/print-vxlan.c
- copied unchanged from r251185, user/attilio/vmcontention/contrib/tcpdump/print-vxlan.c
user/attilio/vmobj-readlock/contrib/tcpdump/print-zeromq.c
- copied unchanged from r251185, user/attilio/vmcontention/contrib/tcpdump/print-zeromq.c
user/attilio/vmobj-readlock/lib/libcompiler_rt/__sync_synchronize.c
- copied unchanged from r251185, user/attilio/vmcontention/lib/libcompiler_rt/__sync_synchronize.c
user/attilio/vmobj-readlock/lib/msun/man/cacos.3
- copied unchanged from r251185, user/attilio/vmcontention/lib/msun/man/cacos.3
user/attilio/vmobj-readlock/lib/msun/src/catrig.c
- copied unchanged from r251185, user/attilio/vmcontention/lib/msun/src/catrig.c
user/attilio/vmobj-readlock/lib/msun/src/catrigf.c
- copied unchanged from r251185, user/attilio/vmcontention/lib/msun/src/catrigf.c
user/attilio/vmobj-readlock/tools/regression/bin/sh/builtins/break4.4
- copied unchanged from r251185, user/attilio/vmcontention/tools/regression/bin/sh/builtins/break4.4
user/attilio/vmobj-readlock/tools/regression/bin/sh/builtins/break5.4
- copied unchanged from r251185, user/attilio/vmcontention/tools/regression/bin/sh/builtins/break5.4
user/attilio/vmobj-readlock/tools/regression/lib/msun/test-invctrig.c
- copied unchanged from r251185, user/attilio/vmcontention/tools/regression/lib/msun/test-invctrig.c
user/attilio/vmobj-readlock/tools/tools/netmap/vale-ctl.c
- copied unchanged from r251185, user/attilio/vmcontention/tools/tools/netmap/vale-ctl.c
Deleted:
user/attilio/vmobj-readlock/contrib/less/Makefile.aut
user/attilio/vmobj-readlock/contrib/less/Makefile.dsb
user/attilio/vmobj-readlock/contrib/less/Makefile.dsg
user/attilio/vmobj-readlock/contrib/less/Makefile.dsu
user/attilio/vmobj-readlock/contrib/less/Makefile.in
user/attilio/vmobj-readlock/contrib/less/Makefile.o2e
user/attilio/vmobj-readlock/contrib/less/Makefile.o9c
user/attilio/vmobj-readlock/contrib/less/Makefile.o9u
user/attilio/vmobj-readlock/contrib/less/Makefile.wnb
user/attilio/vmobj-readlock/contrib/less/Makefile.wnm
user/attilio/vmobj-readlock/contrib/less/configure
user/attilio/vmobj-readlock/contrib/less/configure.ac
user/attilio/vmobj-readlock/contrib/less/defines.ds
user/attilio/vmobj-readlock/contrib/less/defines.h.in
user/attilio/vmobj-readlock/contrib/less/defines.o2
user/attilio/vmobj-readlock/contrib/less/defines.o9
user/attilio/vmobj-readlock/contrib/less/defines.wn
user/attilio/vmobj-readlock/contrib/less/install.sh
user/attilio/vmobj-readlock/contrib/less/less.man
user/attilio/vmobj-readlock/contrib/less/lessecho.man
user/attilio/vmobj-readlock/contrib/less/lesskey.man
user/attilio/vmobj-readlock/contrib/less/mkfuncs.awk
user/attilio/vmobj-readlock/contrib/less/mkinstalldirs
Modified:
user/attilio/vmobj-readlock/Makefile
user/attilio/vmobj-readlock/Makefile.inc1
user/attilio/vmobj-readlock/contrib/atf/atf-c++/check_test.cpp
user/attilio/vmobj-readlock/contrib/atf/atf-c++/detail/process_test.cpp
user/attilio/vmobj-readlock/contrib/atf/atf-c++/detail/test_helpers.cpp
user/attilio/vmobj-readlock/contrib/atf/atf-c++/detail/test_helpers.hpp
user/attilio/vmobj-readlock/contrib/byacc/CHANGES
user/attilio/vmobj-readlock/contrib/byacc/VERSION
user/attilio/vmobj-readlock/contrib/byacc/aclocal.m4
user/attilio/vmobj-readlock/contrib/byacc/config.guess
user/attilio/vmobj-readlock/contrib/byacc/config.sub
user/attilio/vmobj-readlock/contrib/byacc/config_h.in
user/attilio/vmobj-readlock/contrib/byacc/configure
user/attilio/vmobj-readlock/contrib/byacc/configure.in
user/attilio/vmobj-readlock/contrib/byacc/main.c
user/attilio/vmobj-readlock/contrib/byacc/makefile.in
user/attilio/vmobj-readlock/contrib/byacc/output.c
user/attilio/vmobj-readlock/contrib/byacc/package/byacc.spec
user/attilio/vmobj-readlock/contrib/byacc/package/debian/changelog
user/attilio/vmobj-readlock/contrib/byacc/skeleton.c
user/attilio/vmobj-readlock/contrib/byacc/test/calc.tab.c
user/attilio/vmobj-readlock/contrib/byacc/test/calc1.tab.c
user/attilio/vmobj-readlock/contrib/byacc/test/calc1.y
user/attilio/vmobj-readlock/contrib/byacc/test/calc2.tab.c
user/attilio/vmobj-readlock/contrib/byacc/test/calc3.tab.c
user/attilio/vmobj-readlock/contrib/byacc/test/code_calc.code.c
user/attilio/vmobj-readlock/contrib/byacc/test/code_error.code.c
user/attilio/vmobj-readlock/contrib/byacc/test/error.tab.c
user/attilio/vmobj-readlock/contrib/byacc/test/ftp.output
user/attilio/vmobj-readlock/contrib/byacc/test/ftp.tab.c
user/attilio/vmobj-readlock/contrib/byacc/test/ftp.tab.h
user/attilio/vmobj-readlock/contrib/byacc/test/ftp.y
user/attilio/vmobj-readlock/contrib/byacc/test/grammar.tab.c
user/attilio/vmobj-readlock/contrib/byacc/test/pure_calc.tab.c
user/attilio/vmobj-readlock/contrib/byacc/test/pure_error.tab.c
user/attilio/vmobj-readlock/contrib/byacc/test/quote_calc-s.tab.c
user/attilio/vmobj-readlock/contrib/byacc/test/quote_calc.tab.c
user/attilio/vmobj-readlock/contrib/byacc/test/quote_calc2-s.tab.c
user/attilio/vmobj-readlock/contrib/byacc/test/quote_calc2.tab.c
user/attilio/vmobj-readlock/contrib/byacc/test/quote_calc3-s.tab.c
user/attilio/vmobj-readlock/contrib/byacc/test/quote_calc3.tab.c
user/attilio/vmobj-readlock/contrib/byacc/test/quote_calc4-s.tab.c
user/attilio/vmobj-readlock/contrib/byacc/test/quote_calc4.tab.c
user/attilio/vmobj-readlock/contrib/less/less.h
user/attilio/vmobj-readlock/contrib/less/line.c
user/attilio/vmobj-readlock/contrib/less/prompt.c
user/attilio/vmobj-readlock/contrib/less/screen.c
user/attilio/vmobj-readlock/contrib/less/search.c
user/attilio/vmobj-readlock/contrib/libpcap/CHANGES
user/attilio/vmobj-readlock/contrib/libpcap/CREDITS
user/attilio/vmobj-readlock/contrib/libpcap/README
user/attilio/vmobj-readlock/contrib/libpcap/VERSION
user/attilio/vmobj-readlock/contrib/libpcap/bpf_image.c
user/attilio/vmobj-readlock/contrib/libpcap/config.h.in
user/attilio/vmobj-readlock/contrib/libpcap/configure
user/attilio/vmobj-readlock/contrib/libpcap/configure.in
user/attilio/vmobj-readlock/contrib/libpcap/fad-getad.c
user/attilio/vmobj-readlock/contrib/libpcap/fad-gifc.c
user/attilio/vmobj-readlock/contrib/libpcap/fad-glifc.c
user/attilio/vmobj-readlock/contrib/libpcap/fad-sita.c
user/attilio/vmobj-readlock/contrib/libpcap/gencode.c
user/attilio/vmobj-readlock/contrib/libpcap/grammar.y
user/attilio/vmobj-readlock/contrib/libpcap/nametoaddr.c
user/attilio/vmobj-readlock/contrib/libpcap/optimize.c
user/attilio/vmobj-readlock/contrib/libpcap/pcap-bpf.c
user/attilio/vmobj-readlock/contrib/libpcap/pcap-bt-linux.c
user/attilio/vmobj-readlock/contrib/libpcap/pcap-bt-linux.h
user/attilio/vmobj-readlock/contrib/libpcap/pcap-can-linux.c
user/attilio/vmobj-readlock/contrib/libpcap/pcap-can-linux.h
user/attilio/vmobj-readlock/contrib/libpcap/pcap-canusb-linux.c
user/attilio/vmobj-readlock/contrib/libpcap/pcap-canusb-linux.h
user/attilio/vmobj-readlock/contrib/libpcap/pcap-common.c
user/attilio/vmobj-readlock/contrib/libpcap/pcap-dag.c
user/attilio/vmobj-readlock/contrib/libpcap/pcap-dag.h
user/attilio/vmobj-readlock/contrib/libpcap/pcap-dlpi.c
user/attilio/vmobj-readlock/contrib/libpcap/pcap-filter.manmisc
user/attilio/vmobj-readlock/contrib/libpcap/pcap-filter.manmisc.in
user/attilio/vmobj-readlock/contrib/libpcap/pcap-int.h
user/attilio/vmobj-readlock/contrib/libpcap/pcap-libdlpi.c
user/attilio/vmobj-readlock/contrib/libpcap/pcap-linux.c
user/attilio/vmobj-readlock/contrib/libpcap/pcap-netfilter-linux.c
user/attilio/vmobj-readlock/contrib/libpcap/pcap-netfilter-linux.h
user/attilio/vmobj-readlock/contrib/libpcap/pcap-nit.c
user/attilio/vmobj-readlock/contrib/libpcap/pcap-null.c
user/attilio/vmobj-readlock/contrib/libpcap/pcap-pf.c
user/attilio/vmobj-readlock/contrib/libpcap/pcap-septel.c
user/attilio/vmobj-readlock/contrib/libpcap/pcap-septel.h
user/attilio/vmobj-readlock/contrib/libpcap/pcap-sita.c
user/attilio/vmobj-readlock/contrib/libpcap/pcap-snf.c
user/attilio/vmobj-readlock/contrib/libpcap/pcap-snf.h
user/attilio/vmobj-readlock/contrib/libpcap/pcap-snit.c
user/attilio/vmobj-readlock/contrib/libpcap/pcap-snoop.c
user/attilio/vmobj-readlock/contrib/libpcap/pcap-usb-linux.c
user/attilio/vmobj-readlock/contrib/libpcap/pcap-usb-linux.h
user/attilio/vmobj-readlock/contrib/libpcap/pcap-win32.c
user/attilio/vmobj-readlock/contrib/libpcap/pcap.c
user/attilio/vmobj-readlock/contrib/libpcap/pcap/bpf.h
user/attilio/vmobj-readlock/contrib/libpcap/pcap/pcap.h
user/attilio/vmobj-readlock/contrib/libpcap/pcap_breakloop.3pcap
user/attilio/vmobj-readlock/contrib/libpcap/pcap_loop.3pcap
user/attilio/vmobj-readlock/contrib/libpcap/pcap_offline_filter.3pcap
user/attilio/vmobj-readlock/contrib/libpcap/scanner.l
user/attilio/vmobj-readlock/contrib/tcpdump/CHANGES
user/attilio/vmobj-readlock/contrib/tcpdump/CREDITS
user/attilio/vmobj-readlock/contrib/tcpdump/Makefile.in
user/attilio/vmobj-readlock/contrib/tcpdump/README
user/attilio/vmobj-readlock/contrib/tcpdump/VERSION
user/attilio/vmobj-readlock/contrib/tcpdump/addrtoname.c
user/attilio/vmobj-readlock/contrib/tcpdump/checksum.c
user/attilio/vmobj-readlock/contrib/tcpdump/configure
user/attilio/vmobj-readlock/contrib/tcpdump/configure.in
user/attilio/vmobj-readlock/contrib/tcpdump/ethertype.h
user/attilio/vmobj-readlock/contrib/tcpdump/icmp6.h
user/attilio/vmobj-readlock/contrib/tcpdump/interface.h
user/attilio/vmobj-readlock/contrib/tcpdump/netdissect.h
user/attilio/vmobj-readlock/contrib/tcpdump/nlpid.c
user/attilio/vmobj-readlock/contrib/tcpdump/nlpid.h
user/attilio/vmobj-readlock/contrib/tcpdump/print-802_11.c
user/attilio/vmobj-readlock/contrib/tcpdump/print-babel.c
user/attilio/vmobj-readlock/contrib/tcpdump/print-bgp.c
user/attilio/vmobj-readlock/contrib/tcpdump/print-dhcp6.c
user/attilio/vmobj-readlock/contrib/tcpdump/print-domain.c
user/attilio/vmobj-readlock/contrib/tcpdump/print-ether.c
user/attilio/vmobj-readlock/contrib/tcpdump/print-icmp6.c
user/attilio/vmobj-readlock/contrib/tcpdump/print-isoclns.c
user/attilio/vmobj-readlock/contrib/tcpdump/print-lldp.c
user/attilio/vmobj-readlock/contrib/tcpdump/print-ntp.c
user/attilio/vmobj-readlock/contrib/tcpdump/print-pppoe.c
user/attilio/vmobj-readlock/contrib/tcpdump/print-rip.c
user/attilio/vmobj-readlock/contrib/tcpdump/print-rpki-rtr.c
user/attilio/vmobj-readlock/contrib/tcpdump/print-stp.c
user/attilio/vmobj-readlock/contrib/tcpdump/print-tcp.c
user/attilio/vmobj-readlock/contrib/tcpdump/print-udp.c
user/attilio/vmobj-readlock/contrib/tcpdump/tcp.h
user/attilio/vmobj-readlock/contrib/tcpdump/tcpdump.1.in
user/attilio/vmobj-readlock/contrib/tcpdump/tcpdump.c
user/attilio/vmobj-readlock/contrib/tcpdump/udp.h
user/attilio/vmobj-readlock/crypto/openssh/servconf.c
user/attilio/vmobj-readlock/include/complex.h
user/attilio/vmobj-readlock/lib/libc/mips/gen/longjmp.c
user/attilio/vmobj-readlock/lib/libc/mips/net/htonl.S
user/attilio/vmobj-readlock/lib/libc/mips/net/htons.S
user/attilio/vmobj-readlock/lib/libc/mips/net/ntohl.S
user/attilio/vmobj-readlock/lib/libc/mips/net/ntohs.S
user/attilio/vmobj-readlock/lib/libc/net/nsdispatch.c
user/attilio/vmobj-readlock/lib/libc/net/nslexer.l
user/attilio/vmobj-readlock/lib/libc/net/nsparser.y
user/attilio/vmobj-readlock/lib/libc/powerpc64/gen/fpgetmask.c
user/attilio/vmobj-readlock/lib/libc/powerpc64/gen/fpgetround.c
user/attilio/vmobj-readlock/lib/libc/powerpc64/gen/fpgetsticky.c
user/attilio/vmobj-readlock/lib/libc/powerpc64/gen/fpsetmask.c
user/attilio/vmobj-readlock/lib/libc/powerpc64/gen/fpsetround.c
user/attilio/vmobj-readlock/lib/libc/sys/fork.2
user/attilio/vmobj-readlock/lib/libcompiler_rt/Makefile
user/attilio/vmobj-readlock/lib/libcompiler_rt/__sync_fetch_and_op_n.h
user/attilio/vmobj-readlock/lib/libcompiler_rt/__sync_val_compare_and_swap_n.h
user/attilio/vmobj-readlock/lib/libpcap/config.h
user/attilio/vmobj-readlock/lib/msun/Makefile
user/attilio/vmobj-readlock/lib/msun/Symbol.map
user/attilio/vmobj-readlock/lib/msun/man/ccos.3
user/attilio/vmobj-readlock/lib/msun/man/ccosh.3
user/attilio/vmobj-readlock/lib/msun/man/complex.3
user/attilio/vmobj-readlock/release/doc/Makefile
user/attilio/vmobj-readlock/share/man/man5/make.conf.5
user/attilio/vmobj-readlock/share/misc/committers-doc.dot
user/attilio/vmobj-readlock/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_reset.c
user/attilio/vmobj-readlock/sys/dev/aac/aac.c
user/attilio/vmobj-readlock/sys/dev/aac/aac_cam.c
user/attilio/vmobj-readlock/sys/dev/aac/aac_disk.c
user/attilio/vmobj-readlock/sys/dev/aac/aacvar.h
user/attilio/vmobj-readlock/sys/dev/ath/if_ath.c
user/attilio/vmobj-readlock/sys/dev/ath/if_ath_tx.c
user/attilio/vmobj-readlock/sys/dev/bce/if_bce.c
user/attilio/vmobj-readlock/sys/dev/bce/if_bcefw.h
user/attilio/vmobj-readlock/sys/dev/bce/if_bcereg.h
user/attilio/vmobj-readlock/sys/dev/cfi/cfi_core.c
user/attilio/vmobj-readlock/sys/dev/cfi/cfi_disk.c
user/attilio/vmobj-readlock/sys/dev/cfi/cfi_reg.h
user/attilio/vmobj-readlock/sys/dev/mfi/mfi_cam.c
user/attilio/vmobj-readlock/sys/dev/msk/if_msk.c
user/attilio/vmobj-readlock/sys/dev/netmap/netmap.c
user/attilio/vmobj-readlock/sys/dev/netmap/netmap_kern.h
user/attilio/vmobj-readlock/sys/dev/sk/if_sk.c
user/attilio/vmobj-readlock/sys/dev/sk/if_skreg.h
user/attilio/vmobj-readlock/sys/dev/usb/net/if_ipheth.c
user/attilio/vmobj-readlock/sys/dev/usb/usbdevs
user/attilio/vmobj-readlock/sys/dev/xen/blkfront/blkfront.c
user/attilio/vmobj-readlock/sys/dev/xen/netfront/netfront.c
user/attilio/vmobj-readlock/sys/fs/ext2fs/ext2_inode.c
user/attilio/vmobj-readlock/sys/fs/nandfs/nandfs_segment.c
user/attilio/vmobj-readlock/sys/fs/nandfs/nandfs_vnops.c
user/attilio/vmobj-readlock/sys/fs/nfsclient/nfs_clvnops.c
user/attilio/vmobj-readlock/sys/fs/nfsserver/nfs_nfsdport.c
user/attilio/vmobj-readlock/sys/fs/tmpfs/tmpfs_subr.c
user/attilio/vmobj-readlock/sys/geom/geom_flashmap.c
user/attilio/vmobj-readlock/sys/kern/vfs_bio.c
user/attilio/vmobj-readlock/sys/kern/vfs_cluster.c
user/attilio/vmobj-readlock/sys/kern/vfs_default.c
user/attilio/vmobj-readlock/sys/kern/vfs_subr.c
user/attilio/vmobj-readlock/sys/kern/vfs_vnops.c
user/attilio/vmobj-readlock/sys/mips/mips/db_trace.c
user/attilio/vmobj-readlock/sys/modules/ata/atacbus/Makefile
user/attilio/vmobj-readlock/sys/net/netmap.h
user/attilio/vmobj-readlock/sys/net/netmap_user.h
user/attilio/vmobj-readlock/sys/nfsclient/nfs_subs.c
user/attilio/vmobj-readlock/sys/nfsclient/nfs_vnops.c
user/attilio/vmobj-readlock/sys/nfsserver/nfs_serv.c
user/attilio/vmobj-readlock/sys/sys/buf.h
user/attilio/vmobj-readlock/sys/sys/bufobj.h
user/attilio/vmobj-readlock/sys/sys/sdt.h
user/attilio/vmobj-readlock/sys/ufs/ffs/ffs_inode.c
user/attilio/vmobj-readlock/sys/ufs/ffs/ffs_snapshot.c
user/attilio/vmobj-readlock/sys/ufs/ffs/ffs_softdep.c
user/attilio/vmobj-readlock/sys/ufs/ffs/ffs_vfsops.c
user/attilio/vmobj-readlock/sys/vm/vm_object.c
user/attilio/vmobj-readlock/sys/vm/vm_page.h
user/attilio/vmobj-readlock/tools/regression/filemon/timed-forkb.c
user/attilio/vmobj-readlock/tools/regression/lib/msun/Makefile
user/attilio/vmobj-readlock/tools/regression/lib/msun/test-rem.c
user/attilio/vmobj-readlock/tools/tools/netmap/Makefile
user/attilio/vmobj-readlock/tools/tools/netmap/bridge.c
user/attilio/vmobj-readlock/tools/tools/netmap/nm_util.c
user/attilio/vmobj-readlock/tools/tools/netmap/pcap.c
user/attilio/vmobj-readlock/tools/tools/netmap/pkt-gen.c
user/attilio/vmobj-readlock/usr.bin/kdump/kdump.c
user/attilio/vmobj-readlock/usr.sbin/tcpdump/tcpdump/Makefile
user/attilio/vmobj-readlock/usr.sbin/tcpdump/tcpdump/config.h
user/attilio/vmobj-readlock/usr.sbin/tcpdump/tcpdump/tcpdump.1
Directory Properties:
user/attilio/vmobj-readlock/ (props changed)
user/attilio/vmobj-readlock/contrib/atf/ (props changed)
user/attilio/vmobj-readlock/contrib/byacc/ (props changed)
user/attilio/vmobj-readlock/contrib/less/ (props changed)
user/attilio/vmobj-readlock/contrib/libpcap/ (props changed)
user/attilio/vmobj-readlock/contrib/tcpdump/ (props changed)
user/attilio/vmobj-readlock/crypto/openssh/ (props changed)
user/attilio/vmobj-readlock/lib/libc/ (props changed)
user/attilio/vmobj-readlock/sys/ (props changed)
Modified: user/attilio/vmobj-readlock/Makefile
==============================================================================
--- user/attilio/vmobj-readlock/Makefile Fri May 31 17:30:12 2013 (r251188)
+++ user/attilio/vmobj-readlock/Makefile Fri May 31 18:27:21 2013 (r251189)
@@ -65,8 +65,8 @@
# 5. `reboot' (in single user mode: boot -s from the loader prompt).
# 6. `mergemaster -p'
# 7. `make installworld'
-# 8. `make delete-old'
-# 9. `mergemaster' (you may wish to use -i, along with -U or -F).
+# 8. `mergemaster' (you may wish to use -i, along with -U or -F).
+# 9. `make delete-old'
# 10. `reboot'
# 11. `make delete-old-libs' (in case no 3rd party program uses them anymore)
#
Modified: user/attilio/vmobj-readlock/Makefile.inc1
==============================================================================
--- user/attilio/vmobj-readlock/Makefile.inc1 Fri May 31 17:30:12 2013 (r251188)
+++ user/attilio/vmobj-readlock/Makefile.inc1 Fri May 31 18:27:21 2013 (r251189)
@@ -114,15 +114,8 @@ LOCAL_TOOL_DIRS?=
BUILDENV_SHELL?=/bin/sh
-CVS?= cvs
-CVSFLAGS?= -A -P -d -I!
-SVN?= svn
+SVN?= /usr/local/bin/svn
SVNFLAGS?= -r HEAD
-SUP?= /usr/bin/csup
-SUPFLAGS?= -g -L 2
-.if defined(SUPHOST)
-SUPFLAGS+= -h ${SUPHOST}
-.endif
MAKEOBJDIRPREFIX?= /usr/obj
.if !defined(OSRELDATE)
@@ -414,11 +407,12 @@ IMAKEENV+= PATH=${TMPPATH}:${INSTALLTMP}
INSTALLFLAGS+= -N ${.CURDIR}/etc
MTREEFLAGS+= -N ${.CURDIR}/etc
.endif
+_INSTALL_DDIR= ${DESTDIR}/${DISTDIR}
+INSTALL_DDIR= ${_INSTALL_DDIR:S://:/:g:C:/$::}
.if defined(NO_ROOT)
METALOG?= ${DESTDIR}/${DISTDIR}/METALOG
IMAKE+= -DNO_ROOT METALOG=${METALOG}
-INSTALL_DDIR= ${DESTDIR}/${DISTDIR}
-INSTALLFLAGS+= -U -M ${METALOG} -D ${INSTALL_DDIR:S://:/:g:C:/$::}
+INSTALLFLAGS+= -U -M ${METALOG} -D ${INSTALL_DDIR}
MTREEFLAGS+= -W
.endif
.if defined(DB_FROM_SRC) || defined(NO_ROOT)
@@ -1021,7 +1015,7 @@ distributekernel distributekernel.debug:
cd ${KRNLOBJDIR}/${INSTALLKERNEL}; \
${IMAKEENV} ${IMAKE_INSTALL:S/METALOG/kernel.premeta/} \
${IMAKE_MTREE} PATH=${TMPPATH} ${MAKE} KERNEL=${INSTKERNNAME} \
- DESTDIR=${INSTALL_DDIR:S://:/:g:C:/$::}/kernel \
+ DESTDIR=${INSTALL_DDIR}/kernel \
${.TARGET:S/distributekernel/install/}
.if defined(NO_ROOT)
sed -e 's|^./kernel|.|' ${DESTDIR}/${DISTDIR}/kernel.premeta > \
@@ -1035,7 +1029,7 @@ distributekernel distributekernel.debug:
${IMAKEENV} ${IMAKE_INSTALL:S/METALOG/kernel.${_kernel}.premeta/} \
${IMAKE_MTREE} PATH=${TMPPATH} ${MAKE} \
KERNEL=${INSTKERNNAME}.${_kernel} \
- DESTDIR=${INSTALL_DDIR:S://:/:g:C:/$::}/kernel.${_kernel} \
+ DESTDIR=${INSTALL_DDIR}/kernel.${_kernel} \
${.TARGET:S/distributekernel/install/}
sed -e 's|^./kernel|.|' \
${DESTDIR}/${DISTDIR}/kernel.${_kernel}.premeta > \
@@ -1080,59 +1074,18 @@ doxygen:
# latest copy.
#
update:
-.if defined(SUP_UPDATE)
+.if (defined(CVS_UPDATE) || defined(SUP_UPDATE)) && !defined(SVN_UPDATE)
@echo "--------------------------------------------------------------"
- @echo ">>> Running ${SUP}"
+ @echo "CVS_UPDATE and SUP_UPDATE are no longer supported."
+ @echo "Please see: https://wiki.freebsd.org/CvsIsDeprecated"
@echo "--------------------------------------------------------------"
- @echo "!! WARNING WARNING WARNING WARNING WARNING WARNING WARNING !!"
- @echo "!! Update methods with ${SUP} are deprecated."
- @echo "!! Please see http://www.freebsd.org/handbook/svn.html"
- @echo "!! and convert your update method to SVN_UPDATE or"
- @echo "!! freebsd-update(8)."
- @echo "!! WARNING WARNING WARNING WARNING WARNING WARNING WARNING !!"
- @sleep 5
-.if defined(SUPFILE)
- @${SUP} ${SUPFLAGS} ${SUPFILE}
-.endif
-.if defined(SUPFILE1)
- @${SUP} ${SUPFLAGS} ${SUPFILE1}
-.endif
-.if defined(SUPFILE2)
- @${SUP} ${SUPFLAGS} ${SUPFILE2}
-.endif
-.if defined(PORTSSUPFILE) && !defined(NO_PORTSUPDATE)
- @${SUP} ${SUPFLAGS} ${PORTSSUPFILE}
-.endif
-.if defined(DOCSUPFILE) && !defined(NO_DOCUPDATE)
- @${SUP} ${SUPFLAGS} ${DOCSUPFILE}
-.endif
-.endif
-.if defined(CVS_UPDATE)
- @cd ${.CURDIR} ; \
- if [ -d CVS ] ; then \
- echo "--------------------------------------------------------------" ; \
- echo ">>> Updating ${.CURDIR} from CVS repository" ${CVSROOT} ; \
- echo "--------------------------------------------------------------" ; \
- echo "!! WARNING WARNING WARNING WARNING WARNING WARNING WARNING !!" ; \
- echo "!! Update methods with CVS are deprecated." ; \
- echo "!! Please see http://www.freebsd.org/handbook/svn.html" ; \
- echo "!! and convert your update method to SVN_UPDATE or" ; \
- echo "!! freebsd-update(8)." ; \
- echo "!! WARNING WARNING WARNING WARNING WARNING WARNING WARNING !!" ; \
- sleep 5 ; \
- echo ${CVS} -R -q update ${CVSFLAGS} ; \
- ${CVS} -R -q update ${CVSFLAGS} ; \
- fi
+ @exit 1
.endif
.if defined(SVN_UPDATE)
- @cd ${.CURDIR} ; \
- if [ -d .svn ] ; then \
- echo "--------------------------------------------------------------" ; \
- echo ">>> Updating ${.CURDIR} using Subversion" ; \
- echo "--------------------------------------------------------------" ; \
- echo ${SVN} update ${SVNFLAGS} ; \
- ${SVN} update ${SVNFLAGS} ; \
- fi
+ @echo "--------------------------------------------------------------"
+ @echo ">>> Updating ${.CURDIR} using Subversion"
+ @echo "--------------------------------------------------------------"
+ @(cd ${.CURDIR} && ${SVN} update ${SVNFLAGS})
.endif
#
Modified: user/attilio/vmobj-readlock/contrib/atf/atf-c++/check_test.cpp
==============================================================================
--- user/attilio/vmobj-readlock/contrib/atf/atf-c++/check_test.cpp Fri May 31 17:30:12 2013 (r251188)
+++ user/attilio/vmobj-readlock/contrib/atf/atf-c++/check_test.cpp Fri May 31 18:27:21 2013 (r251189)
@@ -61,7 +61,7 @@ std::auto_ptr< atf::check::check_result
do_exec(const atf::tests::tc* tc, const char* helper_name)
{
std::vector< std::string > argv;
- argv.push_back(get_process_helpers_path(*tc).str());
+ argv.push_back(get_process_helpers_path(*tc, false).str());
argv.push_back(helper_name);
std::cout << "Executing " << argv[0] << " " << argv[1] << "\n";
@@ -74,7 +74,7 @@ std::auto_ptr< atf::check::check_result
do_exec(const atf::tests::tc* tc, const char* helper_name, const char *carg2)
{
std::vector< std::string > argv;
- argv.push_back(get_process_helpers_path(*tc).str());
+ argv.push_back(get_process_helpers_path(*tc, false).str());
argv.push_back(helper_name);
argv.push_back(carg2);
std::cout << "Executing " << argv[0] << " " << argv[1] << " "
Modified: user/attilio/vmobj-readlock/contrib/atf/atf-c++/detail/process_test.cpp
==============================================================================
--- user/attilio/vmobj-readlock/contrib/atf/atf-c++/detail/process_test.cpp Fri May 31 17:30:12 2013 (r251188)
+++ user/attilio/vmobj-readlock/contrib/atf/atf-c++/detail/process_test.cpp Fri May 31 18:27:21 2013 (r251189)
@@ -64,10 +64,10 @@ exec_process_helpers(const atf::tests::t
using atf::process::exec;
std::vector< std::string > argv;
- argv.push_back(get_process_helpers_path(tc).leaf_name());
+ argv.push_back(get_process_helpers_path(tc, true).leaf_name());
argv.push_back(helper_name);
- return exec(get_process_helpers_path(tc),
+ return exec(get_process_helpers_path(tc, true),
atf::process::argv_array(argv),
atf::process::stream_inherit(),
atf::process::stream_inherit());
Modified: user/attilio/vmobj-readlock/contrib/atf/atf-c++/detail/test_helpers.cpp
==============================================================================
--- user/attilio/vmobj-readlock/contrib/atf/atf-c++/detail/test_helpers.cpp Fri May 31 17:30:12 2013 (r251188)
+++ user/attilio/vmobj-readlock/contrib/atf/atf-c++/detail/test_helpers.cpp Fri May 31 18:27:21 2013 (r251189)
@@ -82,10 +82,14 @@ header_check(const char *hdrname)
}
atf::fs::path
-get_process_helpers_path(const atf::tests::tc& tc)
+get_process_helpers_path(const atf::tests::tc& tc, bool is_detail)
{
- return atf::fs::path(tc.get_config_var("srcdir")) /
- ".." / "atf-c" / "detail" / "process_helpers";
+ if (is_detail)
+ return atf::fs::path(tc.get_config_var("srcdir")) /
+ ".." / ".." / "atf-c" / "detail" / "process_helpers";
+ else
+ return atf::fs::path(tc.get_config_var("srcdir")) /
+ ".." / "atf-c" / "detail" / "process_helpers";
}
bool
Modified: user/attilio/vmobj-readlock/contrib/atf/atf-c++/detail/test_helpers.hpp
==============================================================================
--- user/attilio/vmobj-readlock/contrib/atf/atf-c++/detail/test_helpers.hpp Fri May 31 17:30:12 2013 (r251188)
+++ user/attilio/vmobj-readlock/contrib/atf/atf-c++/detail/test_helpers.hpp Fri May 31 18:27:21 2013 (r251189)
@@ -86,7 +86,7 @@ class tc;
void header_check(const char*);
void build_check_cxx_o(const atf::tests::tc&, const char*, const char*, bool);
-atf::fs::path get_process_helpers_path(const atf::tests::tc&);
+atf::fs::path get_process_helpers_path(const atf::tests::tc&, bool);
bool grep_file(const char*, const char*);
bool grep_string(const std::string&, const char*);
Modified: user/attilio/vmobj-readlock/contrib/byacc/CHANGES
==============================================================================
--- user/attilio/vmobj-readlock/contrib/byacc/CHANGES Fri May 31 17:30:12 2013 (r251188)
+++ user/attilio/vmobj-readlock/contrib/byacc/CHANGES Fri May 31 18:27:21 2013 (r251189)
@@ -1,3 +1,117 @@
+2013-03-04 Thomas E. Dickey <tom at invisible-island.net>
+
+ * package/debian/changelog, VERSION, package/byacc.spec: bump
+
+ * aclocal.m4:
+ adapt tweak from Dave Becket to work around long-ago breakage in "new" autoconf.
+
+ * output.c:
+ fix bogus #include if "-i" is given but not "-d" (report by Richard Mitton).
+ also while testing that, found a case where the union_file is unused; added
+ a check for address that.
+
+ * test/ftp.output, test/ftp.tab.c, test/ftp.tab.h: regen
+
+ * test/ftp.y: fix most compiler warnings for "make check_make"
+
+ * test/calc1.tab.c: regen
+
+ * test/calc1.y: fix most compiler warnings for "make check_make"
+
+ * test/calc.tab.c, test/calc1.tab.c, test/calc2.tab.c, test/calc3.tab.c, test/code_calc.code.c, test/code_error.code.c, test/error.tab.c, test/ftp.tab.c, test/grammar.tab.c, test/pure_calc.tab.c, test/pure_error.tab.c, test/quote_calc-s.tab.c, test/quote_calc.tab.c, test/quote_calc2-s.tab.c, test/quote_calc2.tab.c, test/quote_calc3-s.tab.c, test/quote_calc3.tab.c, test/quote_calc4-s.tab.c, test/quote_calc4.tab.c:
+ regen
+
+ * skeleton.c: quiet a gcc conversion-warning in yygrowstack()
+
+ * configure: regen
+
+ * aclocal.m4:
+ another fix for CF_GCC_VERSION to handle Debian's modification of gcc message.
+
+2013-02-10 Thomas E. Dickey <tom at invisible-island.net>
+
+ * config.sub, config.guess: 2013-02-04
+
+2012-10-03 Thomas E. Dickey <tom at invisible-island.net>
+
+ * package/debian/changelog, package/byacc.spec, VERSION: bump
+
+ * configure: regen
+
+ * configure.in: moved AC_PROG_CC_STDC call into CF_PROG_CC
+
+ * aclocal.m4:
+ moved AC_PROG_CC_STDC call into CF_PROG_CC and (for other uses than byacc)
+ the CF_PROG_CC macro provides the CF_ANSI_CC_REQD for the 2.13 flavor.
+
+ * aclocal.m4, configure.in:
+ Arian's change dropped my check for misused $CC variable - restore that with
+ alternate macro CF_PROG_CC.
+
+2012-10-03 Adrian.Bunk
+
+ * aclocal.m4:
+ suggested patch: drop CF_ANSI_CC_REQD, CF_ANSI_CC_CHECK, CF_PROG_EXT since
+ they are not needed.
+
+2012-10-03 Thomas E. Dickey <tom at invisible-island.net>
+
+ * aclocal.m4:
+ split-out CF_CC_ENV_FLAGS from CF_ANSI_CC_CHECK to avoid losing it in
+ Adrian's suggested changes.
+
+ * aclocal.m4:
+ CF_CLANG_COMPILER - check if the given compiler is really clang.
+
+ * aclocal.m4:
+ add check for clang to CF_GCC_WARNINGS. modify CF_GCC_WARNINGS to work around
+ old gcc warning: ncurses change to (try to) use gnatgcc exposed gnatgcc 2.8.1
+ on my Sarge system (versus 3.3.5 for the normal gcc). The 2.8.1's
+ pointer-arithmetic checks fell afoul of gcc's misuse of void* in string.h; work
+ around by excluding that check for pre-3.x compilers.
+
+ * aclocal.m4:
+ modify CF_GCC_ATTRIBUTES so that autoheader is able to see the definitions
+ provided by this macro. use AC_DEFINE_UNQUOTED() in CF_GCC_ATTRIBUTES rather
+ than appending to confdefs.h, since long-ago concern about the ability to
+ pass-through parameterized macros appears to be not a problem, testing with
+ 2.13 and 2.52
+
+2012-10-03 Adrian.Bunk
+
+ * aclocal.m4:
+ add parameter to AC_DEFINE_UNQUOTED() to allow it to be recognized by
+ autoheader, updated macros:
+ CF_CHECK_CACHE
+ CF_DISABLE_LEAKS
+ CF_MKSTEMP
+ CF_MIXEDCASE_FILENAMES
+ CF_NO_LEAKS_OPTION
+
+2012-10-03 Thomas E. Dickey <tom at invisible-island.net>
+
+ * aclocal.m4:
+ move existence-check for mkstemp out of the AC_TRY_RUN, to help with
+ cross-compiles
+
+2012-10-02 Thomas E. Dickey <tom at invisible-island.net>
+
+ * config_h.in:
+ Adrian Bunk request - replace this with the output from autoheader
+
+2012-09-29 Adrian.Bunk
+
+ * configure.in:
+ suggested change: replace CF_ANSI_CC_REQD by AC_PROG_CC_STDC (since no
+ check is needed anymore for standard C compilers), drop AC_CONST (same
+ reason), modify AC_OUTPUT to rely upon template generated by autoheader.
+ bump requirement to autoconf 2.52.20011201 and drop check for CF_PROG_EXT
+ as being obsolete with autoconf 2.52x
+
+ * configure.in, main.c: drop check for atexit, because it is standard C
+
+ * makefile.in: add assignment for datarootdir variable.
+
2012-05-26 Thomas E. Dickey <tom at invisible-island.net>
* package/debian/changelog, package/byacc.spec, VERSION: bump
Modified: user/attilio/vmobj-readlock/contrib/byacc/VERSION
==============================================================================
--- user/attilio/vmobj-readlock/contrib/byacc/VERSION Fri May 31 17:30:12 2013 (r251188)
+++ user/attilio/vmobj-readlock/contrib/byacc/VERSION Fri May 31 18:27:21 2013 (r251189)
@@ -1 +1 @@
-20120526
+20130304
Modified: user/attilio/vmobj-readlock/contrib/byacc/aclocal.m4
==============================================================================
--- user/attilio/vmobj-readlock/contrib/byacc/aclocal.m4 Fri May 31 17:30:12 2013 (r251188)
+++ user/attilio/vmobj-readlock/contrib/byacc/aclocal.m4 Fri May 31 18:27:21 2013 (r251189)
@@ -1,7 +1,7 @@
-dnl $Id: aclocal.m4,v 1.19 2012/01/13 14:10:56 tom Exp $
+dnl $Id: aclocal.m4,v 1.30 2013/03/05 01:13:39 tom Exp $
dnl Macros for byacc configure script (Thomas E. Dickey)
dnl ---------------------------------------------------------------------------
-dnl Copyright 2004-2011,2012 Thomas E. Dickey
+dnl Copyright 2004-2012,2013 Thomas E. Dickey
dnl
dnl Permission is hereby granted, free of charge, to any person obtaining a
dnl copy of this software and associated documentation files (the
@@ -28,6 +28,32 @@ dnl sale, use or other dealings in this
dnl authorization.
dnl ---------------------------------------------------------------------------
dnl ---------------------------------------------------------------------------
+dnl CF_ACVERSION_CHECK version: 4 updated: 2013/03/04 19:52:56
+dnl ------------------
+dnl Conditionally generate script according to whether we're using a given autoconf.
+dnl
+dnl $1 = version to compare against
+dnl $2 = code to use if AC_ACVERSION is at least as high as $1.
+dnl $3 = code to use if AC_ACVERSION is older than $1.
+define([CF_ACVERSION_CHECK],
+[
+ifdef([AC_ACVERSION], ,[m4_copy([m4_PACKAGE_VERSION],[AC_ACVERSION])])dnl
+ifdef([m4_version_compare],
+[m4_if(m4_version_compare(m4_defn([AC_ACVERSION]), [$1]), -1, [$3], [$2])],
+[CF_ACVERSION_COMPARE(
+AC_PREREQ_CANON(AC_PREREQ_SPLIT([$1])),
+AC_PREREQ_CANON(AC_PREREQ_SPLIT(AC_ACVERSION)), AC_ACVERSION, [$2], [$3])])])dnl
+dnl ---------------------------------------------------------------------------
+dnl CF_ACVERSION_COMPARE version: 3 updated: 2012/10/03 18:39:53
+dnl --------------------
+dnl CF_ACVERSION_COMPARE(MAJOR1, MINOR1, TERNARY1,
+dnl MAJOR2, MINOR2, TERNARY2,
+dnl PRINTABLE2, not FOUND, FOUND)
+define([CF_ACVERSION_COMPARE],
+[ifelse(builtin([eval], [$2 < $5]), 1,
+[ifelse([$8], , ,[$8])],
+[ifelse([$9], , ,[$9])])])dnl
+dnl ---------------------------------------------------------------------------
dnl CF_ADD_CFLAGS version: 10 updated: 2010/05/26 05:38:42
dnl -------------
dnl Copy non-preprocessor flags to $CFLAGS, preprocessor flags to $CPPFLAGS
@@ -116,97 +142,6 @@ AC_SUBST(EXTRA_CPPFLAGS)
])dnl
dnl ---------------------------------------------------------------------------
-dnl CF_ANSI_CC_CHECK version: 11 updated: 2011/07/01 19:47:45
-dnl ----------------
-dnl This was originally adapted from the macros 'fp_PROG_CC_STDC' and
-dnl 'fp_C_PROTOTYPES' in the sharutils 4.2 distribution.
-AC_DEFUN([CF_ANSI_CC_CHECK],
-[
-# This should have been defined by AC_PROG_CC
-: ${CC:=cc}
-
-# Check for user's environment-breakage by stuffing CFLAGS/CPPFLAGS content
-# into CC. This will not help with broken scripts that wrap the compiler with
-# options, but eliminates a more common category of user confusion.
-AC_MSG_CHECKING(\$CC variable)
-case "$CC" in #(vi
-*[[\ \ ]]-[[IUD]]*)
- AC_MSG_RESULT(broken)
- AC_MSG_WARN(your environment misuses the CC variable to hold CFLAGS/CPPFLAGS options)
- # humor him...
- cf_flags=`echo "$CC" | sed -e 's/^[[^ ]]*[[ ]]//'`
- CC=`echo "$CC" | sed -e 's/[[ ]].*//'`
- CF_ADD_CFLAGS($cf_flags)
- ;;
-*)
- AC_MSG_RESULT(ok)
- ;;
-esac
-
-AC_CACHE_CHECK(for ${CC:-cc} option to accept ANSI C, cf_cv_ansi_cc,[
-cf_cv_ansi_cc=no
-cf_save_CFLAGS="$CFLAGS"
-cf_save_CPPFLAGS="$CPPFLAGS"
-# Don't try gcc -ansi; that turns off useful extensions and
-# breaks some systems' header files.
-# AIX -qlanglvl=ansi
-# Ultrix and OSF/1 -std1
-# HP-UX -Aa -D_HPUX_SOURCE
-# SVR4 -Xc
-# UnixWare 1.2 (cannot use -Xc, since ANSI/POSIX clashes)
-for cf_arg in "-DCC_HAS_PROTOS" \
- "" \
- -qlanglvl=ansi \
- -std1 \
- -Ae \
- "-Aa -D_HPUX_SOURCE" \
- -Xc
-do
- CF_ADD_CFLAGS($cf_arg)
- AC_TRY_COMPILE(
-[
-#ifndef CC_HAS_PROTOS
-#if !defined(__STDC__) || (__STDC__ != 1)
-choke me
-#endif
-#endif
-],[
- int test (int i, double x);
- struct s1 {int (*f) (int a);};
- struct s2 {int (*f) (double a);};],
- [cf_cv_ansi_cc="$cf_arg"; break])
-done
-CFLAGS="$cf_save_CFLAGS"
-CPPFLAGS="$cf_save_CPPFLAGS"
-])
-
-if test "$cf_cv_ansi_cc" != "no"; then
-if test ".$cf_cv_ansi_cc" != ".-DCC_HAS_PROTOS"; then
- CF_ADD_CFLAGS($cf_cv_ansi_cc)
-else
- AC_DEFINE(CC_HAS_PROTOS)
-fi
-fi
-])dnl
-dnl ---------------------------------------------------------------------------
-dnl CF_ANSI_CC_REQD version: 4 updated: 2008/03/23 14:48:54
-dnl ---------------
-dnl For programs that must use an ANSI compiler, obtain compiler options that
-dnl will make it recognize prototypes. We'll do preprocessor checks in other
-dnl macros, since tools such as unproto can fake prototypes, but only part of
-dnl the preprocessor.
-AC_DEFUN([CF_ANSI_CC_REQD],
-[AC_REQUIRE([CF_ANSI_CC_CHECK])
-if test "$cf_cv_ansi_cc" = "no"; then
- AC_MSG_ERROR(
-[Your compiler does not appear to recognize prototypes.
-You have the following choices:
- a. adjust your compiler options
- b. get an up-to-date compiler
- c. use a wrapper such as unproto])
-fi
-])dnl
-dnl ---------------------------------------------------------------------------
dnl CF_ARG_DISABLE version: 3 updated: 1999/03/30 17:24:31
dnl --------------
dnl Allow user to disable a normally-on option.
@@ -236,7 +171,33 @@ ifelse([$3],,[ :]dnl
])dnl
])])dnl
dnl ---------------------------------------------------------------------------
-dnl CF_CHECK_CACHE version: 11 updated: 2008/03/23 14:45:59
+dnl CF_CC_ENV_FLAGS version: 1 updated: 2012/10/03 05:25:49
+dnl ---------------
+dnl Check for user's environment-breakage by stuffing CFLAGS/CPPFLAGS content
+dnl into CC. This will not help with broken scripts that wrap the compiler with
+dnl options, but eliminates a more common category of user confusion.
+AC_DEFUN([CF_CC_ENV_FLAGS],
+[
+# This should have been defined by AC_PROG_CC
+: ${CC:=cc}
+
+AC_MSG_CHECKING(\$CC variable)
+case "$CC" in #(vi
+*[[\ \ ]]-[[IUD]]*)
+ AC_MSG_RESULT(broken)
+ AC_MSG_WARN(your environment misuses the CC variable to hold CFLAGS/CPPFLAGS options)
+ # humor him...
+ cf_flags=`echo "$CC" | sed -e 's/^[[^ ]]*[[ ]]//'`
+ CC=`echo "$CC" | sed -e 's/[[ ]].*//'`
+ CF_ADD_CFLAGS($cf_flags)
+ ;;
+*)
+ AC_MSG_RESULT(ok)
+ ;;
+esac
+])dnl
+dnl ---------------------------------------------------------------------------
+dnl CF_CHECK_CACHE version: 12 updated: 2012/10/02 20:55:03
dnl --------------
dnl Check if we're accidentally using a cache from a different machine.
dnl Derive the system name, as a check for reusing the autoconf cache.
@@ -259,7 +220,7 @@ else
system_name="`(hostname) 2>/dev/null`"
fi
fi
-test -n "$system_name" && AC_DEFINE_UNQUOTED(SYSTEM_NAME,"$system_name")
+test -n "$system_name" && AC_DEFINE_UNQUOTED(SYSTEM_NAME,"$system_name",[Define to the system name.])
AC_CACHE_VAL(cf_cv_system_name,[cf_cv_system_name="$system_name"])
test -z "$system_name" && system_name="$cf_cv_system_name"
@@ -271,7 +232,40 @@ if test ".$system_name" != ".$cf_cv_syst
fi
])dnl
dnl ---------------------------------------------------------------------------
-dnl CF_DISABLE_ECHO version: 11 updated: 2009/12/13 13:16:57
+dnl CF_CLANG_COMPILER version: 1 updated: 2012/06/16 14:55:39
+dnl -----------------
+dnl Check if the given compiler is really clang. clang's C driver defines
+dnl __GNUC__ (fooling the configure script into setting $GCC to yes) but does
+dnl not ignore some gcc options.
+dnl
+dnl This macro should be run "soon" after AC_PROG_CC or AC_PROG_CPLUSPLUS, to
+dnl ensure that it is not mistaken for gcc/g++. It is normally invoked from
+dnl the wrappers for gcc and g++ warnings.
+dnl
+dnl $1 = GCC (default) or GXX
+dnl $2 = INTEL_COMPILER (default) or INTEL_CPLUSPLUS
+dnl $3 = CFLAGS (default) or CXXFLAGS
+AC_DEFUN([CF_CLANG_COMPILER],[
+ifelse([$2],,CLANG_COMPILER,[$2])=no
+
+if test "$ifelse([$1],,[$1],GCC)" = yes ; then
+ AC_MSG_CHECKING(if this is really Clang ifelse([$1],GXX,C++,C) compiler)
+ cf_save_CFLAGS="$ifelse([$3],,CFLAGS,[$3])"
+ ifelse([$3],,CFLAGS,[$3])="$ifelse([$3],,CFLAGS,[$3]) -Qunused-arguments"
+ AC_TRY_COMPILE([],[
+#ifdef __clang__
+#else
+make an error
+#endif
+],[ifelse([$2],,CLANG_COMPILER,[$2])=yes
+cf_save_CFLAGS="$cf_save_CFLAGS -Qunused-arguments"
+],[])
+ ifelse([$3],,CFLAGS,[$3])="$cf_save_CFLAGS"
+ AC_MSG_RESULT($ifelse([$2],,CLANG_COMPILER,[$2]))
+fi
+])
+dnl ---------------------------------------------------------------------------
+dnl CF_DISABLE_ECHO version: 12 updated: 2012/10/06 16:30:28
dnl ---------------
dnl You can always use "make -n" to see the actual options, but it's hard to
dnl pick out/analyze warning messages when the compile-line is long.
@@ -286,7 +280,7 @@ dnl
AC_DEFUN([CF_DISABLE_ECHO],[
AC_MSG_CHECKING(if you want to see long compiling messages)
CF_ARG_DISABLE(echo,
- [ --disable-echo display "compiling" commands],
+ [ --disable-echo do not display "compiling" commands],
[
ECHO_LT='--silent'
ECHO_LD='@echo linking [$]@;'
@@ -308,7 +302,7 @@ AC_SUBST(SHOW_CC)
AC_SUBST(ECHO_CC)
])dnl
dnl ---------------------------------------------------------------------------
-dnl CF_DISABLE_LEAKS version: 6 updated: 2010/07/23 04:14:32
+dnl CF_DISABLE_LEAKS version: 7 updated: 2012/10/02 20:55:03
dnl ----------------
dnl Combine no-leak checks with the libraries or tools that are used for the
dnl checks.
@@ -326,12 +320,12 @@ AC_ARG_ENABLE(leaks,
AC_MSG_RESULT($with_no_leaks)
if test "$with_no_leaks" = yes ; then
- AC_DEFINE(NO_LEAKS)
- AC_DEFINE(YY_NO_LEAKS)
+ AC_DEFINE(NO_LEAKS,1,[Define to 1 if you want to perform memory-leak testing.])
+ AC_DEFINE(YY_NO_LEAKS,1,[Define to 1 if you want to perform memory-leak testing.])
fi
])dnl
dnl ---------------------------------------------------------------------------
-dnl CF_GCC_ATTRIBUTES version: 14 updated: 2010/10/23 15:52:32
+dnl CF_GCC_ATTRIBUTES version: 16 updated: 2012/10/02 20:55:03
dnl -----------------
dnl Test for availability of useful gcc __attribute__ directives to quiet
dnl compiler warnings. Though useful, not all are supported -- and contrary
@@ -409,27 +403,27 @@ EOF
test -n "$verbose" && AC_MSG_RESULT(... $cf_attribute)
cat conftest.h >>confdefs.h
case $cf_attribute in #(vi
+ noreturn) #(vi
+ AC_DEFINE_UNQUOTED(GCC_NORETURN,$cf_directive,[Define to noreturn-attribute for gcc])
+ ;;
printf) #(vi
- if test "$cf_printf_attribute" = no ; then
- cat >>confdefs.h <<EOF
-#define GCC_PRINTFLIKE(fmt,var) /* nothing */
-EOF
- else
- cat >>confdefs.h <<EOF
-#define GCC_PRINTFLIKE(fmt,var) __attribute__((format(printf,fmt,var)))
-EOF
+ cf_value='/* nothing */'
+ if test "$cf_printf_attribute" != no ; then
+ cf_value='__attribute__((format(printf,fmt,var)))'
+ AC_DEFINE(GCC_PRINTF,1,[Define to 1 if the compiler supports gcc-like printf attribute.])
fi
+ AC_DEFINE_UNQUOTED(GCC_PRINTFLIKE(fmt,var),$cf_value,[Define to printf-attribute for gcc])
;;
scanf) #(vi
- if test "$cf_scanf_attribute" = no ; then
- cat >>confdefs.h <<EOF
-#define GCC_SCANFLIKE(fmt,var) /* nothing */
-EOF
- else
- cat >>confdefs.h <<EOF
-#define GCC_SCANFLIKE(fmt,var) __attribute__((format(scanf,fmt,var)))
-EOF
+ cf_value='/* nothing */'
+ if test "$cf_scanf_attribute" != no ; then
+ cf_value='__attribute__((format(scanf,fmt,var)))'
+ AC_DEFINE(GCC_SCANF,1,[Define to 1 if the compiler supports gcc-like scanf attribute.])
fi
+ AC_DEFINE_UNQUOTED(GCC_SCANFLIKE(fmt,var),$cf_value,[Define to sscanf-attribute for gcc])
+ ;;
+ unused) #(vi
+ AC_DEFINE_UNQUOTED(GCC_UNUSED,$cf_directive,[Define to unused-attribute for gcc])
;;
esac
fi
@@ -441,7 +435,7 @@ rm -rf conftest*
fi
])dnl
dnl ---------------------------------------------------------------------------
-dnl CF_GCC_VERSION version: 5 updated: 2010/04/24 11:02:31
+dnl CF_GCC_VERSION version: 7 updated: 2012/10/18 06:46:33
dnl --------------
dnl Find version of gcc
AC_DEFUN([CF_GCC_VERSION],[
@@ -449,13 +443,13 @@ AC_REQUIRE([AC_PROG_CC])
GCC_VERSION=none
if test "$GCC" = yes ; then
AC_MSG_CHECKING(version of $CC)
- GCC_VERSION="`${CC} --version 2>/dev/null | sed -e '2,$d' -e 's/^.*(GCC) //' -e 's/^[[^0-9.]]*//' -e 's/[[^0-9.]].*//'`"
+ GCC_VERSION="`${CC} --version 2>/dev/null | sed -e '2,$d' -e 's/^.*(GCC[[^)]]*) //' -e 's/^.*(Debian[[^)]]*) //' -e 's/^[[^0-9.]]*//' -e 's/[[^0-9.]].*//'`"
test -z "$GCC_VERSION" && GCC_VERSION=unknown
AC_MSG_RESULT($GCC_VERSION)
fi
])dnl
dnl ---------------------------------------------------------------------------
-dnl CF_GCC_WARNINGS version: 27 updated: 2010/10/23 15:52:32
+dnl CF_GCC_WARNINGS version: 29 updated: 2012/06/16 14:55:39
dnl ---------------
dnl Check if the compiler supports useful warning options. There's a few that
dnl we don't use, simply because they're too noisy:
@@ -478,6 +472,7 @@ AC_DEFUN([CF_GCC_WARNINGS],
[
AC_REQUIRE([CF_GCC_VERSION])
CF_INTEL_COMPILER(GCC,INTEL_COMPILER,CFLAGS)
+CF_CLANG_COMPILER(GCC,CLANG_COMPILER,CFLAGS)
cat > conftest.$ac_ext <<EOF
#line __oline__ "${as_me:-configure}"
@@ -553,6 +548,13 @@ then
continue;;
esac
;;
+ Wpointer-arith) #(vi
+ case $GCC_VERSION in
+ [[12]].*)
+ CF_VERBOSE(feature is broken in gcc $GCC_VERSION)
+ continue;;
+ esac
+ ;;
esac
EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt"
fi
@@ -594,7 +596,7 @@ make an error
test "$cf_cv_gnu_source" = yes && CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE"
])dnl
dnl ---------------------------------------------------------------------------
-dnl CF_INTEL_COMPILER version: 4 updated: 2010/05/26 05:38:42
+dnl CF_INTEL_COMPILER version: 5 updated: 2013/02/10 10:41:05
dnl -----------------
dnl Check if the given compiler is really the Intel compiler for Linux. It
dnl tries to imitate gcc, but does not return an error when it finds a mismatch
@@ -608,6 +610,7 @@ dnl $1 = GCC (default) or GXX
dnl $2 = INTEL_COMPILER (default) or INTEL_CPLUSPLUS
dnl $3 = CFLAGS (default) or CXXFLAGS
AC_DEFUN([CF_INTEL_COMPILER],[
+AC_REQUIRE([AC_CANONICAL_HOST])
ifelse([$2],,INTEL_COMPILER,[$2])=no
if test "$ifelse([$1],,[$1],GCC)" = yes ; then
@@ -668,7 +671,7 @@ AC_SUBST(MAKE_UPPER_TAGS)
AC_SUBST(MAKE_LOWER_TAGS)
])dnl
dnl ---------------------------------------------------------------------------
-dnl CF_MIXEDCASE_FILENAMES version: 3 updated: 2003/09/20 17:07:55
+dnl CF_MIXEDCASE_FILENAMES version: 4 updated: 2012/10/02 20:55:03
dnl ----------------------
dnl Check if the file-system supports mixed-case filenames. If we're able to
dnl create a lowercase name and see it as uppercase, it doesn't support that.
@@ -695,10 +698,10 @@ else
rm -f conftest CONFTEST
fi
])
-test "$cf_cv_mixedcase" = yes && AC_DEFINE(MIXEDCASE_FILENAMES)
+test "$cf_cv_mixedcase" = yes && AC_DEFINE(MIXEDCASE_FILENAMES,1,[Define to 1 if filesystem supports mixed-case filenames.])
])dnl
dnl ---------------------------------------------------------------------------
-dnl CF_MKSTEMP version: 7 updated: 2010/08/14 18:25:37
+dnl CF_MKSTEMP version: 9 updated: 2012/10/03 04:34:49
dnl ----------
dnl Check for a working mkstemp. This creates two files, checks that they are
dnl successfully created and distinct (AmigaOS apparently fails on the last).
@@ -740,11 +743,13 @@ int main()
}
],[cf_cv_func_mkstemp=yes
],[cf_cv_func_mkstemp=no
-],[AC_CHECK_FUNC(mkstemp)
-])
+],[cf_cv_func_mkstemp=maybe])
])
+if test "x$cf_cv_func_mkstemp" = xmaybe ; then
+ AC_CHECK_FUNC(mkstemp)
+fi
if test "x$cf_cv_func_mkstemp" = xyes || test "x$ac_cv_func_mkstemp" = xyes ; then
- AC_DEFINE(HAVE_MKSTEMP)
+ AC_DEFINE(HAVE_MKSTEMP,1,[Define to 1 if mkstemp() is available and working.])
fi
])dnl
dnl ---------------------------------------------------------------------------
@@ -756,14 +761,14 @@ AC_DEFUN([CF_MSG_LOG],[
echo "${as_me:-configure}:__oline__: testing $* ..." 1>&AC_FD_CC
])dnl
dnl ---------------------------------------------------------------------------
-dnl CF_NO_LEAKS_OPTION version: 4 updated: 2006/12/16 14:24:05
+dnl CF_NO_LEAKS_OPTION version: 5 updated: 2012/10/02 20:55:03
dnl ------------------
dnl see CF_WITH_NO_LEAKS
AC_DEFUN([CF_NO_LEAKS_OPTION],[
AC_MSG_CHECKING(if you want to use $1 for testing)
AC_ARG_WITH($1,
[$2],
- [AC_DEFINE($3)ifelse([$4],,[
+ [AC_DEFINE_UNQUOTED($3,1,"Define to 1 if you want to use $1 for testing.")ifelse([$4],,[
$4
])
: ${with_cflags:=-g}
@@ -858,29 +863,17 @@ fi
])dnl
dnl ---------------------------------------------------------------------------
-dnl CF_PROG_EXT version: 10 updated: 2004/01/03 19:28:18
-dnl -----------
-dnl Compute $PROG_EXT, used for non-Unix ports, such as OS/2 EMX.
-AC_DEFUN([CF_PROG_EXT],
-[
-AC_REQUIRE([CF_CHECK_CACHE])
-case $cf_cv_system_name in
-os2*)
- CFLAGS="$CFLAGS -Zmt"
- CPPFLAGS="$CPPFLAGS -D__ST_MT_ERRNO__"
- CXXFLAGS="$CXXFLAGS -Zmt"
- # autoconf's macro sets -Zexe and suffix both, which conflict:w
- LDFLAGS="$LDFLAGS -Zmt -Zcrtdll"
- ac_cv_exeext=.exe
- ;;
-esac
-
-AC_EXEEXT
-AC_OBJEXT
-
-PROG_EXT="$EXEEXT"
-AC_SUBST(PROG_EXT)
-test -n "$PROG_EXT" && AC_DEFINE_UNQUOTED(PROG_EXT,"$PROG_EXT")
+dnl CF_PROG_CC version: 3 updated: 2012/10/06 15:31:55
+dnl ----------
+dnl standard check for CC, plus followup sanity checks
+dnl $1 = optional parameter to pass to AC_PROG_CC to specify compiler name
+AC_DEFUN([CF_PROG_CC],[
+ifelse($1,,[AC_PROG_CC],[AC_PROG_CC($1)])
+CF_GCC_VERSION
+CF_ACVERSION_CHECK(2.52,
+ [AC_PROG_CC_STDC],
+ [CF_ANSI_CC_REQD])
+CF_CC_ENV_FLAGS
])dnl
dnl ---------------------------------------------------------------------------
dnl CF_PROG_LINT version: 2 updated: 2009/08/12 04:43:14
@@ -1025,7 +1018,7 @@ fi
fi
])dnl
dnl ---------------------------------------------------------------------------
-dnl CF_XOPEN_SOURCE version: 42 updated: 2012/01/07 08:26:49
+dnl CF_XOPEN_SOURCE version: 43 updated: 2013/02/10 10:41:05
dnl ---------------
dnl Try to get _XOPEN_SOURCE defined properly that we can use POSIX functions,
dnl or adapt to the vendor's definitions to get equivalent functionality,
@@ -1035,6 +1028,7 @@ dnl Parameters:
dnl $1 is the nominal value for _XOPEN_SOURCE
dnl $2 is the nominal value for _POSIX_C_SOURCE
AC_DEFUN([CF_XOPEN_SOURCE],[
+AC_REQUIRE([AC_CANONICAL_HOST])
cf_XOPEN_SOURCE=ifelse([$1],,500,[$1])
cf_POSIX_C_SOURCE=ifelse([$2],,199506L,[$2])
Modified: user/attilio/vmobj-readlock/contrib/byacc/config.guess
==============================================================================
--- user/attilio/vmobj-readlock/contrib/byacc/config.guess Fri May 31 17:30:12 2013 (r251188)
+++ user/attilio/vmobj-readlock/contrib/byacc/config.guess Fri May 31 18:27:21 2013 (r251189)
@@ -1,14 +1,12 @@
#! /bin/sh
# Attempt to guess a canonical system name.
-# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
-# 2911 Free Software Foundation, Inc.
+# Copyright 1992-2013 Free Software Foundation, Inc.
-timestamp='2011-01-01'
+timestamp='2013-02-04'
# This file is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful, but
@@ -17,26 +15,22 @@ timestamp='2011-01-01'
# General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
-# 02110-1301, USA.
+# along with this program; if not, see <http://www.gnu.org/licenses/>.
#
# As a special exception to the GNU General Public License, if you
# distribute this file as part of a program that contains a
# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-
-# Originally written by Per Bothner. Please send patches (context
-# diff format) to <config-patches at gnu.org> and include a ChangeLog
-# entry.
+# the same distribution terms that you use for the rest of that
+# program. This Exception is an additional permission under section 7
+# of the GNU General Public License, version 3 ("GPLv3").
#
-# This script attempts to guess a canonical system name similar to
-# config.sub. If it succeeds, it prints the system name on stdout, and
-# exits with 0. Otherwise, it exits with 1.
+# Originally written by Per Bothner.
#
# You can get the latest version of this script from:
# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
+#
+# Please send patches with a ChangeLog entry to config-patches at gnu.org.
+
me=`echo "$0" | sed -e 's,.*/,,'`
@@ -56,9 +50,7 @@ version="\
GNU config.guess ($timestamp)
Originally written by Per Bothner.
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
-2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
-Free Software Foundation, Inc.
+Copyright 1992-2013 Free Software Foundation, Inc.
This is free software; see the source for copying conditions. There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -145,7 +137,7 @@ UNAME_VERSION=`(uname -v) 2>/dev/null` |
case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
*:NetBSD:*:*)
# NetBSD (nbsd) targets should (where applicable) match one or
- # more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*,
+ # more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*,
# *-*-netbsdecoff* and *-*-netbsd*. For targets that recently
# switched to ELF, *-*-netbsd* would select the old
# object file format. This provides both forward
@@ -202,6 +194,10 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$
# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
echo "${machine}-${os}${release}"
exit ;;
+ *:Bitrig:*:*)
+ UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'`
+ echo ${UNAME_MACHINE_ARCH}-unknown-bitrig${UNAME_RELEASE}
+ exit ;;
*:OpenBSD:*:*)
UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE}
@@ -220,10 +216,10 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$
exit ;;
alpha:OSF1:*:*)
case $UNAME_RELEASE in
- *4.0)
+ *4.0)
UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
;;
- *5.*)
+ *5.*)
UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
;;
esac
@@ -304,7 +300,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$
arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
echo arm-acorn-riscix${UNAME_RELEASE}
exit ;;
- arm:riscos:*:*|arm:RISCOS:*:*)
+ arm*:riscos:*:*|arm*:RISCOS:*:*)
echo arm-unknown-riscos
exit ;;
SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
@@ -600,50 +596,50 @@ EOF
sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
case "${sc_cpu_version}" in
- 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
- 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
- 532) # CPU_PA_RISC2_0
- case "${sc_kernel_bits}" in
- 32) HP_ARCH="hppa2.0n" ;;
- 64) HP_ARCH="hppa2.0w" ;;
+ 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
+ 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
+ 532) # CPU_PA_RISC2_0
+ case "${sc_kernel_bits}" in
+ 32) HP_ARCH="hppa2.0n" ;;
+ 64) HP_ARCH="hppa2.0w" ;;
'') HP_ARCH="hppa2.0" ;; # HP-UX 10.20
- esac ;;
- esac
+ esac ;;
+ esac
fi
if [ "${HP_ARCH}" = "" ]; then
eval $set_cc_for_build
- sed 's/^ //' << EOF >$dummy.c
+ sed 's/^ //' << EOF >$dummy.c
+
+ #define _HPUX_SOURCE
+ #include <stdlib.h>
+ #include <unistd.h>
+
+ int main ()
+ {
+ #if defined(_SC_KERNEL_BITS)
+ long bits = sysconf(_SC_KERNEL_BITS);
+ #endif
+ long cpu = sysconf (_SC_CPU_VERSION);
- #define _HPUX_SOURCE
- #include <stdlib.h>
- #include <unistd.h>
-
- int main ()
- {
- #if defined(_SC_KERNEL_BITS)
- long bits = sysconf(_SC_KERNEL_BITS);
- #endif
- long cpu = sysconf (_SC_CPU_VERSION);
-
- switch (cpu)
- {
- case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
- case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
- case CPU_PA_RISC2_0:
- #if defined(_SC_KERNEL_BITS)
- switch (bits)
- {
- case 64: puts ("hppa2.0w"); break;
- case 32: puts ("hppa2.0n"); break;
- default: puts ("hppa2.0"); break;
- } break;
- #else /* !defined(_SC_KERNEL_BITS) */
- puts ("hppa2.0"); break;
- #endif
- default: puts ("hppa1.0"); break;
- }
- exit (0);
- }
+ switch (cpu)
+ {
+ case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
+ case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
+ case CPU_PA_RISC2_0:
+ #if defined(_SC_KERNEL_BITS)
+ switch (bits)
+ {
+ case 64: puts ("hppa2.0w"); break;
+ case 32: puts ("hppa2.0n"); break;
+ default: puts ("hppa2.0"); break;
+ } break;
+ #else /* !defined(_SC_KERNEL_BITS) */
+ puts ("hppa2.0"); break;
+ #endif
*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
More information about the svn-src-user
mailing list