Merge ^/head r284188 through r284643.
This commit is contained in:
Dimitry Andric
commit
76aeda8ad4
47
Makefile
47
Makefile
@ -99,6 +99,14 @@
|
||||
#
|
||||
# For more information, see the build(7) manual page.
|
||||
#
|
||||
|
||||
# Note: we use this awkward construct to be compatible with FreeBSD's
|
||||
# old make used in 10.0 and 9.2 and earlier.
|
||||
.if defined(MK_META_MODE) && ${MK_META_MODE} == "yes"
|
||||
# targets/Makefile plays the role of top-level
|
||||
.include "targets/Makefile"
|
||||
.else
|
||||
|
||||
TGTS= all all-man buildenv buildenvvars buildkernel buildworld \
|
||||
check-old check-old-dirs check-old-files check-old-libs \
|
||||
checkdpadd clean cleandepend cleandir \
|
||||
@ -430,9 +438,12 @@ universe_epilogue: universe_${target}
|
||||
universe_${target}: universe_${target}_prologue
|
||||
universe_${target}_prologue: universe_prologue
|
||||
@echo ">> ${target} started on `LC_ALL=C date`"
|
||||
universe_${target}_worlds:
|
||||
|
||||
.if !defined(MAKE_JUST_KERNELS)
|
||||
universe_${target}_done: universe_${target}_worlds
|
||||
.for target_arch in ${TARGET_ARCHES_${target}}
|
||||
universe_${target}: universe_${target}_${target_arch}
|
||||
universe_${target}_worlds: universe_${target}_${target_arch}
|
||||
universe_${target}_${target_arch}: universe_${target}_prologue .MAKE
|
||||
@echo ">> ${target}.${target_arch} ${UNIVERSE_TARGET} started on `LC_ALL=C date`"
|
||||
@(cd ${.CURDIR} && env __MAKE_CONF=/dev/null \
|
||||
@ -445,15 +456,11 @@ universe_${target}_${target_arch}: universe_${target}_prologue .MAKE
|
||||
${MAKEFAIL}))
|
||||
@echo ">> ${target}.${target_arch} ${UNIVERSE_TARGET} completed on `LC_ALL=C date`"
|
||||
.endfor
|
||||
.endif
|
||||
.endif # !MAKE_JUST_KERNELS
|
||||
|
||||
.if !defined(MAKE_JUST_WORLDS)
|
||||
# If we are building world and kernels wait for the required worlds to finish
|
||||
.if !defined(MAKE_JUST_KERNELS)
|
||||
.for target_arch in ${TARGET_ARCHES_${target}}
|
||||
universe_${target}_kernels: universe_${target}_${target_arch}
|
||||
.endfor
|
||||
.endif
|
||||
universe_${target}: universe_${target}_kernels
|
||||
universe_${target}_done: universe_${target}_kernels
|
||||
universe_${target}_kernels: universe_${target}_worlds
|
||||
universe_${target}_kernels: universe_${target}_prologue .MAKE
|
||||
.if exists(${KERNSRCDIR}/${target}/conf/NOTES)
|
||||
@(cd ${KERNSRCDIR}/${target}/conf && env __MAKE_CONF=/dev/null \
|
||||
@ -463,7 +470,11 @@ universe_${target}_kernels: universe_${target}_prologue .MAKE
|
||||
.endif
|
||||
@cd ${.CURDIR} && ${SUB_MAKE} ${.MAKEFLAGS} TARGET=${target} \
|
||||
universe_kernels
|
||||
.endif
|
||||
.endif # !MAKE_JUST_WORLDS
|
||||
|
||||
# Tell the user the worlds and kernels have completed
|
||||
universe_${target}: universe_${target}_done
|
||||
universe_${target}_done:
|
||||
@echo ">> ${target} completed on `LC_ALL=C date`"
|
||||
.endfor
|
||||
universe_kernels: universe_kernconfs
|
||||
@ -517,9 +528,23 @@ buildLINT:
|
||||
${MAKE} -C ${.CURDIR}/sys/${_TARGET}/conf LINT
|
||||
|
||||
.if defined(.PARSEDIR)
|
||||
# This makefile does not run in meta mode
|
||||
.MAKE.MODE= normal
|
||||
# Normally the things we run from here don't either.
|
||||
# Using -DWITH_META_FILES
|
||||
# we can buildworld with meta files created which are useful
|
||||
# for debugging, but without any of the rest of a meta mode build.
|
||||
MK_META_MODE= no
|
||||
MK_STAGING= no
|
||||
# tell meta.autodep.mk to not even think about updating anything.
|
||||
UPDATE_DEPENDFILE= NO
|
||||
.export MK_META_MODE MK_STAGING UPDATE_DEPENDFILE
|
||||
|
||||
.if make(universe)
|
||||
# we do not want a failure of one branch abort all.
|
||||
MAKE_JOB_ERROR_TOKEN= no
|
||||
.export MAKE_JOB_ERROR_TOKEN
|
||||
.endif
|
||||
.endif
|
||||
.endif # bmake
|
||||
|
||||
.endif # META_MODE
|
||||
|
||||
@ -100,9 +100,9 @@ OLD_DIRS+=usr/lib/clang/3.6.1/lib/freebsd
|
||||
OLD_DIRS+=usr/lib/clang/3.6.1/lib
|
||||
OLD_DIRS+=usr/lib/clang/3.6.1
|
||||
# 20150528: PCI IOV device driver methods moved to a separate kobj interface.
|
||||
OLD_FILES+=usr/share/man/man9/PCI_ADD_VF.9
|
||||
OLD_FILES+=usr/share/man/man9/PCI_INIT_IOV.9
|
||||
OLD_FILES+=usr/share/man/man9/PCI_UNINIT_IOV.9
|
||||
OLD_FILES+=usr/share/man/man9/PCI_ADD_VF.9.gz
|
||||
OLD_FILES+=usr/share/man/man9/PCI_INIT_IOV.9.gz
|
||||
OLD_FILES+=usr/share/man/man9/PCI_UNINIT_IOV.9.gz
|
||||
# 20150525: new clang import which bumps version from 3.6.0 to 3.6.1.
|
||||
OLD_FILES+=usr/lib/clang/3.6.0/include/__stddef_max_align_t.h
|
||||
OLD_FILES+=usr/lib/clang/3.6.0/include/__wmmintrin_aes.h
|
||||
@ -178,9 +178,13 @@ OLD_FILES+=usr/lib32/libheimsqlite.a
|
||||
OLD_FILES+=usr/lib32/libheimsqlite.so
|
||||
OLD_LIBS+=usr/lib32/libheimsqlite.so.11
|
||||
OLD_FILES+=usr/lib32/libheimsqlite_p.a
|
||||
# 20150518: tzdata2015c update
|
||||
OLD_FILES+=usr/share/zoneinfo/America/Montreal
|
||||
# 20150506
|
||||
OLD_FILES+=usr/share/man/man9/NDHASGIANT.9.gz
|
||||
# 20150504
|
||||
OLD_FILES+=usr/share/examples/etc/libmap32.conf
|
||||
OLD_FILES+=usr/include/bsdstat.h
|
||||
OLD_LIBS+=usr/lib32/private/libatf-c++.so.2
|
||||
OLD_LIBS+=usr/lib32/private/libbsdstat.so.1
|
||||
OLD_LIBS+=usr/lib32/private/libheimipcs.so.11
|
||||
@ -221,6 +225,7 @@ OLD_FILES+=usr/share/man/man3/nvlist_addv_null.3.gz
|
||||
OLD_FILES+=usr/share/man/man3/nvlist_addv_number.3.gz
|
||||
OLD_FILES+=usr/share/man/man3/nvlist_addv_nvlist.3.gz
|
||||
OLD_FILES+=usr/share/man/man3/nvlist_addv_string.3.gz
|
||||
OLD_FILES+=usr/share/man/man3/nvlist_existsf.3.gz
|
||||
OLD_FILES+=usr/share/man/man3/nvlist_existsf_binary.3.gz
|
||||
OLD_FILES+=usr/share/man/man3/nvlist_existsf_bool.3.gz
|
||||
OLD_FILES+=usr/share/man/man3/nvlist_existsf_descriptor.3.gz
|
||||
@ -229,6 +234,7 @@ OLD_FILES+=usr/share/man/man3/nvlist_existsf_number.3.gz
|
||||
OLD_FILES+=usr/share/man/man3/nvlist_existsf_nvlist.3.gz
|
||||
OLD_FILES+=usr/share/man/man3/nvlist_existsf_string.3.gz
|
||||
OLD_FILES+=usr/share/man/man3/nvlist_existsf_type.3.gz
|
||||
OLD_FILES+=usr/share/man/man3/nvlist_existsv.3.gz
|
||||
OLD_FILES+=usr/share/man/man3/nvlist_existsv_binary.3.gz
|
||||
OLD_FILES+=usr/share/man/man3/nvlist_existsv_bool.3.gz
|
||||
OLD_FILES+=usr/share/man/man3/nvlist_existsv_descriptor.3.gz
|
||||
@ -237,6 +243,7 @@ OLD_FILES+=usr/share/man/man3/nvlist_existsv_number.3.gz
|
||||
OLD_FILES+=usr/share/man/man3/nvlist_existsv_nvlist.3.gz
|
||||
OLD_FILES+=usr/share/man/man3/nvlist_existsv_string.3.gz
|
||||
OLD_FILES+=usr/share/man/man3/nvlist_existsv_type.3.gz
|
||||
OLD_FILES+=usr/share/man/man3/nvlist_freef.3.gz
|
||||
OLD_FILES+=usr/share/man/man3/nvlist_freef_binary.3.gz
|
||||
OLD_FILES+=usr/share/man/man3/nvlist_freef_bool.3.gz
|
||||
OLD_FILES+=usr/share/man/man3/nvlist_freef_descriptor.3.gz
|
||||
@ -245,6 +252,7 @@ OLD_FILES+=usr/share/man/man3/nvlist_freef_number.3.gz
|
||||
OLD_FILES+=usr/share/man/man3/nvlist_freef_nvlist.3.gz
|
||||
OLD_FILES+=usr/share/man/man3/nvlist_freef_string.3.gz
|
||||
OLD_FILES+=usr/share/man/man3/nvlist_freef_type.3.gz
|
||||
OLD_FILES+=usr/share/man/man3/nvlist_freev.3.gz
|
||||
OLD_FILES+=usr/share/man/man3/nvlist_freev_binary.3.gz
|
||||
OLD_FILES+=usr/share/man/man3/nvlist_freev_bool.3.gz
|
||||
OLD_FILES+=usr/share/man/man3/nvlist_freev_descriptor.3.gz
|
||||
@ -265,10 +273,33 @@ OLD_FILES+=usr/share/man/man3/nvlist_getv_descriptor.3.gz
|
||||
OLD_FILES+=usr/share/man/man3/nvlist_getv_number.3.gz
|
||||
OLD_FILES+=usr/share/man/man3/nvlist_getv_nvlist.3.gz
|
||||
OLD_FILES+=usr/share/man/man3/nvlist_getv_string.3.gz
|
||||
OLD_FILES+=usr/share/man/man3/nvlist_movef_binary.3.gz
|
||||
OLD_FILES+=usr/share/man/man3/nvlist_movef_descriptor.3.gz
|
||||
OLD_FILES+=usr/share/man/man3/nvlist_movef_nvlist.3.gz
|
||||
OLD_FILES+=usr/share/man/man3/nvlist_movef_string.3.gz
|
||||
OLD_FILES+=usr/share/man/man3/nvlist_movev_binary.3.gz
|
||||
OLD_FILES+=usr/share/man/man3/nvlist_movev_descriptor.3.gz
|
||||
OLD_FILES+=usr/share/man/man3/nvlist_movev_nvlist.3.gz
|
||||
OLD_FILES+=usr/share/man/man3/nvlist_movev_string.3.gz
|
||||
OLD_FILES+=usr/share/man/man3/nvlist_takef_binary.3.gz
|
||||
OLD_FILES+=usr/share/man/man3/nvlist_takef_bool.3.gz
|
||||
OLD_FILES+=usr/share/man/man3/nvlist_takef_descriptor.3.gz
|
||||
OLD_FILES+=usr/share/man/man3/nvlist_takef_number.3.gz
|
||||
OLD_FILES+=usr/share/man/man3/nvlist_takef_nvlist.3.gz
|
||||
OLD_FILES+=usr/share/man/man3/nvlist_takef_string.3.gz
|
||||
OLD_FILES+=usr/share/man/man3/nvlist_takev_binary.3.gz
|
||||
OLD_FILES+=usr/share/man/man3/nvlist_takev_bool.3.gz
|
||||
OLD_FILES+=usr/share/man/man3/nvlist_takev_descriptor.3.gz
|
||||
OLD_FILES+=usr/share/man/man3/nvlist_takev_number.3.gz
|
||||
OLD_FILES+=usr/share/man/man3/nvlist_takev_nvlist.3.gz
|
||||
OLD_FILES+=usr/share/man/man3/nvlist_takev_string.3.gz
|
||||
# 20150429:
|
||||
OLD_FILES+=usr/share/docs/papers/hwpmc.ascii.gz
|
||||
# 20150427: test/sys/kern/mmap_test moved to test/sys/vm/mmap_test
|
||||
OLD_FILES+=usr/tests/sys/kern/mmap_test
|
||||
# 20150422: zlib.c moved from net to libkern
|
||||
OLD_FILES+=usr/include/net/zlib.h
|
||||
OLD_FILES+=usr/include/net/zutil.h
|
||||
# 20150418
|
||||
OLD_FILES+=sbin/mount_oldnfs
|
||||
OLD_FILES+=usr/share/man/man8/mount_oldnfs.8.gz
|
||||
@ -358,7 +389,7 @@ OLD_FILES+=usr/bin/ppt
|
||||
OLD_FILES+=usr/share/man/man6/bcd.6.gz
|
||||
OLD_FILES+=usr/share/man/man6/ppt.6.gz
|
||||
# 20150217: Removed remnants of ar(4) driver
|
||||
OLD_FILES+=usr/include/sys/dev/ic/hd64570.h
|
||||
OLD_FILES+=usr/include/dev/ic/hd64570.h
|
||||
# 20150212: /usr/games moving into /usr/bin
|
||||
OLD_FILES+=usr/games/bcd
|
||||
OLD_FILES+=usr/games/caesar
|
||||
@ -378,19 +409,21 @@ OLD_DIRS+=usr/games
|
||||
# 20150209: liblzma header
|
||||
OLD_FILES+=usr/include/lzma/lzma.h
|
||||
# 20150124: spl.9 and friends
|
||||
OLD_FILES+=usr/share/man/man9/spl.9
|
||||
OLD_FILES+=usr/share/man/man9/spl0.9
|
||||
OLD_FILES+=usr/share/man/man9/splbio.9
|
||||
OLD_FILES+=usr/share/man/man9/splclock.9
|
||||
OLD_FILES+=usr/share/man/man9/splhigh.9
|
||||
OLD_FILES+=usr/share/man/man9/splimp.9
|
||||
OLD_FILES+=usr/share/man/man9/splnet.9
|
||||
OLD_FILES+=usr/share/man/man9/splsoftclock.9
|
||||
OLD_FILES+=usr/share/man/man9/splsofttty.9
|
||||
OLD_FILES+=usr/share/man/man9/splstatclock.9
|
||||
OLD_FILES+=usr/share/man/man9/spltty.9
|
||||
OLD_FILES+=usr/share/man/man9/splvm.9
|
||||
OLD_FILES+=usr/share/man/man9/splx.9
|
||||
OLD_FILES+=usr/share/man/man9/spl.9.gz
|
||||
OLD_FILES+=usr/share/man/man9/spl0.9.gz
|
||||
OLD_FILES+=usr/share/man/man9/splbio.9.gz
|
||||
OLD_FILES+=usr/share/man/man9/splclock.9.gz
|
||||
OLD_FILES+=usr/share/man/man9/splhigh.9.gz
|
||||
OLD_FILES+=usr/share/man/man9/splimp.9.gz
|
||||
OLD_FILES+=usr/share/man/man9/splnet.9.gz
|
||||
OLD_FILES+=usr/share/man/man9/splsoftclock.9.gz
|
||||
OLD_FILES+=usr/share/man/man9/splsofttty.9.gz
|
||||
OLD_FILES+=usr/share/man/man9/splstatclock.9.gz
|
||||
OLD_FILES+=usr/share/man/man9/spltty.9.gz
|
||||
OLD_FILES+=usr/share/man/man9/splvm.9.gz
|
||||
OLD_FILES+=usr/share/man/man9/splx.9.gz
|
||||
# 20150118: toeplitz.c moved from netinet to net
|
||||
OLD_FILES+=usr/include/netinet/toeplitz.h
|
||||
# 20150118: new clang import which bumps version from 3.5.0 to 3.5.1.
|
||||
OLD_FILES+=usr/include/clang/3.5.0/__wmmintrin_aes.h
|
||||
OLD_FILES+=usr/include/clang/3.5.0/__wmmintrin_pclmul.h
|
||||
@ -445,6 +478,8 @@ OLD_FILES+=usr/lib/clang/3.5.0/lib/freebsd/libclang_rt.ubsan_cxx-x86_64.a
|
||||
OLD_DIRS+=usr/lib/clang/3.5.0/lib/freebsd
|
||||
OLD_DIRS+=usr/lib/clang/3.5.0/lib
|
||||
OLD_DIRS+=usr/lib/clang/3.5.0
|
||||
# 20150102: removal of asr(4)
|
||||
OLD_FILES+=usr/share/man/man4/asr.4.gz
|
||||
# 20150102: removal of texinfo
|
||||
OLD_FILES+=usr/bin/info
|
||||
OLD_FILES+=usr/bin/infokey
|
||||
@ -513,7 +548,7 @@ OLD_FILES+=usr/include/clang/3.4.1/x86intrin.h
|
||||
OLD_FILES+=usr/include/clang/3.4.1/xmmintrin.h
|
||||
OLD_FILES+=usr/include/clang/3.4.1/xopintrin.h
|
||||
OLD_DIRS+=usr/include/clang/3.4.1
|
||||
# 20141226: Remove gpib/ieee488
|
||||
# 20141225: Remove gpib/ieee488
|
||||
OLD_FILES+=usr/include/dev/ieee488/ibfoo_int.h
|
||||
OLD_FILES+=usr/include/dev/ieee488/tnt4882.h
|
||||
OLD_FILES+=usr/include/dev/ieee488/ugpib.h
|
||||
@ -526,16 +561,28 @@ OLD_FILES+=usr/lib/libgpib_p.a
|
||||
OLD_FILES+=usr/lib/libgpib.so
|
||||
OLD_LIBS+=usr/lib/libgpib.so.3
|
||||
OLD_FILES+=usr/lib/libgpib_p.a
|
||||
OLD_FILES+=share/man/man4/pcii.4.gz
|
||||
OLD_FILES+=share/man/man4/gpib.4.gz
|
||||
OLD_FILES+=share/man/man4/tnt4882.4.gz
|
||||
.if ${TARGET_ARCH} == "amd64" || ${TARGET_ARCH} == "powerpc64"
|
||||
OLD_FILES+=usr/lib32/libgpib.a
|
||||
OLD_FILES+=usr/lib32/libgpib_p.a
|
||||
OLD_FILES+=usr/lib32/libgpib.so
|
||||
OLD_LIBS+=usr/lib32/libgpib.so.3
|
||||
.endif
|
||||
|
||||
OLD_FILES+=usr/share/man/man3/gpib.3.gz
|
||||
OLD_FILES+=usr/share/man/man3/ibclr.3.gz
|
||||
OLD_FILES+=usr/share/man/man3/ibdev.3.gz
|
||||
OLD_FILES+=usr/share/man/man3/ibdma.3.gz
|
||||
OLD_FILES+=usr/share/man/man3/ibeos.3.gz
|
||||
OLD_FILES+=usr/share/man/man3/ibeot.3.gz
|
||||
OLD_FILES+=usr/share/man/man3/ibloc.3.gz
|
||||
OLD_FILES+=usr/share/man/man3/ibonl.3.gz
|
||||
OLD_FILES+=usr/share/man/man3/ibpad.3.gz
|
||||
OLD_FILES+=usr/share/man/man3/ibrd.3.gz
|
||||
OLD_FILES+=usr/share/man/man3/ibsad.3.gz
|
||||
OLD_FILES+=usr/share/man/man3/ibsic.3.gz
|
||||
OLD_FILES+=usr/share/man/man3/ibtmo.3.gz
|
||||
OLD_FILES+=usr/share/man/man3/ibtrg.3.gz
|
||||
OLD_FILES+=usr/share/man/man3/ibwrt.3.gz
|
||||
OLD_FILES+=usr/share/man/man4/gpib.4.gz
|
||||
OLD_FILES+=usr/share/man/man4/pcii.4.gz
|
||||
OLD_FILES+=usr/share/man/man4/tnt4882.4.gz
|
||||
# 20141224: libxo moved to /lib
|
||||
OLD_LIBS+=usr/lib/libxo.so.0
|
||||
# 20141223: remove in6_gif.h, in_gif.h and if_stf.h
|
||||
@ -553,6 +600,11 @@ OLD_FILES+=usr/tests/sbin/mdconfig/mdconfig.test
|
||||
OLD_FILES+=usr/tests/sbin/mdconfig/run.pl
|
||||
# 20141126: remove xform_ipip decapsulation fallback
|
||||
OLD_FILES+=usr/include/netipsec/ipip_var.h
|
||||
# 20141122: mandoc updated to 1.13.1
|
||||
OLD_FILES+=usr/share/mdocml/external.png
|
||||
# 20141111: SF_KQUEUE code removed
|
||||
OLD_FILES+=usr/include/sys/sf_base.h
|
||||
OLD_FILES+=usr/include/sys/sf_sync.h
|
||||
# 20141109: faith/faithd removal
|
||||
OLD_FILES+=etc/rc.d/faith
|
||||
OLD_FILES+=usr/share/man/man4/faith.4.gz
|
||||
@ -565,6 +617,8 @@ OLD_FILES+=usr/include/netinet/ip_gre.h
|
||||
OLD_FILES+=etc/rc.d/postrandom
|
||||
# 20141031: initrandom obsoleted by new /dev/random code
|
||||
OLD_FILES+=etc/rc.d/initrandom
|
||||
# 20141030: atf 0.21 import
|
||||
OLD_FILES+=usr/share/man/man3/atf-c++-api.3.gz
|
||||
# 20141028: debug files accidentally installed as directory name
|
||||
OLD_FILES+=usr/lib/debug/usr/lib/i18n
|
||||
OLD_FILES+=usr/lib/debug/usr/lib/private
|
||||
@ -572,6 +626,9 @@ OLD_FILES+=usr/lib/debug/usr/lib32/i18n
|
||||
OLD_FILES+=usr/lib/debug/usr/lib32/private
|
||||
# 20141015: OpenSSL 1.0.1j import
|
||||
OLD_FILES+=usr/share/openssl/man/man3/CMS_sign_add1_signer.3.gz
|
||||
# 20141003: libproc version bump
|
||||
OLD_LIBS+=usr/lib/libproc.so.2
|
||||
OLD_LIBS+=usr/lib32/libproc.so.2
|
||||
# 20140922: sleepq_calc_signal_retval.9 and sleepq_catch_signals.9 removed
|
||||
OLD_FILES+=usr/share/man/man9/sleepq_calc_signal_retval.9.gz
|
||||
OLD_FILES+=usr/share/man/man9/sleepq_catch_signals.9.gz
|
||||
@ -581,6 +638,10 @@ OLD_FILES+=etc/rc.d/hv_kvpd
|
||||
OLD_LIBS+=usr/lib/libnv.so.0
|
||||
# 20140829: rc.d/kerberos removed
|
||||
OLD_FILES+=etc/rc.d/kerberos
|
||||
# 20140827: tzdata2014f import
|
||||
OLD_FILES+=usr/share/zoneinfo/Asia/Chongqing
|
||||
OLD_FILES+=usr/share/zoneinfo/Asia/Harbin
|
||||
OLD_FILES+=usr/share/zoneinfo/Asia/Kashgar
|
||||
# 20140814: libopie version bump
|
||||
OLD_LIBS+=usr/lib/libopie.so.7
|
||||
OLD_LIBS+=usr/lib32/libopie.so.7
|
||||
@ -646,12 +707,15 @@ OLD_FILES+=usr/lib/private/libucl_p.a
|
||||
OLD_FILES+=usr/share/man/man9/pmap_change_wiring.9.gz
|
||||
# 20140728: libsbuf restored to old version.
|
||||
OLD_LIBS+=lib/libsbuf.so.7
|
||||
OLD_LIBS+=usr/lib32/libsbuf.so.7
|
||||
# 20140728: Remove an obsolete man page
|
||||
OLD_FILES+=usr/share/man/man9/VOP_GETVOBJECT.9.gz
|
||||
OLD_FILES+=usr/share/man/man9/VOP_CREATEVOBJECT.9.gz
|
||||
OLD_FILES+=usr/share/man/man9/VOP_DESTROYVOBJECT.9.gz
|
||||
# 20140723: renamed to PCBGROUP.9
|
||||
OLD_FILES+=usr/share/man/man9/PCBGROUPS.9.gz
|
||||
# 20140722: browse_packages_ftp.sh removed
|
||||
OLD_FILES+=usr/share/examples/bsdconfig/browse_packages_ftp.sh
|
||||
# 20140718: Remove obsolete man pages
|
||||
OLD_FILES+=usr/share/man/man9/zero_copy.9.gz
|
||||
OLD_FILES+=usr/share/man/man9/zero_copy_sockets.9.gz
|
||||
@ -672,6 +736,14 @@ OLD_FILES+=usr/lib/libhistory.a
|
||||
OLD_FILES+=usr/lib/libhistory_p.a
|
||||
OLD_FILES+=usr/lib/libhistory.so
|
||||
OLD_LIBS+=usr/lib/libhistory.so.8
|
||||
OLD_FILES+=usr/lib32/libhistory.a
|
||||
OLD_FILES+=usr/lib32/libhistory.so
|
||||
OLD_LIBS+=usr/lib32/libhistory.so.8
|
||||
OLD_FILES+=usr/lib32/libhistory_p.a
|
||||
OLD_FILES+=usr/lib32/libreadline.a
|
||||
OLD_FILES+=usr/lib32/libreadline.so
|
||||
OLD_LIBS+=usr/lib32/libreadline.so.8
|
||||
OLD_FILES+=usr/lib32/libreadline_p.a
|
||||
OLD_FILES+=usr/include/readline/chardefs.h
|
||||
OLD_FILES+=usr/include/readline/history.h
|
||||
OLD_FILES+=usr/include/readline/keymaps.h
|
||||
@ -684,6 +756,7 @@ OLD_FILES+=usr/include/readline/rltypedefs.h
|
||||
OLD_DIRS+=usr/include/readline
|
||||
OLD_FILES+=usr/share/info/readline.info.gz
|
||||
OLD_FILES+=usr/share/man/man3/readline.3.gz
|
||||
OLD_FILES+=usr/share/man/man3/rlhistory.3.gz
|
||||
# 20140625: csup removal
|
||||
OLD_FILES+=usr/bin/csup
|
||||
OLD_FILES+=usr/bin/cpasswd
|
||||
@ -2062,7 +2135,6 @@ OLD_LIBS+=usr/lib/libpanel.so.4
|
||||
OLD_LIBS+=usr/lib/libpanelw.so.4
|
||||
OLD_LIBS+=usr/lib/libpmc.so.4
|
||||
OLD_LIBS+=usr/lib/libproc.so.1
|
||||
OLD_LIBS+=usr/lib/libproc.so.2
|
||||
OLD_LIBS+=usr/lib/libradius.so.3
|
||||
OLD_LIBS+=usr/lib/librpcsvc.so.4
|
||||
OLD_LIBS+=usr/lib/libsdp.so.3
|
||||
|
||||
58
UPDATING
58
UPDATING
@ -36,6 +36,64 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 11.x IS SLOW:
|
||||
20141231 entry below for information about prerequisites and upgrading,
|
||||
if you are not already using 3.5.0 or higher.
|
||||
|
||||
20150616:
|
||||
/etc/make.conf now included earlier.
|
||||
sys.mk now includes /etc/make.conf and {local,src}.sys.mk earlier
|
||||
than previously.
|
||||
This makes it simple to interpose external toolchains etc.
|
||||
However it may cause problems for users who have things like::
|
||||
|
||||
INSTALL+= something
|
||||
|
||||
in /etc/make.conf, since INSTALL is not yet defined.
|
||||
A safe fix for that is to have::
|
||||
|
||||
INSTALL?= install
|
||||
INSTALL+= something
|
||||
|
||||
which is equivalent to previous behavior.
|
||||
|
||||
20150616:
|
||||
FreeBSD's old make (fmake) has been removed from the system. It is
|
||||
available as the devel/fmake port or via pkg install fmake.
|
||||
|
||||
20150615:
|
||||
The fix for the issue described in the 20150614 sendmail entry
|
||||
below has been been committed in revision 284436. The work
|
||||
around described in that entry is no longer needed unless the
|
||||
default setting is overridden by a confDH_PARAMETERS configuration
|
||||
setting of '5' or pointing to a 512 bit DH parameter file.
|
||||
|
||||
20150614:
|
||||
ALLOW_DEPRECATED_ATF_TOOLS/ATFFILE support has been removed from
|
||||
atf.test.mk (included from bsd.test.mk). Please upgrade devel/atf
|
||||
and devel/kyua to version 0.20+ and adjust any calling code to work
|
||||
with Kyuafile and kyua.
|
||||
|
||||
20150614:
|
||||
The import of openssl to address the FreeBSD-SA-15:10.openssl
|
||||
security advisory includes a change which rejects handshakes
|
||||
with DH parameters below 768 bits. sendmail releases prior
|
||||
to 8.15.2 (not yet released), defaulted to a 512 bit
|
||||
DH parameter setting for client connections. To work around
|
||||
this interoperability, sendmail can be configured to use a
|
||||
2048 bit DH parameter by:
|
||||
|
||||
1. Edit /etc/mail/`hostname`.mc
|
||||
2. If a setting for confDH_PARAMETERS does not exist or
|
||||
exists and is set to a string beginning with '5',
|
||||
replace it with '2'.
|
||||
3. If a setting for confDH_PARAMETERS exists and is set to
|
||||
a file path, create a new file with:
|
||||
openssl dhparam -out /path/to/file 2048
|
||||
4. Rebuild the .cf file:
|
||||
cd /etc/mail/; make; make install
|
||||
5. Restart sendmail:
|
||||
cd /etc/mail/; make restart
|
||||
|
||||
A sendmail patch is coming, at which time this file will be
|
||||
updated.
|
||||
|
||||
20150604:
|
||||
Generation of legacy formatted entries have been disabled by default
|
||||
in pwd_mkdb(8), as all base system consumers of the legacy formatted
|
||||
|
||||
18
bin/cat/Makefile.depend
Normal file
18
bin/cat/Makefile.depend
Normal file
@ -0,0 +1,18 @@
|
||||
# $FreeBSD$
|
||||
# Autogenerated - do NOT edit!
|
||||
|
||||
DIRDEPS = \
|
||||
gnu/lib/csu \
|
||||
gnu/lib/libgcc \
|
||||
include \
|
||||
include/xlocale \
|
||||
lib/${CSU_DIR} \
|
||||
lib/libc \
|
||||
lib/libcompiler_rt \
|
||||
|
||||
|
||||
.include <dirdeps.mk>
|
||||
|
||||
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
|
||||
# local dependencies - needed for -jN in clean tree
|
||||
.endif
|
||||
18
bin/chflags/Makefile.depend
Normal file
18
bin/chflags/Makefile.depend
Normal file
@ -0,0 +1,18 @@
|
||||
# $FreeBSD$
|
||||
# Autogenerated - do NOT edit!
|
||||
|
||||
DIRDEPS = \
|
||||
gnu/lib/csu \
|
||||
gnu/lib/libgcc \
|
||||
include \
|
||||
include/xlocale \
|
||||
lib/${CSU_DIR} \
|
||||
lib/libc \
|
||||
lib/libcompiler_rt \
|
||||
|
||||
|
||||
.include <dirdeps.mk>
|
||||
|
||||
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
|
||||
# local dependencies - needed for -jN in clean tree
|
||||
.endif
|
||||
18
bin/chio/Makefile.depend
Normal file
18
bin/chio/Makefile.depend
Normal file
@ -0,0 +1,18 @@
|
||||
# $FreeBSD$
|
||||
# Autogenerated - do NOT edit!
|
||||
|
||||
DIRDEPS = \
|
||||
gnu/lib/csu \
|
||||
gnu/lib/libgcc \
|
||||
include \
|
||||
include/xlocale \
|
||||
lib/${CSU_DIR} \
|
||||
lib/libc \
|
||||
lib/libcompiler_rt \
|
||||
|
||||
|
||||
.include <dirdeps.mk>
|
||||
|
||||
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
|
||||
# local dependencies - needed for -jN in clean tree
|
||||
.endif
|
||||
18
bin/chmod/Makefile.depend
Normal file
18
bin/chmod/Makefile.depend
Normal file
@ -0,0 +1,18 @@
|
||||
# $FreeBSD$
|
||||
# Autogenerated - do NOT edit!
|
||||
|
||||
DIRDEPS = \
|
||||
gnu/lib/csu \
|
||||
gnu/lib/libgcc \
|
||||
include \
|
||||
include/xlocale \
|
||||
lib/${CSU_DIR} \
|
||||
lib/libc \
|
||||
lib/libcompiler_rt \
|
||||
|
||||
|
||||
.include <dirdeps.mk>
|
||||
|
||||
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
|
||||
# local dependencies - needed for -jN in clean tree
|
||||
.endif
|
||||
18
bin/cp/Makefile.depend
Normal file
18
bin/cp/Makefile.depend
Normal file
@ -0,0 +1,18 @@
|
||||
# $FreeBSD$
|
||||
# Autogenerated - do NOT edit!
|
||||
|
||||
DIRDEPS = \
|
||||
gnu/lib/csu \
|
||||
gnu/lib/libgcc \
|
||||
include \
|
||||
include/xlocale \
|
||||
lib/${CSU_DIR} \
|
||||
lib/libc \
|
||||
lib/libcompiler_rt \
|
||||
|
||||
|
||||
.include <dirdeps.mk>
|
||||
|
||||
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
|
||||
# local dependencies - needed for -jN in clean tree
|
||||
.endif
|
||||
243
bin/csh/Makefile.depend
Normal file
243
bin/csh/Makefile.depend
Normal file
@ -0,0 +1,243 @@
|
||||
# $FreeBSD$
|
||||
# Autogenerated - do NOT edit!
|
||||
|
||||
DIRDEPS = \
|
||||
gnu/lib/csu \
|
||||
gnu/lib/libgcc \
|
||||
include \
|
||||
include/arpa \
|
||||
include/xlocale \
|
||||
lib/${CSU_DIR} \
|
||||
lib/libc \
|
||||
lib/libcompiler_rt \
|
||||
lib/libcrypt \
|
||||
lib/ncurses/ncursesw \
|
||||
|
||||
|
||||
.include <dirdeps.mk>
|
||||
|
||||
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
|
||||
# local dependencies - needed for -jN in clean tree
|
||||
ed.chared.o: ed.defns.h
|
||||
ed.chared.o: sh.err.h
|
||||
ed.chared.o: tc.const.h
|
||||
ed.chared.po: ed.defns.h
|
||||
ed.chared.po: sh.err.h
|
||||
ed.chared.po: tc.const.h
|
||||
ed.defns.o: sh.err.h
|
||||
ed.defns.o: tc.const.h
|
||||
ed.defns.po: sh.err.h
|
||||
ed.defns.po: tc.const.h
|
||||
ed.init.o: ed.defns.h
|
||||
ed.init.o: sh.err.h
|
||||
ed.init.o: tc.const.h
|
||||
ed.init.po: ed.defns.h
|
||||
ed.init.po: sh.err.h
|
||||
ed.init.po: tc.const.h
|
||||
ed.inputl.o: ed.defns.h
|
||||
ed.inputl.o: sh.err.h
|
||||
ed.inputl.o: tc.const.h
|
||||
ed.inputl.po: ed.defns.h
|
||||
ed.inputl.po: sh.err.h
|
||||
ed.inputl.po: tc.const.h
|
||||
ed.refresh.o: sh.err.h
|
||||
ed.refresh.o: tc.const.h
|
||||
ed.refresh.po: sh.err.h
|
||||
ed.refresh.po: tc.const.h
|
||||
ed.screen.o: ed.defns.h
|
||||
ed.screen.o: sh.err.h
|
||||
ed.screen.o: tc.const.h
|
||||
ed.screen.po: ed.defns.h
|
||||
ed.screen.po: sh.err.h
|
||||
ed.screen.po: tc.const.h
|
||||
ed.term.o: sh.err.h
|
||||
ed.term.o: tc.const.h
|
||||
ed.term.po: sh.err.h
|
||||
ed.term.po: tc.const.h
|
||||
ed.xmap.o: ed.defns.h
|
||||
ed.xmap.o: sh.err.h
|
||||
ed.xmap.o: tc.const.h
|
||||
ed.xmap.po: ed.defns.h
|
||||
ed.xmap.po: sh.err.h
|
||||
ed.xmap.po: tc.const.h
|
||||
glob.o: sh.err.h
|
||||
glob.o: tc.const.h
|
||||
glob.po: sh.err.h
|
||||
glob.po: tc.const.h
|
||||
mi.termios.o: sh.err.h
|
||||
mi.termios.o: tc.const.h
|
||||
mi.termios.po: sh.err.h
|
||||
mi.termios.po: tc.const.h
|
||||
sh.char.o: sh.err.h
|
||||
sh.char.o: tc.const.h
|
||||
sh.char.po: sh.err.h
|
||||
sh.char.po: tc.const.h
|
||||
sh.dir.o: sh.err.h
|
||||
sh.dir.o: tc.const.h
|
||||
sh.dir.po: sh.err.h
|
||||
sh.dir.po: tc.const.h
|
||||
sh.dol.o: sh.err.h
|
||||
sh.dol.o: tc.const.h
|
||||
sh.dol.po: sh.err.h
|
||||
sh.dol.po: tc.const.h
|
||||
sh.err.o: sh.err.h
|
||||
sh.err.o: tc.const.h
|
||||
sh.err.po: sh.err.h
|
||||
sh.err.po: tc.const.h
|
||||
sh.exec.o: sh.err.h
|
||||
sh.exec.o: tc.const.h
|
||||
sh.exec.po: sh.err.h
|
||||
sh.exec.po: tc.const.h
|
||||
sh.exp.o: sh.err.h
|
||||
sh.exp.o: tc.const.h
|
||||
sh.exp.po: sh.err.h
|
||||
sh.exp.po: tc.const.h
|
||||
sh.file.o: sh.err.h
|
||||
sh.file.o: tc.const.h
|
||||
sh.file.po: sh.err.h
|
||||
sh.file.po: tc.const.h
|
||||
sh.func.o: sh.err.h
|
||||
sh.func.o: tc.const.h
|
||||
sh.func.po: sh.err.h
|
||||
sh.func.po: tc.const.h
|
||||
sh.glob.o: sh.err.h
|
||||
sh.glob.o: tc.const.h
|
||||
sh.glob.po: sh.err.h
|
||||
sh.glob.po: tc.const.h
|
||||
sh.hist.o: sh.err.h
|
||||
sh.hist.o: tc.const.h
|
||||
sh.hist.po: sh.err.h
|
||||
sh.hist.po: tc.const.h
|
||||
sh.init.o: sh.err.h
|
||||
sh.init.o: tc.const.h
|
||||
sh.init.po: sh.err.h
|
||||
sh.init.po: tc.const.h
|
||||
sh.lex.o: sh.err.h
|
||||
sh.lex.o: tc.const.h
|
||||
sh.lex.po: sh.err.h
|
||||
sh.lex.po: tc.const.h
|
||||
sh.misc.o: sh.err.h
|
||||
sh.misc.o: tc.const.h
|
||||
sh.misc.po: sh.err.h
|
||||
sh.misc.po: tc.const.h
|
||||
sh.o: sh.err.h
|
||||
sh.o: tc.const.h
|
||||
sh.parse.o: sh.err.h
|
||||
sh.parse.o: tc.const.h
|
||||
sh.parse.po: sh.err.h
|
||||
sh.parse.po: tc.const.h
|
||||
sh.po: sh.err.h
|
||||
sh.po: tc.const.h
|
||||
sh.print.o: sh.err.h
|
||||
sh.print.o: tc.const.h
|
||||
sh.print.po: sh.err.h
|
||||
sh.print.po: tc.const.h
|
||||
sh.proc.o: sh.err.h
|
||||
sh.proc.o: tc.const.h
|
||||
sh.proc.po: sh.err.h
|
||||
sh.proc.po: tc.const.h
|
||||
sh.sem.o: sh.err.h
|
||||
sh.sem.o: tc.const.h
|
||||
sh.sem.po: sh.err.h
|
||||
sh.sem.po: tc.const.h
|
||||
sh.set.o: sh.err.h
|
||||
sh.set.o: tc.const.h
|
||||
sh.set.po: sh.err.h
|
||||
sh.set.po: tc.const.h
|
||||
sh.time.o: sh.err.h
|
||||
sh.time.o: tc.const.h
|
||||
sh.time.po: sh.err.h
|
||||
sh.time.po: tc.const.h
|
||||
tc.alloc.o: sh.err.h
|
||||
tc.alloc.o: tc.const.h
|
||||
tc.alloc.po: sh.err.h
|
||||
tc.alloc.po: tc.const.h
|
||||
tc.bind.o: ed.defns.h
|
||||
tc.bind.o: sh.err.h
|
||||
tc.bind.o: tc.const.h
|
||||
tc.bind.po: ed.defns.h
|
||||
tc.bind.po: sh.err.h
|
||||
tc.bind.po: tc.const.h
|
||||
tc.const.o: sh.err.h
|
||||
tc.const.o: tc.const.h
|
||||
tc.const.po: sh.err.h
|
||||
tc.const.po: tc.const.h
|
||||
tc.defs.o: sh.err.h
|
||||
tc.defs.o: tc.const.h
|
||||
tc.defs.o: tc.defs.c
|
||||
tc.defs.po: sh.err.h
|
||||
tc.defs.po: tc.const.h
|
||||
tc.defs.po: tc.defs.c
|
||||
tc.disc.o: sh.err.h
|
||||
tc.disc.o: tc.const.h
|
||||
tc.disc.po: sh.err.h
|
||||
tc.disc.po: tc.const.h
|
||||
tc.func.o: ed.defns.h
|
||||
tc.func.o: sh.err.h
|
||||
tc.func.o: tc.const.h
|
||||
tc.func.po: ed.defns.h
|
||||
tc.func.po: sh.err.h
|
||||
tc.func.po: tc.const.h
|
||||
tc.nls.o: sh.err.h
|
||||
tc.nls.o: tc.const.h
|
||||
tc.nls.po: sh.err.h
|
||||
tc.nls.po: tc.const.h
|
||||
tc.os.o: ed.defns.h
|
||||
tc.os.o: sh.err.h
|
||||
tc.os.o: tc.const.h
|
||||
tc.os.po: ed.defns.h
|
||||
tc.os.po: sh.err.h
|
||||
tc.os.po: tc.const.h
|
||||
tc.printf.o: sh.err.h
|
||||
tc.printf.o: tc.const.h
|
||||
tc.printf.po: sh.err.h
|
||||
tc.printf.po: tc.const.h
|
||||
tc.prompt.o: sh.err.h
|
||||
tc.prompt.o: tc.const.h
|
||||
tc.prompt.po: sh.err.h
|
||||
tc.prompt.po: tc.const.h
|
||||
tc.sched.o: sh.err.h
|
||||
tc.sched.o: tc.const.h
|
||||
tc.sched.po: sh.err.h
|
||||
tc.sched.po: tc.const.h
|
||||
tc.sig.o: sh.err.h
|
||||
tc.sig.o: tc.const.h
|
||||
tc.sig.po: sh.err.h
|
||||
tc.sig.po: tc.const.h
|
||||
tc.str.o: sh.err.h
|
||||
tc.str.o: tc.const.h
|
||||
tc.str.po: sh.err.h
|
||||
tc.str.po: tc.const.h
|
||||
tc.vers.o: sh.err.h
|
||||
tc.vers.o: tc.const.h
|
||||
tc.vers.po: sh.err.h
|
||||
tc.vers.po: tc.const.h
|
||||
tc.who.o: sh.err.h
|
||||
tc.who.o: tc.const.h
|
||||
tc.who.po: sh.err.h
|
||||
tc.who.po: tc.const.h
|
||||
tw.color.o: sh.err.h
|
||||
tw.color.o: tc.const.h
|
||||
tw.color.po: sh.err.h
|
||||
tw.color.po: tc.const.h
|
||||
tw.comp.o: sh.err.h
|
||||
tw.comp.o: tc.const.h
|
||||
tw.comp.po: sh.err.h
|
||||
tw.comp.po: tc.const.h
|
||||
tw.help.o: sh.err.h
|
||||
tw.help.o: tc.const.h
|
||||
tw.help.po: sh.err.h
|
||||
tw.help.po: tc.const.h
|
||||
tw.init.o: sh.err.h
|
||||
tw.init.o: tc.const.h
|
||||
tw.init.po: sh.err.h
|
||||
tw.init.po: tc.const.h
|
||||
tw.parse.o: sh.err.h
|
||||
tw.parse.o: tc.const.h
|
||||
tw.parse.po: sh.err.h
|
||||
tw.parse.po: tc.const.h
|
||||
tw.spell.o: sh.err.h
|
||||
tw.spell.o: tc.const.h
|
||||
tw.spell.po: sh.err.h
|
||||
tw.spell.po: tc.const.h
|
||||
.endif
|
||||
19
bin/date/Makefile.depend
Normal file
19
bin/date/Makefile.depend
Normal file
@ -0,0 +1,19 @@
|
||||
# $FreeBSD$
|
||||
# Autogenerated - do NOT edit!
|
||||
|
||||
DIRDEPS = \
|
||||
gnu/lib/csu \
|
||||
gnu/lib/libgcc \
|
||||
include \
|
||||
include/protocols \
|
||||
include/xlocale \
|
||||
lib/${CSU_DIR} \
|
||||
lib/libc \
|
||||
lib/libcompiler_rt \
|
||||
|
||||
|
||||
.include <dirdeps.mk>
|
||||
|
||||
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
|
||||
# local dependencies - needed for -jN in clean tree
|
||||
.endif
|
||||
18
bin/dd/Makefile.depend
Normal file
18
bin/dd/Makefile.depend
Normal file
@ -0,0 +1,18 @@
|
||||
# $FreeBSD$
|
||||
# Autogenerated - do NOT edit!
|
||||
|
||||
DIRDEPS = \
|
||||
gnu/lib/csu \
|
||||
gnu/lib/libgcc \
|
||||
include \
|
||||
include/xlocale \
|
||||
lib/${CSU_DIR} \
|
||||
lib/libc \
|
||||
lib/libcompiler_rt \
|
||||
|
||||
|
||||
.include <dirdeps.mk>
|
||||
|
||||
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
|
||||
# local dependencies - needed for -jN in clean tree
|
||||
.endif
|
||||
20
bin/df/Makefile.depend
Normal file
20
bin/df/Makefile.depend
Normal file
@ -0,0 +1,20 @@
|
||||
# $FreeBSD$
|
||||
# Autogenerated - do NOT edit!
|
||||
|
||||
DIRDEPS = \
|
||||
gnu/lib/csu \
|
||||
gnu/lib/libgcc \
|
||||
include \
|
||||
include/xlocale \
|
||||
lib/${CSU_DIR} \
|
||||
lib/libc \
|
||||
lib/libcompiler_rt \
|
||||
lib/libutil \
|
||||
lib/libxo \
|
||||
|
||||
|
||||
.include <dirdeps.mk>
|
||||
|
||||
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
|
||||
# local dependencies - needed for -jN in clean tree
|
||||
.endif
|
||||
18
bin/domainname/Makefile.depend
Normal file
18
bin/domainname/Makefile.depend
Normal file
@ -0,0 +1,18 @@
|
||||
# $FreeBSD$
|
||||
# Autogenerated - do NOT edit!
|
||||
|
||||
DIRDEPS = \
|
||||
gnu/lib/csu \
|
||||
gnu/lib/libgcc \
|
||||
include \
|
||||
include/xlocale \
|
||||
lib/${CSU_DIR} \
|
||||
lib/libc \
|
||||
lib/libcompiler_rt \
|
||||
|
||||
|
||||
.include <dirdeps.mk>
|
||||
|
||||
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
|
||||
# local dependencies - needed for -jN in clean tree
|
||||
.endif
|
||||
18
bin/echo/Makefile.depend
Normal file
18
bin/echo/Makefile.depend
Normal file
@ -0,0 +1,18 @@
|
||||
# $FreeBSD$
|
||||
# Autogenerated - do NOT edit!
|
||||
|
||||
DIRDEPS = \
|
||||
gnu/lib/csu \
|
||||
gnu/lib/libgcc \
|
||||
include \
|
||||
include/xlocale \
|
||||
lib/${CSU_DIR} \
|
||||
lib/libc \
|
||||
lib/libcompiler_rt \
|
||||
|
||||
|
||||
.include <dirdeps.mk>
|
||||
|
||||
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
|
||||
# local dependencies - needed for -jN in clean tree
|
||||
.endif
|
||||
19
bin/ed/Makefile.depend
Normal file
19
bin/ed/Makefile.depend
Normal file
@ -0,0 +1,19 @@
|
||||
# $FreeBSD$
|
||||
# Autogenerated - do NOT edit!
|
||||
|
||||
DIRDEPS = \
|
||||
gnu/lib/csu \
|
||||
gnu/lib/libgcc \
|
||||
include \
|
||||
include/xlocale \
|
||||
lib/${CSU_DIR} \
|
||||
lib/libc \
|
||||
lib/libcompiler_rt \
|
||||
secure/lib/libcrypto \
|
||||
|
||||
|
||||
.include <dirdeps.mk>
|
||||
|
||||
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
|
||||
# local dependencies - needed for -jN in clean tree
|
||||
.endif
|
||||
21
bin/expr/Makefile.depend
Normal file
21
bin/expr/Makefile.depend
Normal file
@ -0,0 +1,21 @@
|
||||
# $FreeBSD$
|
||||
# Autogenerated - do NOT edit!
|
||||
|
||||
DIRDEPS = \
|
||||
gnu/lib/csu \
|
||||
gnu/lib/libgcc \
|
||||
include \
|
||||
include/xlocale \
|
||||
lib/${CSU_DIR} \
|
||||
lib/libc \
|
||||
lib/libcompiler_rt \
|
||||
usr.bin/yacc.host \
|
||||
|
||||
|
||||
.include <dirdeps.mk>
|
||||
|
||||
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
|
||||
# local dependencies - needed for -jN in clean tree
|
||||
expr.o: expr.c
|
||||
expr.po: expr.c
|
||||
.endif
|
||||
11
bin/freebsd-version/Makefile.depend
Normal file
11
bin/freebsd-version/Makefile.depend
Normal file
@ -0,0 +1,11 @@
|
||||
# $FreeBSD$
|
||||
# Autogenerated - do NOT edit!
|
||||
|
||||
DIRDEPS = \
|
||||
|
||||
|
||||
.include <dirdeps.mk>
|
||||
|
||||
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
|
||||
# local dependencies - needed for -jN in clean tree
|
||||
.endif
|
||||
18
bin/getfacl/Makefile.depend
Normal file
18
bin/getfacl/Makefile.depend
Normal file
@ -0,0 +1,18 @@
|
||||
# $FreeBSD$
|
||||
# Autogenerated - do NOT edit!
|
||||
|
||||
DIRDEPS = \
|
||||
gnu/lib/csu \
|
||||
gnu/lib/libgcc \
|
||||
include \
|
||||
include/xlocale \
|
||||
lib/${CSU_DIR} \
|
||||
lib/libc \
|
||||
lib/libcompiler_rt \
|
||||
|
||||
|
||||
.include <dirdeps.mk>
|
||||
|
||||
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
|
||||
# local dependencies - needed for -jN in clean tree
|
||||
.endif
|
||||
18
bin/hostname/Makefile.depend
Normal file
18
bin/hostname/Makefile.depend
Normal file
@ -0,0 +1,18 @@
|
||||
# $FreeBSD$
|
||||
# Autogenerated - do NOT edit!
|
||||
|
||||
DIRDEPS = \
|
||||
gnu/lib/csu \
|
||||
gnu/lib/libgcc \
|
||||
include \
|
||||
include/xlocale \
|
||||
lib/${CSU_DIR} \
|
||||
lib/libc \
|
||||
lib/libcompiler_rt \
|
||||
|
||||
|
||||
.include <dirdeps.mk>
|
||||
|
||||
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
|
||||
# local dependencies - needed for -jN in clean tree
|
||||
.endif
|
||||
18
bin/kenv/Makefile.depend
Normal file
18
bin/kenv/Makefile.depend
Normal file
@ -0,0 +1,18 @@
|
||||
# $FreeBSD$
|
||||
# Autogenerated - do NOT edit!
|
||||
|
||||
DIRDEPS = \
|
||||
gnu/lib/csu \
|
||||
gnu/lib/libgcc \
|
||||
include \
|
||||
include/xlocale \
|
||||
lib/${CSU_DIR} \
|
||||
lib/libc \
|
||||
lib/libcompiler_rt \
|
||||
|
||||
|
||||
.include <dirdeps.mk>
|
||||
|
||||
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
|
||||
# local dependencies - needed for -jN in clean tree
|
||||
.endif
|
||||
18
bin/kill/Makefile.depend
Normal file
18
bin/kill/Makefile.depend
Normal file
@ -0,0 +1,18 @@
|
||||
# $FreeBSD$
|
||||
# Autogenerated - do NOT edit!
|
||||
|
||||
DIRDEPS = \
|
||||
gnu/lib/csu \
|
||||
gnu/lib/libgcc \
|
||||
include \
|
||||
include/xlocale \
|
||||
lib/${CSU_DIR} \
|
||||
lib/libc \
|
||||
lib/libcompiler_rt \
|
||||
|
||||
|
||||
.include <dirdeps.mk>
|
||||
|
||||
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
|
||||
# local dependencies - needed for -jN in clean tree
|
||||
.endif
|
||||
18
bin/ln/Makefile.depend
Normal file
18
bin/ln/Makefile.depend
Normal file
@ -0,0 +1,18 @@
|
||||
# $FreeBSD$
|
||||
# Autogenerated - do NOT edit!
|
||||
|
||||
DIRDEPS = \
|
||||
gnu/lib/csu \
|
||||
gnu/lib/libgcc \
|
||||
include \
|
||||
include/xlocale \
|
||||
lib/${CSU_DIR} \
|
||||
lib/libc \
|
||||
lib/libcompiler_rt \
|
||||
|
||||
|
||||
.include <dirdeps.mk>
|
||||
|
||||
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
|
||||
# local dependencies - needed for -jN in clean tree
|
||||
.endif
|
||||
@ -10,7 +10,7 @@ LIBADD= util
|
||||
.if !defined(RELEASE_CRUNCH) && \
|
||||
${MK_LS_COLORS} != no
|
||||
CFLAGS+= -DCOLORLS
|
||||
LIBADD+= termcapw
|
||||
LIBADD+= termcapw xo
|
||||
.endif
|
||||
|
||||
.include <bsd.prog.mk>
|
||||
|
||||
21
bin/ls/Makefile.depend
Normal file
21
bin/ls/Makefile.depend
Normal file
@ -0,0 +1,21 @@
|
||||
# $FreeBSD$
|
||||
# Autogenerated - do NOT edit!
|
||||
|
||||
DIRDEPS = \
|
||||
gnu/lib/csu \
|
||||
gnu/lib/libgcc \
|
||||
include \
|
||||
include/xlocale \
|
||||
lib/${CSU_DIR} \
|
||||
lib/libc \
|
||||
lib/libcompiler_rt \
|
||||
lib/libutil \
|
||||
lib/libxo \
|
||||
lib/ncurses/ncursesw \
|
||||
|
||||
|
||||
.include <dirdeps.mk>
|
||||
|
||||
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
|
||||
# local dependencies - needed for -jN in clean tree
|
||||
.endif
|
||||
@ -45,14 +45,17 @@ int revsizecmp(const FTSENT *, const FTSENT *);
|
||||
|
||||
void printcol(const DISPLAY *);
|
||||
void printlong(const DISPLAY *);
|
||||
int printname(const char *);
|
||||
int printname(const char *, const char *);
|
||||
void printscol(const DISPLAY *);
|
||||
void printstream(const DISPLAY *);
|
||||
void usage(void);
|
||||
int prn_normal(const char *);
|
||||
int prn_normal(const char *, const char *);
|
||||
char * getname(const char *);
|
||||
size_t len_octal(const char *, int);
|
||||
int prn_octal(const char *);
|
||||
int prn_printable(const char *);
|
||||
int prn_octal(const char *, const char *);
|
||||
char * get_octal(const char *);
|
||||
int prn_printable(const char *, const char *);
|
||||
char * get_printable(const char *);
|
||||
#ifdef COLORLS
|
||||
void parsecolors(const char *cs);
|
||||
void colorquit(int);
|
||||
|
||||
@ -32,7 +32,7 @@
|
||||
.\" @(#)ls.1 8.7 (Berkeley) 7/29/94
|
||||
.\" $FreeBSD$
|
||||
.\"
|
||||
.Dd April 4, 2014
|
||||
.Dd June 8, 2015
|
||||
.Dt LS 1
|
||||
.Os
|
||||
.Sh NAME
|
||||
@ -40,6 +40,7 @@
|
||||
.Nd list directory contents
|
||||
.Sh SYNOPSIS
|
||||
.Nm
|
||||
.Op Fl -libxo
|
||||
.Op Fl ABCFGHILPRSTUWZabcdfghiklmnopqrstuwxy1,
|
||||
.Op Fl D Ar format
|
||||
.Op Ar
|
||||
@ -797,9 +798,11 @@ specification.
|
||||
.Xr getfacl 1 ,
|
||||
.Xr sort 1 ,
|
||||
.Xr xterm 1 ,
|
||||
.Xr libxo 3 ,
|
||||
.Xr localeconv 3 ,
|
||||
.Xr strftime 3 ,
|
||||
.Xr strmode 3 ,
|
||||
.Xr xo_parse_args 3 ,
|
||||
.Xr termcap 5 ,
|
||||
.Xr maclabel 7 ,
|
||||
.Xr sticky 7 ,
|
||||
|
||||
54
bin/ls/ls.c
54
bin/ls/ls.c
@ -66,6 +66,7 @@ __FBSDID("$FreeBSD$");
|
||||
#include <termcap.h>
|
||||
#include <signal.h>
|
||||
#endif
|
||||
#include <libxo/xo.h>
|
||||
|
||||
#include "ls.h"
|
||||
#include "extern.h"
|
||||
@ -185,6 +186,12 @@ main(int argc, char *argv[])
|
||||
fts_options = FTS_PHYSICAL;
|
||||
if (getenv("LS_SAMESORT"))
|
||||
f_samesort = 1;
|
||||
|
||||
argc = xo_parse_args(argc, argv);
|
||||
if (argc < 0)
|
||||
return (1);
|
||||
xo_set_flags(NULL, XOF_COLUMNS);
|
||||
|
||||
while ((ch = getopt(argc, argv,
|
||||
"1ABCD:FGHILPRSTUWXZabcdfghiklmnopqrstuwxy,")) != -1) {
|
||||
switch (ch) {
|
||||
@ -381,7 +388,7 @@ main(int argc, char *argv[])
|
||||
f_color = 1;
|
||||
}
|
||||
#else
|
||||
warnx("color support not compiled in");
|
||||
xo_warnx("color support not compiled in");
|
||||
#endif /*COLORLS*/
|
||||
|
||||
#ifdef COLORLS
|
||||
@ -479,10 +486,13 @@ main(int argc, char *argv[])
|
||||
else
|
||||
printfcn = printcol;
|
||||
|
||||
xo_open_container("file-information");
|
||||
if (argc)
|
||||
traverse(argc, argv, fts_options);
|
||||
else
|
||||
traverse(1, dotav, fts_options);
|
||||
xo_close_container("file-information");
|
||||
xo_finish();
|
||||
exit(rval);
|
||||
}
|
||||
|
||||
@ -500,10 +510,11 @@ traverse(int argc, char *argv[], int options)
|
||||
FTS *ftsp;
|
||||
FTSENT *p, *chp;
|
||||
int ch_options;
|
||||
int first = 1;
|
||||
|
||||
if ((ftsp =
|
||||
fts_open(argv, options, f_nosort ? NULL : mastercmp)) == NULL)
|
||||
err(1, "fts_open");
|
||||
xo_err(1, "fts_open");
|
||||
|
||||
/*
|
||||
* We ignore errors from fts_children here since they will be
|
||||
@ -525,11 +536,11 @@ traverse(int argc, char *argv[], int options)
|
||||
while ((p = fts_read(ftsp)) != NULL)
|
||||
switch (p->fts_info) {
|
||||
case FTS_DC:
|
||||
warnx("%s: directory causes a cycle", p->fts_name);
|
||||
xo_warnx("%s: directory causes a cycle", p->fts_name);
|
||||
break;
|
||||
case FTS_DNR:
|
||||
case FTS_ERR:
|
||||
warnx("%s: %s", p->fts_path, strerror(p->fts_errno));
|
||||
xo_warnx("%s: %s", p->fts_path, strerror(p->fts_errno));
|
||||
rval = 1;
|
||||
break;
|
||||
case FTS_D:
|
||||
@ -537,31 +548,40 @@ traverse(int argc, char *argv[], int options)
|
||||
p->fts_name[0] == '.' && !f_listdot)
|
||||
break;
|
||||
|
||||
if (first) {
|
||||
first = 0;
|
||||
xo_open_list("directory");
|
||||
}
|
||||
xo_open_instance("directory");
|
||||
|
||||
/*
|
||||
* If already output something, put out a newline as
|
||||
* a separator. If multiple arguments, precede each
|
||||
* directory with its name.
|
||||
*/
|
||||
if (output) {
|
||||
putchar('\n');
|
||||
(void)printname(p->fts_path);
|
||||
puts(":");
|
||||
xo_emit("\n");
|
||||
(void)printname("path", p->fts_path);
|
||||
xo_emit(":\n");
|
||||
} else if (argc > 1) {
|
||||
(void)printname(p->fts_path);
|
||||
puts(":");
|
||||
(void)printname("path", p->fts_path);
|
||||
xo_emit(":\n");
|
||||
output = 1;
|
||||
}
|
||||
chp = fts_children(ftsp, ch_options);
|
||||
display(p, chp, options);
|
||||
|
||||
xo_close_instance("directory");
|
||||
if (!f_recursive && chp != NULL)
|
||||
(void)fts_set(ftsp, p, FTS_SKIP);
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
if (!first)
|
||||
xo_close_list("directory");
|
||||
if (errno)
|
||||
err(1, "fts_read");
|
||||
xo_err(1, "fts_read");
|
||||
}
|
||||
|
||||
/*
|
||||
@ -608,7 +628,7 @@ display(const FTSENT *p, FTSENT *list, int options)
|
||||
/* Fill-in "::" as "0:0:0" for the sake of scanf. */
|
||||
jinitmax = malloc(strlen(initmax) * 2 + 2);
|
||||
if (jinitmax == NULL)
|
||||
err(1, "malloc");
|
||||
xo_err(1, "malloc");
|
||||
initmax2 = jinitmax;
|
||||
if (*initmax == ':')
|
||||
strcpy(initmax2, "0:"), initmax2 += 2;
|
||||
@ -679,7 +699,7 @@ display(const FTSENT *p, FTSENT *list, int options)
|
||||
flags = NULL;
|
||||
for (cur = list, entries = 0; cur; cur = cur->fts_link) {
|
||||
if (cur->fts_info == FTS_ERR || cur->fts_info == FTS_NS) {
|
||||
warnx("%s: %s",
|
||||
xo_warnx("%s: %s",
|
||||
cur->fts_name, strerror(cur->fts_errno));
|
||||
cur->fts_number = NO_PRINT;
|
||||
rval = 1;
|
||||
@ -745,7 +765,7 @@ display(const FTSENT *p, FTSENT *list, int options)
|
||||
flags = strdup("-");
|
||||
}
|
||||
if (flags == NULL)
|
||||
err(1, "fflagstostr");
|
||||
xo_err(1, "fflagstostr");
|
||||
flen = strlen(flags);
|
||||
if (flen > (size_t)maxflags)
|
||||
maxflags = flen;
|
||||
@ -759,7 +779,7 @@ display(const FTSENT *p, FTSENT *list, int options)
|
||||
|
||||
error = mac_prepare_file_label(&label);
|
||||
if (error == -1) {
|
||||
warn("MAC label for %s/%s",
|
||||
xo_warn("MAC label for %s/%s",
|
||||
cur->fts_parent->fts_path,
|
||||
cur->fts_name);
|
||||
goto label_out;
|
||||
@ -780,7 +800,7 @@ display(const FTSENT *p, FTSENT *list, int options)
|
||||
error = mac_get_link(name,
|
||||
label);
|
||||
if (error == -1) {
|
||||
warn("MAC label for %s/%s",
|
||||
xo_warn("MAC label for %s/%s",
|
||||
cur->fts_parent->fts_path,
|
||||
cur->fts_name);
|
||||
mac_free(label);
|
||||
@ -790,7 +810,7 @@ display(const FTSENT *p, FTSENT *list, int options)
|
||||
error = mac_to_text(label,
|
||||
&labelstr);
|
||||
if (error == -1) {
|
||||
warn("MAC label for %s/%s",
|
||||
xo_warn("MAC label for %s/%s",
|
||||
cur->fts_parent->fts_path,
|
||||
cur->fts_name);
|
||||
mac_free(label);
|
||||
@ -808,7 +828,7 @@ label_out:
|
||||
|
||||
if ((np = malloc(sizeof(NAMES) + labelstrlen +
|
||||
ulen + glen + flen + 4)) == NULL)
|
||||
err(1, "malloc");
|
||||
xo_err(1, "malloc");
|
||||
|
||||
np->user = &np->data[0];
|
||||
(void)strcpy(np->user, user);
|
||||
|
||||
169
bin/ls/print.c
169
bin/ls/print.c
@ -58,6 +58,7 @@ __FBSDID("$FreeBSD$");
|
||||
#include <termcap.h>
|
||||
#include <signal.h>
|
||||
#endif
|
||||
#include <libxo/xo.h>
|
||||
|
||||
#include "ls.h"
|
||||
#include "extern.h"
|
||||
@ -65,9 +66,9 @@ __FBSDID("$FreeBSD$");
|
||||
static int printaname(const FTSENT *, u_long, u_long);
|
||||
static void printdev(size_t, dev_t);
|
||||
static void printlink(const FTSENT *);
|
||||
static void printtime(time_t);
|
||||
static void printtime(const char *, time_t);
|
||||
static int printtype(u_int);
|
||||
static void printsize(size_t, off_t);
|
||||
static void printsize(const char *, size_t, off_t);
|
||||
#ifdef COLORLS
|
||||
static void endcolor(int);
|
||||
static int colortype(mode_t);
|
||||
@ -109,26 +110,46 @@ printscol(const DISPLAY *dp)
|
||||
{
|
||||
FTSENT *p;
|
||||
|
||||
xo_open_list("entry");
|
||||
for (p = dp->list; p; p = p->fts_link) {
|
||||
if (IS_NOPRINT(p))
|
||||
continue;
|
||||
xo_open_instance("entry");
|
||||
(void)printaname(p, dp->s_inode, dp->s_block);
|
||||
(void)putchar('\n');
|
||||
xo_close_instance("entry");
|
||||
xo_emit("\n");
|
||||
}
|
||||
xo_close_list("entry");
|
||||
}
|
||||
|
||||
/*
|
||||
* print name in current style
|
||||
*/
|
||||
int
|
||||
printname(const char *name)
|
||||
printname(const char *field, const char *name)
|
||||
{
|
||||
char fmt[BUFSIZ];
|
||||
char *s = getname(name);
|
||||
int rc;
|
||||
|
||||
snprintf(fmt, sizeof(fmt), "{:%s/%%hs}", field);
|
||||
rc = xo_emit(fmt, s);
|
||||
free(s);
|
||||
return rc;
|
||||
}
|
||||
|
||||
/*
|
||||
* print name in current style
|
||||
*/
|
||||
char *
|
||||
getname(const char *name)
|
||||
{
|
||||
if (f_octal || f_octal_escape)
|
||||
return prn_octal(name);
|
||||
return get_octal(name);
|
||||
else if (f_nonprint)
|
||||
return prn_printable(name);
|
||||
return get_printable(name);
|
||||
else
|
||||
return prn_normal(name);
|
||||
return strdup(name);
|
||||
}
|
||||
|
||||
void
|
||||
@ -144,46 +165,59 @@ printlong(const DISPLAY *dp)
|
||||
|
||||
if ((dp->list == NULL || dp->list->fts_level != FTS_ROOTLEVEL) &&
|
||||
(f_longform || f_size)) {
|
||||
(void)printf("total %lu\n", howmany(dp->btotal, blocksize));
|
||||
xo_emit("{L:total} {:total-blocks/%lu}\n",
|
||||
howmany(dp->btotal, blocksize));
|
||||
}
|
||||
|
||||
xo_open_list("entry");
|
||||
for (p = dp->list; p; p = p->fts_link) {
|
||||
char *name;
|
||||
if (IS_NOPRINT(p))
|
||||
continue;
|
||||
xo_open_instance("entry");
|
||||
sp = p->fts_statp;
|
||||
name = getname(p->fts_name);
|
||||
if (name)
|
||||
xo_emit("{ke:name/%hs}", name);
|
||||
if (f_inode)
|
||||
(void)printf("%*ju ",
|
||||
xo_emit("{:inode/%*ju} ",
|
||||
dp->s_inode, (uintmax_t)sp->st_ino);
|
||||
if (f_size)
|
||||
(void)printf("%*jd ",
|
||||
xo_emit("{:blocks/%*jd} ",
|
||||
dp->s_block, howmany(sp->st_blocks, blocksize));
|
||||
strmode(sp->st_mode, buf);
|
||||
aclmode(buf, p);
|
||||
np = p->fts_pointer;
|
||||
(void)printf("%s %*u %-*s %-*s ", buf, dp->s_nlink,
|
||||
sp->st_nlink, dp->s_user, np->user, dp->s_group,
|
||||
np->group);
|
||||
xo_attr("value", "%03o", (int) sp->st_mode & ALLPERMS);
|
||||
xo_emit("{t:mode/%s} {:links/%*u} {:user/%-*s} {:group/%-*s} ",
|
||||
buf, dp->s_nlink, sp->st_nlink,
|
||||
dp->s_user, np->user, dp->s_group, np->group);
|
||||
if (f_flags)
|
||||
(void)printf("%-*s ", dp->s_flags, np->flags);
|
||||
xo_emit("{:flags/%-*s} ", dp->s_flags, np->flags);
|
||||
if (f_label)
|
||||
(void)printf("%-*s ", dp->s_label, np->label);
|
||||
xo_emit("{:label/%-*s} ", dp->s_label, np->label);
|
||||
if (S_ISCHR(sp->st_mode) || S_ISBLK(sp->st_mode))
|
||||
printdev(dp->s_size, sp->st_rdev);
|
||||
else
|
||||
printsize(dp->s_size, sp->st_size);
|
||||
printsize("size", dp->s_size, sp->st_size);
|
||||
if (f_accesstime)
|
||||
printtime(sp->st_atime);
|
||||
printtime("access-time", sp->st_atime);
|
||||
else if (f_birthtime)
|
||||
printtime(sp->st_birthtime);
|
||||
printtime("birth-time", sp->st_birthtime);
|
||||
else if (f_statustime)
|
||||
printtime(sp->st_ctime);
|
||||
printtime("change-time", sp->st_ctime);
|
||||
else
|
||||
printtime(sp->st_mtime);
|
||||
printtime("modify-time", sp->st_mtime);
|
||||
#ifdef COLORLS
|
||||
if (f_color)
|
||||
color_printed = colortype(sp->st_mode);
|
||||
#endif
|
||||
(void)printname(p->fts_name);
|
||||
|
||||
if (name) {
|
||||
xo_emit("{dk:name/%hs}", name);
|
||||
free(name);
|
||||
}
|
||||
|
||||
#ifdef COLORLS
|
||||
if (f_color && color_printed)
|
||||
endcolor(0);
|
||||
@ -192,8 +226,10 @@ printlong(const DISPLAY *dp)
|
||||
(void)printtype(sp->st_mode);
|
||||
if (S_ISLNK(sp->st_mode))
|
||||
printlink(p);
|
||||
(void)putchar('\n');
|
||||
xo_close_instance("entry");
|
||||
xo_emit("\n");
|
||||
}
|
||||
xo_close_list("entry");
|
||||
}
|
||||
|
||||
void
|
||||
@ -208,17 +244,17 @@ printstream(const DISPLAY *dp)
|
||||
/* XXX strlen does not take octal escapes into account. */
|
||||
if (strlen(p->fts_name) + chcnt +
|
||||
(p->fts_link ? 2 : 0) >= (unsigned)termwidth) {
|
||||
putchar('\n');
|
||||
xo_emit("\n");
|
||||
chcnt = 0;
|
||||
}
|
||||
chcnt += printaname(p, dp->s_inode, dp->s_block);
|
||||
if (p->fts_link) {
|
||||
printf(", ");
|
||||
xo_emit(", ");
|
||||
chcnt += 2;
|
||||
}
|
||||
}
|
||||
if (chcnt)
|
||||
putchar('\n');
|
||||
xo_emit("\n");
|
||||
}
|
||||
|
||||
void
|
||||
@ -252,7 +288,6 @@ printcol(const DISPLAY *dp)
|
||||
if (dp->entries > lastentries) {
|
||||
if ((narray =
|
||||
realloc(array, dp->entries * sizeof(FTSENT *))) == NULL) {
|
||||
warn(NULL);
|
||||
printscol(dp);
|
||||
return;
|
||||
}
|
||||
@ -283,17 +318,21 @@ printcol(const DISPLAY *dp)
|
||||
|
||||
if ((dp->list == NULL || dp->list->fts_level != FTS_ROOTLEVEL) &&
|
||||
(f_longform || f_size)) {
|
||||
(void)printf("total %lu\n", howmany(dp->btotal, blocksize));
|
||||
xo_emit("{L:total} {:total-blocks/%lu}\n",
|
||||
howmany(dp->btotal, blocksize));
|
||||
}
|
||||
|
||||
xo_open_list("entry");
|
||||
base = 0;
|
||||
for (row = 0; row < numrows; ++row) {
|
||||
endcol = colwidth;
|
||||
if (!f_sortacross)
|
||||
base = row;
|
||||
for (col = 0, chcnt = 0; col < numcols; ++col) {
|
||||
xo_open_instance("entry");
|
||||
chcnt += printaname(array[base], dp->s_inode,
|
||||
dp->s_block);
|
||||
xo_close_instance("entry");
|
||||
if (f_sortacross)
|
||||
base++;
|
||||
else
|
||||
@ -304,13 +343,14 @@ printcol(const DISPLAY *dp)
|
||||
<= endcol) {
|
||||
if (f_sortacross && col + 1 >= numcols)
|
||||
break;
|
||||
(void)putchar(f_notabs ? ' ' : '\t');
|
||||
xo_emit(f_notabs ? " " : "\t");
|
||||
chcnt = cnt;
|
||||
}
|
||||
endcol += colwidth;
|
||||
}
|
||||
(void)putchar('\n');
|
||||
xo_emit("\n");
|
||||
}
|
||||
xo_close_list("entry");
|
||||
}
|
||||
|
||||
/*
|
||||
@ -329,16 +369,16 @@ printaname(const FTSENT *p, u_long inodefield, u_long sizefield)
|
||||
sp = p->fts_statp;
|
||||
chcnt = 0;
|
||||
if (f_inode)
|
||||
chcnt += printf("%*ju ",
|
||||
chcnt += xo_emit("{:inode/%*ju} ",
|
||||
(int)inodefield, (uintmax_t)sp->st_ino);
|
||||
if (f_size)
|
||||
chcnt += printf("%*jd ",
|
||||
chcnt += xo_emit("{:size/%*jd} ",
|
||||
(int)sizefield, howmany(sp->st_blocks, blocksize));
|
||||
#ifdef COLORLS
|
||||
if (f_color)
|
||||
color_printed = colortype(sp->st_mode);
|
||||
#endif
|
||||
chcnt += printname(p->fts_name);
|
||||
chcnt += printname("name", p->fts_name);
|
||||
#ifdef COLORLS
|
||||
if (f_color && color_printed)
|
||||
endcolor(0);
|
||||
@ -354,14 +394,14 @@ printaname(const FTSENT *p, u_long inodefield, u_long sizefield)
|
||||
static void
|
||||
printdev(size_t width, dev_t dev)
|
||||
{
|
||||
|
||||
(void)printf("%#*jx ", (u_int)width, (uintmax_t)dev);
|
||||
xo_emit("{:device/%#*jx} ", (u_int)width, (uintmax_t)dev);
|
||||
}
|
||||
|
||||
static void
|
||||
printtime(time_t ftime)
|
||||
printtime(const char *field, time_t ftime)
|
||||
{
|
||||
char longstring[80];
|
||||
char fmt[BUFSIZ];
|
||||
static time_t now = 0;
|
||||
const char *format;
|
||||
static int d_first = -1;
|
||||
@ -384,8 +424,10 @@ printtime(time_t ftime)
|
||||
/* mmm dd yyyy || dd mmm yyyy */
|
||||
format = d_first ? "%e %b %Y" : "%b %e %Y";
|
||||
strftime(longstring, sizeof(longstring), format, localtime(&ftime));
|
||||
fputs(longstring, stdout);
|
||||
fputc(' ', stdout);
|
||||
|
||||
snprintf(fmt, sizeof(fmt), "{:%s/%%hs} ", field);
|
||||
xo_attr("value", "%ld", (long) ftime);
|
||||
xo_emit(fmt, longstring);
|
||||
}
|
||||
|
||||
static int
|
||||
@ -394,7 +436,7 @@ printtype(u_int mode)
|
||||
|
||||
if (f_slash) {
|
||||
if ((mode & S_IFMT) == S_IFDIR) {
|
||||
(void)putchar('/');
|
||||
xo_emit("{D:\\/}{e:type/directory}");
|
||||
return (1);
|
||||
}
|
||||
return (0);
|
||||
@ -402,25 +444,25 @@ printtype(u_int mode)
|
||||
|
||||
switch (mode & S_IFMT) {
|
||||
case S_IFDIR:
|
||||
(void)putchar('/');
|
||||
xo_emit("{D:/\\/}{e:type/directory}");
|
||||
return (1);
|
||||
case S_IFIFO:
|
||||
(void)putchar('|');
|
||||
xo_emit("{D:|}{e:type/fifo}");
|
||||
return (1);
|
||||
case S_IFLNK:
|
||||
(void)putchar('@');
|
||||
xo_emit("{D:@}{e:type/link}");
|
||||
return (1);
|
||||
case S_IFSOCK:
|
||||
(void)putchar('=');
|
||||
xo_emit("{D:=}{e:type/socket}");
|
||||
return (1);
|
||||
case S_IFWHT:
|
||||
(void)putchar('%');
|
||||
xo_emit("{D:%}{e:type/whiteout}");
|
||||
return (1);
|
||||
default:
|
||||
break;
|
||||
}
|
||||
if (mode & (S_IXUSR | S_IXGRP | S_IXOTH)) {
|
||||
(void)putchar('*');
|
||||
xo_emit("{D:*}{e:executable/}");
|
||||
return (1);
|
||||
}
|
||||
return (0);
|
||||
@ -430,7 +472,7 @@ printtype(u_int mode)
|
||||
static int
|
||||
putch(int c)
|
||||
{
|
||||
(void)putchar(c);
|
||||
xo_emit("{D:/%c}", c);
|
||||
return 0;
|
||||
}
|
||||
|
||||
@ -539,7 +581,7 @@ parsecolors(const char *cs)
|
||||
if (c[j] >= '0' && c[j] <= '7') {
|
||||
colors[i].num[j] = c[j] - '0';
|
||||
if (!legacy_warn) {
|
||||
warnx("LSCOLORS should use "
|
||||
xo_warnx("LSCOLORS should use "
|
||||
"characters a-h instead of 0-9 ("
|
||||
"see the manual page)");
|
||||
}
|
||||
@ -552,7 +594,7 @@ parsecolors(const char *cs)
|
||||
} else if (tolower((unsigned char)c[j]) == 'x')
|
||||
colors[i].num[j] = -1;
|
||||
else {
|
||||
warnx("invalid character '%c' in LSCOLORS"
|
||||
xo_warnx("invalid character '%c' in LSCOLORS"
|
||||
" env var", c[j]);
|
||||
colors[i].num[j] = -1;
|
||||
}
|
||||
@ -584,18 +626,19 @@ printlink(const FTSENT *p)
|
||||
(void)snprintf(name, sizeof(name),
|
||||
"%s/%s", p->fts_parent->fts_accpath, p->fts_name);
|
||||
if ((lnklen = readlink(name, path, sizeof(path) - 1)) == -1) {
|
||||
(void)fprintf(stderr, "\nls: %s: %s\n", name, strerror(errno));
|
||||
xo_error("\nls: %s: %s\n", name, strerror(errno));
|
||||
return;
|
||||
}
|
||||
path[lnklen] = '\0';
|
||||
(void)printf(" -> ");
|
||||
(void)printname(path);
|
||||
xo_emit(" -> ");
|
||||
(void)printname("target", path);
|
||||
}
|
||||
|
||||
static void
|
||||
printsize(size_t width, off_t bytes)
|
||||
printsize(const char *field, size_t width, off_t bytes)
|
||||
{
|
||||
|
||||
char fmt[BUFSIZ];
|
||||
|
||||
if (f_humanval) {
|
||||
/*
|
||||
* Reserve one space before the size and allocate room for
|
||||
@ -605,13 +648,15 @@ printsize(size_t width, off_t bytes)
|
||||
|
||||
humanize_number(buf, sizeof(buf), (int64_t)bytes, "",
|
||||
HN_AUTOSCALE, HN_B | HN_NOSPACE | HN_DECIMAL);
|
||||
(void)printf("%*s ", (u_int)width, buf);
|
||||
} else if (f_thousands) { /* with commas */
|
||||
snprintf(fmt, sizeof(fmt), "{:%s/%%%ds} ", field, (int) width);
|
||||
xo_attr("value", "%jd", (intmax_t) bytes);
|
||||
xo_emit(fmt, buf);
|
||||
} else { /* with commas */
|
||||
/* This format assignment needed to work round gcc bug. */
|
||||
const char *format = "%*j'd ";
|
||||
(void)printf(format, (u_int)width, bytes);
|
||||
} else
|
||||
(void)printf("%*jd ", (u_int)width, bytes);
|
||||
snprintf(fmt, sizeof(fmt), "{:%s/%%%dj%sd} ",
|
||||
field, (int) width, f_thousands ? "'" : "");
|
||||
xo_emit(fmt, (intmax_t) bytes);
|
||||
}
|
||||
}
|
||||
|
||||
/*
|
||||
@ -654,7 +699,7 @@ aclmode(char *buf, const FTSENT *p)
|
||||
type = ACL_TYPE_NFS4;
|
||||
supports_acls = 1;
|
||||
} else if (ret < 0 && errno != EINVAL) {
|
||||
warn("%s", name);
|
||||
xo_warn("%s", name);
|
||||
return;
|
||||
}
|
||||
if (supports_acls == 0) {
|
||||
@ -663,7 +708,7 @@ aclmode(char *buf, const FTSENT *p)
|
||||
type = ACL_TYPE_ACCESS;
|
||||
supports_acls = 1;
|
||||
} else if (ret < 0 && errno != EINVAL) {
|
||||
warn("%s", name);
|
||||
xo_warn("%s", name);
|
||||
return;
|
||||
}
|
||||
}
|
||||
@ -672,12 +717,12 @@ aclmode(char *buf, const FTSENT *p)
|
||||
return;
|
||||
facl = acl_get_link_np(name, type);
|
||||
if (facl == NULL) {
|
||||
warn("%s", name);
|
||||
xo_warn("%s", name);
|
||||
return;
|
||||
}
|
||||
if (acl_is_trivial_np(facl, &trivial)) {
|
||||
acl_free(facl);
|
||||
warn("%s", name);
|
||||
xo_warn("%s", name);
|
||||
return;
|
||||
}
|
||||
if (!trivial)
|
||||
|
||||
@ -50,13 +50,19 @@ __FBSDID("$FreeBSD$");
|
||||
#include <string.h>
|
||||
#include <wchar.h>
|
||||
#include <wctype.h>
|
||||
#include <libxo/xo.h>
|
||||
|
||||
#include "ls.h"
|
||||
#include "extern.h"
|
||||
|
||||
int
|
||||
prn_normal(const char *s)
|
||||
prn_normal(const char *field, const char *s)
|
||||
{
|
||||
char fmt[_POSIX2_LINE_MAX];
|
||||
|
||||
snprintf(fmt, sizeof(fmt), "{:%s/%%hs}", field);
|
||||
return xo_emit(fmt, s);
|
||||
#if 0
|
||||
mbstate_t mbs;
|
||||
wchar_t wc;
|
||||
int i, n;
|
||||
@ -83,43 +89,47 @@ prn_normal(const char *s)
|
||||
n += wcwidth(wc);
|
||||
}
|
||||
return (n);
|
||||
#endif
|
||||
}
|
||||
|
||||
int
|
||||
prn_printable(const char *s)
|
||||
char *
|
||||
get_printable(const char *s)
|
||||
{
|
||||
mbstate_t mbs;
|
||||
wchar_t wc;
|
||||
int i, n;
|
||||
size_t clen;
|
||||
int slen = strlen(s);
|
||||
char *buf = alloca(slen + 1), *bp = buf;
|
||||
|
||||
memset(&mbs, 0, sizeof(mbs));
|
||||
n = 0;
|
||||
while ((clen = mbrtowc(&wc, s, MB_LEN_MAX, &mbs)) != 0) {
|
||||
if (clen == (size_t)-1) {
|
||||
putchar('?');
|
||||
*bp++ = '?';
|
||||
s++;
|
||||
n++;
|
||||
memset(&mbs, 0, sizeof(mbs));
|
||||
continue;
|
||||
}
|
||||
if (clen == (size_t)-2) {
|
||||
putchar('?');
|
||||
*bp++ = '?';
|
||||
n++;
|
||||
break;
|
||||
}
|
||||
if (!iswprint(wc)) {
|
||||
putchar('?');
|
||||
*bp++ = '?';
|
||||
s += clen;
|
||||
n++;
|
||||
continue;
|
||||
}
|
||||
for (i = 0; i < (int)clen; i++)
|
||||
putchar((unsigned char)s[i]);
|
||||
*bp++ = (unsigned char)s[i];
|
||||
s += clen;
|
||||
n += wcwidth(wc);
|
||||
}
|
||||
return (n);
|
||||
*bp = '\0';
|
||||
return strdup(buf);
|
||||
}
|
||||
|
||||
/*
|
||||
@ -165,8 +175,8 @@ len_octal(const char *s, int len)
|
||||
return (r);
|
||||
}
|
||||
|
||||
int
|
||||
prn_octal(const char *s)
|
||||
char *
|
||||
get_octal(const char *s)
|
||||
{
|
||||
static const char esc[] = "\\\\\"\"\aa\bb\ff\nn\rr\tt\vv";
|
||||
const char *p;
|
||||
@ -175,6 +185,8 @@ prn_octal(const char *s)
|
||||
size_t clen;
|
||||
unsigned char ch;
|
||||
int goodchar, i, len, prtlen;
|
||||
int slen = strlen(s);
|
||||
char *buf = alloca(slen * 4 + 1), *bp = buf;
|
||||
|
||||
memset(&mbs, 0, sizeof(mbs));
|
||||
len = 0;
|
||||
@ -182,7 +194,7 @@ prn_octal(const char *s)
|
||||
goodchar = clen != (size_t)-1 && clen != (size_t)-2;
|
||||
if (goodchar && iswprint(wc) && wc != L'\"' && wc != L'\\') {
|
||||
for (i = 0; i < (int)clen; i++)
|
||||
putchar((unsigned char)s[i]);
|
||||
*bp++ = (unsigned char)s[i];
|
||||
len += wcwidth(wc);
|
||||
} else if (goodchar && f_octal_escape &&
|
||||
#if WCHAR_MIN < 0
|
||||
@ -190,8 +202,8 @@ prn_octal(const char *s)
|
||||
#endif
|
||||
wc <= (wchar_t)UCHAR_MAX &&
|
||||
(p = strchr(esc, (char)wc)) != NULL) {
|
||||
putchar('\\');
|
||||
putchar(p[1]);
|
||||
*bp ++ = '\\';
|
||||
*bp++ = p[1];
|
||||
len += 2;
|
||||
} else {
|
||||
if (goodchar)
|
||||
@ -202,10 +214,10 @@ prn_octal(const char *s)
|
||||
prtlen = strlen(s);
|
||||
for (i = 0; i < prtlen; i++) {
|
||||
ch = (unsigned char)s[i];
|
||||
putchar('\\');
|
||||
putchar('0' + (ch >> 6));
|
||||
putchar('0' + ((ch >> 3) & 7));
|
||||
putchar('0' + (ch & 7));
|
||||
*bp++ = '\\';
|
||||
*bp++ = '0' + (ch >> 6);
|
||||
*bp++ = '0' + ((ch >> 3) & 7);
|
||||
*bp++ = '0' + (ch & 7);
|
||||
len += 4;
|
||||
}
|
||||
}
|
||||
@ -217,13 +229,15 @@ prn_octal(const char *s)
|
||||
} else
|
||||
s += clen;
|
||||
}
|
||||
return (len);
|
||||
|
||||
*bp = '\0';
|
||||
return strdup(buf);
|
||||
}
|
||||
|
||||
void
|
||||
usage(void)
|
||||
{
|
||||
(void)fprintf(stderr,
|
||||
xo_error(
|
||||
#ifdef COLORLS
|
||||
"usage: ls [-ABCFGHILPRSTUWZabcdfghiklmnopqrstuwxy1,] [-D format]"
|
||||
#else
|
||||
|
||||
18
bin/mkdir/Makefile.depend
Normal file
18
bin/mkdir/Makefile.depend
Normal file
@ -0,0 +1,18 @@
|
||||
# $FreeBSD$
|
||||
# Autogenerated - do NOT edit!
|
||||
|
||||
DIRDEPS = \
|
||||
gnu/lib/csu \
|
||||
gnu/lib/libgcc \
|
||||
include \
|
||||
include/xlocale \
|
||||
lib/${CSU_DIR} \
|
||||
lib/libc \
|
||||
lib/libcompiler_rt \
|
||||
|
||||
|
||||
.include <dirdeps.mk>
|
||||
|
||||
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
|
||||
# local dependencies - needed for -jN in clean tree
|
||||
.endif
|
||||
18
bin/mv/Makefile.depend
Normal file
18
bin/mv/Makefile.depend
Normal file
@ -0,0 +1,18 @@
|
||||
# $FreeBSD$
|
||||
# Autogenerated - do NOT edit!
|
||||
|
||||
DIRDEPS = \
|
||||
gnu/lib/csu \
|
||||
gnu/lib/libgcc \
|
||||
include \
|
||||
include/xlocale \
|
||||
lib/${CSU_DIR} \
|
||||
lib/libc \
|
||||
lib/libcompiler_rt \
|
||||
|
||||
|
||||
.include <dirdeps.mk>
|
||||
|
||||
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
|
||||
# local dependencies - needed for -jN in clean tree
|
||||
.endif
|
||||
18
bin/pax/Makefile.depend
Normal file
18
bin/pax/Makefile.depend
Normal file
@ -0,0 +1,18 @@
|
||||
# $FreeBSD$
|
||||
# Autogenerated - do NOT edit!
|
||||
|
||||
DIRDEPS = \
|
||||
gnu/lib/csu \
|
||||
gnu/lib/libgcc \
|
||||
include \
|
||||
include/xlocale \
|
||||
lib/${CSU_DIR} \
|
||||
lib/libc \
|
||||
lib/libcompiler_rt \
|
||||
|
||||
|
||||
.include <dirdeps.mk>
|
||||
|
||||
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
|
||||
# local dependencies - needed for -jN in clean tree
|
||||
.endif
|
||||
19
bin/pkill/Makefile.depend
Normal file
19
bin/pkill/Makefile.depend
Normal file
@ -0,0 +1,19 @@
|
||||
# $FreeBSD$
|
||||
# Autogenerated - do NOT edit!
|
||||
|
||||
DIRDEPS = \
|
||||
gnu/lib/csu \
|
||||
gnu/lib/libgcc \
|
||||
include \
|
||||
include/xlocale \
|
||||
lib/${CSU_DIR} \
|
||||
lib/libc \
|
||||
lib/libcompiler_rt \
|
||||
lib/libkvm \
|
||||
|
||||
|
||||
.include <dirdeps.mk>
|
||||
|
||||
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
|
||||
# local dependencies - needed for -jN in clean tree
|
||||
.endif
|
||||
22
bin/ps/Makefile.depend
Normal file
22
bin/ps/Makefile.depend
Normal file
@ -0,0 +1,22 @@
|
||||
# $FreeBSD$
|
||||
# Autogenerated - do NOT edit!
|
||||
|
||||
DIRDEPS = \
|
||||
gnu/lib/csu \
|
||||
gnu/lib/libgcc \
|
||||
include \
|
||||
include/xlocale \
|
||||
lib/${CSU_DIR} \
|
||||
lib/libc \
|
||||
lib/libcompiler_rt \
|
||||
lib/libjail \
|
||||
lib/libkvm \
|
||||
lib/libxo \
|
||||
lib/msun \
|
||||
|
||||
|
||||
.include <dirdeps.mk>
|
||||
|
||||
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
|
||||
# local dependencies - needed for -jN in clean tree
|
||||
.endif
|
||||
18
bin/pwait/Makefile.depend
Normal file
18
bin/pwait/Makefile.depend
Normal file
@ -0,0 +1,18 @@
|
||||
# $FreeBSD$
|
||||
# Autogenerated - do NOT edit!
|
||||
|
||||
DIRDEPS = \
|
||||
gnu/lib/csu \
|
||||
gnu/lib/libgcc \
|
||||
include \
|
||||
include/xlocale \
|
||||
lib/${CSU_DIR} \
|
||||
lib/libc \
|
||||
lib/libcompiler_rt \
|
||||
|
||||
|
||||
.include <dirdeps.mk>
|
||||
|
||||
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
|
||||
# local dependencies - needed for -jN in clean tree
|
||||
.endif
|
||||
18
bin/pwd/Makefile.depend
Normal file
18
bin/pwd/Makefile.depend
Normal file
@ -0,0 +1,18 @@
|
||||
# $FreeBSD$
|
||||
# Autogenerated - do NOT edit!
|
||||
|
||||
DIRDEPS = \
|
||||
gnu/lib/csu \
|
||||
gnu/lib/libgcc \
|
||||
include \
|
||||
include/xlocale \
|
||||
lib/${CSU_DIR} \
|
||||
lib/libc \
|
||||
lib/libcompiler_rt \
|
||||
|
||||
|
||||
.include <dirdeps.mk>
|
||||
|
||||
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
|
||||
# local dependencies - needed for -jN in clean tree
|
||||
.endif
|
||||
18
bin/rcp/Makefile.depend
Normal file
18
bin/rcp/Makefile.depend
Normal file
@ -0,0 +1,18 @@
|
||||
# $FreeBSD$
|
||||
# Autogenerated - do NOT edit!
|
||||
|
||||
DIRDEPS = \
|
||||
gnu/lib/csu \
|
||||
gnu/lib/libgcc \
|
||||
include \
|
||||
include/xlocale \
|
||||
lib/${CSU_DIR} \
|
||||
lib/libc \
|
||||
lib/libcompiler_rt \
|
||||
|
||||
|
||||
.include <dirdeps.mk>
|
||||
|
||||
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
|
||||
# local dependencies - needed for -jN in clean tree
|
||||
.endif
|
||||
17
bin/realpath/Makefile.depend
Normal file
17
bin/realpath/Makefile.depend
Normal file
@ -0,0 +1,17 @@
|
||||
# $FreeBSD$
|
||||
# Autogenerated - do NOT edit!
|
||||
|
||||
DIRDEPS = \
|
||||
gnu/lib/csu \
|
||||
gnu/lib/libgcc \
|
||||
include \
|
||||
lib/${CSU_DIR} \
|
||||
lib/libc \
|
||||
lib/libcompiler_rt \
|
||||
|
||||
|
||||
.include <dirdeps.mk>
|
||||
|
||||
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
|
||||
# local dependencies - needed for -jN in clean tree
|
||||
.endif
|
||||
18
bin/rm/Makefile.depend
Normal file
18
bin/rm/Makefile.depend
Normal file
@ -0,0 +1,18 @@
|
||||
# $FreeBSD$
|
||||
# Autogenerated - do NOT edit!
|
||||
|
||||
DIRDEPS = \
|
||||
gnu/lib/csu \
|
||||
gnu/lib/libgcc \
|
||||
include \
|
||||
include/xlocale \
|
||||
lib/${CSU_DIR} \
|
||||
lib/libc \
|
||||
lib/libcompiler_rt \
|
||||
|
||||
|
||||
.include <dirdeps.mk>
|
||||
|
||||
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
|
||||
# local dependencies - needed for -jN in clean tree
|
||||
.endif
|
||||
22
bin/rmail/Makefile.depend
Normal file
22
bin/rmail/Makefile.depend
Normal file
@ -0,0 +1,22 @@
|
||||
# $FreeBSD$
|
||||
# Autogenerated - do NOT edit!
|
||||
|
||||
DIRDEPS = \
|
||||
gnu/lib/csu \
|
||||
gnu/lib/libgcc \
|
||||
include \
|
||||
include/xlocale \
|
||||
lib/${CSU_DIR} \
|
||||
lib/libc \
|
||||
lib/libcompiler_rt \
|
||||
lib/libsm \
|
||||
lib/libutil \
|
||||
|
||||
|
||||
.include <dirdeps.mk>
|
||||
|
||||
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
|
||||
# local dependencies - needed for -jN in clean tree
|
||||
rmail.o: sm_os.h
|
||||
rmail.po: sm_os.h
|
||||
.endif
|
||||
18
bin/rmdir/Makefile.depend
Normal file
18
bin/rmdir/Makefile.depend
Normal file
@ -0,0 +1,18 @@
|
||||
# $FreeBSD$
|
||||
# Autogenerated - do NOT edit!
|
||||
|
||||
DIRDEPS = \
|
||||
gnu/lib/csu \
|
||||
gnu/lib/libgcc \
|
||||
include \
|
||||
include/xlocale \
|
||||
lib/${CSU_DIR} \
|
||||
lib/libc \
|
||||
lib/libcompiler_rt \
|
||||
|
||||
|
||||
.include <dirdeps.mk>
|
||||
|
||||
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
|
||||
# local dependencies - needed for -jN in clean tree
|
||||
.endif
|
||||
18
bin/setfacl/Makefile.depend
Normal file
18
bin/setfacl/Makefile.depend
Normal file
@ -0,0 +1,18 @@
|
||||
# $FreeBSD$
|
||||
# Autogenerated - do NOT edit!
|
||||
|
||||
DIRDEPS = \
|
||||
gnu/lib/csu \
|
||||
gnu/lib/libgcc \
|
||||
include \
|
||||
include/xlocale \
|
||||
lib/${CSU_DIR} \
|
||||
lib/libc \
|
||||
lib/libcompiler_rt \
|
||||
|
||||
|
||||
.include <dirdeps.mk>
|
||||
|
||||
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
|
||||
# local dependencies - needed for -jN in clean tree
|
||||
.endif
|
||||
114
bin/sh/Makefile.depend
Normal file
114
bin/sh/Makefile.depend
Normal file
@ -0,0 +1,114 @@
|
||||
# $FreeBSD$
|
||||
# Autogenerated - do NOT edit!
|
||||
|
||||
DIRDEPS = \
|
||||
gnu/lib/csu \
|
||||
gnu/lib/libgcc \
|
||||
include \
|
||||
include/xlocale \
|
||||
lib/${CSU_DIR} \
|
||||
lib/libc \
|
||||
lib/libcompiler_rt \
|
||||
lib/libedit \
|
||||
lib/ncurses/ncursesw \
|
||||
|
||||
|
||||
.include <dirdeps.mk>
|
||||
|
||||
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
|
||||
# local dependencies - needed for -jN in clean tree
|
||||
alias.o: builtins.h
|
||||
alias.po: builtins.h
|
||||
arith_yylex.o: syntax.h
|
||||
arith_yylex.po: syntax.h
|
||||
builtins.o: builtins.c
|
||||
builtins.o: builtins.h
|
||||
builtins.po: builtins.c
|
||||
builtins.po: builtins.h
|
||||
cd.o: builtins.h
|
||||
cd.o: nodes.h
|
||||
cd.po: builtins.h
|
||||
cd.po: nodes.h
|
||||
echo.o: builtins.h
|
||||
echo.po: builtins.h
|
||||
error.o: nodes.h
|
||||
error.po: nodes.h
|
||||
eval.o: builtins.h
|
||||
eval.o: nodes.h
|
||||
eval.o: syntax.h
|
||||
eval.po: builtins.h
|
||||
eval.po: nodes.h
|
||||
eval.po: syntax.h
|
||||
exec.o: builtins.h
|
||||
exec.o: nodes.h
|
||||
exec.o: syntax.h
|
||||
exec.po: builtins.h
|
||||
exec.po: nodes.h
|
||||
exec.po: syntax.h
|
||||
expand.o: builtins.h
|
||||
expand.o: nodes.h
|
||||
expand.o: syntax.h
|
||||
expand.po: builtins.h
|
||||
expand.po: nodes.h
|
||||
expand.po: syntax.h
|
||||
histedit.o: builtins.h
|
||||
histedit.po: builtins.h
|
||||
input.o: syntax.h
|
||||
input.po: syntax.h
|
||||
jobs.o: builtins.h
|
||||
jobs.o: nodes.h
|
||||
jobs.o: syntax.h
|
||||
jobs.po: builtins.h
|
||||
jobs.po: nodes.h
|
||||
jobs.po: syntax.h
|
||||
kill.o: builtins.h
|
||||
kill.po: builtins.h
|
||||
main.o: builtins.h
|
||||
main.o: nodes.h
|
||||
main.po: builtins.h
|
||||
main.po: nodes.h
|
||||
miscbltin.o: syntax.h
|
||||
miscbltin.po: syntax.h
|
||||
mystring.o: syntax.h
|
||||
mystring.po: syntax.h
|
||||
nodes.o: nodes.c
|
||||
nodes.o: nodes.h
|
||||
nodes.po: nodes.c
|
||||
nodes.po: nodes.h
|
||||
options.o: builtins.h
|
||||
options.o: nodes.h
|
||||
options.po: builtins.h
|
||||
options.po: nodes.h
|
||||
output.o: syntax.h
|
||||
output.po: syntax.h
|
||||
parser.o: nodes.h
|
||||
parser.o: syntax.h
|
||||
parser.o: token.h
|
||||
parser.po: nodes.h
|
||||
parser.po: syntax.h
|
||||
parser.po: token.h
|
||||
printf.o: builtins.h
|
||||
printf.po: builtins.h
|
||||
redir.o: nodes.h
|
||||
redir.po: nodes.h
|
||||
show.o: nodes.h
|
||||
show.po: nodes.h
|
||||
syntax.o: syntax.c
|
||||
syntax.o: syntax.h
|
||||
syntax.po: syntax.c
|
||||
syntax.po: syntax.h
|
||||
test.o: builtins.h
|
||||
test.po: builtins.h
|
||||
trap.o: builtins.h
|
||||
trap.o: nodes.h
|
||||
trap.o: syntax.h
|
||||
trap.po: builtins.h
|
||||
trap.po: nodes.h
|
||||
trap.po: syntax.h
|
||||
var.o: builtins.h
|
||||
var.o: nodes.h
|
||||
var.o: syntax.h
|
||||
var.po: builtins.h
|
||||
var.po: nodes.h
|
||||
var.po: syntax.h
|
||||
.endif
|
||||
18
bin/sleep/Makefile.depend
Normal file
18
bin/sleep/Makefile.depend
Normal file
@ -0,0 +1,18 @@
|
||||
# $FreeBSD$
|
||||
# Autogenerated - do NOT edit!
|
||||
|
||||
DIRDEPS = \
|
||||
gnu/lib/csu \
|
||||
gnu/lib/libgcc \
|
||||
include \
|
||||
include/xlocale \
|
||||
lib/${CSU_DIR} \
|
||||
lib/libc \
|
||||
lib/libcompiler_rt \
|
||||
|
||||
|
||||
.include <dirdeps.mk>
|
||||
|
||||
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
|
||||
# local dependencies - needed for -jN in clean tree
|
||||
.endif
|
||||
18
bin/stty/Makefile.depend
Normal file
18
bin/stty/Makefile.depend
Normal file
@ -0,0 +1,18 @@
|
||||
# $FreeBSD$
|
||||
# Autogenerated - do NOT edit!
|
||||
|
||||
DIRDEPS = \
|
||||
gnu/lib/csu \
|
||||
gnu/lib/libgcc \
|
||||
include \
|
||||
include/xlocale \
|
||||
lib/${CSU_DIR} \
|
||||
lib/libc \
|
||||
lib/libcompiler_rt \
|
||||
|
||||
|
||||
.include <dirdeps.mk>
|
||||
|
||||
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
|
||||
# local dependencies - needed for -jN in clean tree
|
||||
.endif
|
||||
17
bin/sync/Makefile.depend
Normal file
17
bin/sync/Makefile.depend
Normal file
@ -0,0 +1,17 @@
|
||||
# $FreeBSD$
|
||||
# Autogenerated - do NOT edit!
|
||||
|
||||
DIRDEPS = \
|
||||
gnu/lib/csu \
|
||||
gnu/lib/libgcc \
|
||||
include \
|
||||
lib/${CSU_DIR} \
|
||||
lib/libc \
|
||||
lib/libcompiler_rt \
|
||||
|
||||
|
||||
.include <dirdeps.mk>
|
||||
|
||||
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
|
||||
# local dependencies - needed for -jN in clean tree
|
||||
.endif
|
||||
18
bin/test/Makefile.depend
Normal file
18
bin/test/Makefile.depend
Normal file
@ -0,0 +1,18 @@
|
||||
# $FreeBSD$
|
||||
# Autogenerated - do NOT edit!
|
||||
|
||||
DIRDEPS = \
|
||||
gnu/lib/csu \
|
||||
gnu/lib/libgcc \
|
||||
include \
|
||||
include/xlocale \
|
||||
lib/${CSU_DIR} \
|
||||
lib/libc \
|
||||
lib/libcompiler_rt \
|
||||
|
||||
|
||||
.include <dirdeps.mk>
|
||||
|
||||
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
|
||||
# local dependencies - needed for -jN in clean tree
|
||||
.endif
|
||||
17
bin/uuidgen/Makefile.depend
Normal file
17
bin/uuidgen/Makefile.depend
Normal file
@ -0,0 +1,17 @@
|
||||
# $FreeBSD$
|
||||
# Autogenerated - do NOT edit!
|
||||
|
||||
DIRDEPS = \
|
||||
gnu/lib/csu \
|
||||
gnu/lib/libgcc \
|
||||
include \
|
||||
lib/${CSU_DIR} \
|
||||
lib/libc \
|
||||
lib/libcompiler_rt \
|
||||
|
||||
|
||||
.include <dirdeps.mk>
|
||||
|
||||
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
|
||||
# local dependencies - needed for -jN in clean tree
|
||||
.endif
|
||||
@ -157,14 +157,22 @@ static ls_event_info_t g_event_info[LS_MAX_EVENTS] = {
|
||||
"lockstat:::rw-block", "arg2 != 0 && arg3 == 1" },
|
||||
{ 'C', "Lock", "R/W reader blocked by write wanted", "nsec",
|
||||
"lockstat:::rw-block", "arg2 != 0 && arg3 == 0 && arg4" },
|
||||
{ 'C', "Lock", "Unknown event (type 8)", "units" },
|
||||
{ 'C', "Lock", "Unknown event (type 9)", "units" },
|
||||
{ 'C', "Lock", "Unknown event (type 10)", "units" },
|
||||
{ 'C', "Lock", "Unknown event (type 11)", "units" },
|
||||
{ 'C', "Lock", "Unknown event (type 12)", "units" },
|
||||
{ 'C', "Lock", "Unknown event (type 13)", "units" },
|
||||
{ 'C', "Lock", "Unknown event (type 14)", "units" },
|
||||
{ 'C', "Lock", "Unknown event (type 15)", "units" },
|
||||
{ 'C', "Lock", "R/W writer spin on writer", "nsec",
|
||||
"lockstat:::rw-spin", "arg2 == 0 && arg3 == 1" },
|
||||
{ 'C', "Lock", "R/W writer spin on readers", "nsec",
|
||||
"lockstat:::rw-spin", "arg2 == 0 && arg3 == 0 && arg4" },
|
||||
{ 'C', "Lock", "R/W reader spin on writer", "nsec",
|
||||
"lockstat:::rw-spin", "arg2 != 0 && arg3 == 1" },
|
||||
{ 'C', "Lock", "R/W reader spin on write wanted", "nsec",
|
||||
"lockstat:::rw-spin", "arg2 != 0 && arg3 == 0 && arg4" },
|
||||
{ 'C', "Lock", "SX exclusive block", "nsec",
|
||||
"lockstat:::sx-block", "arg2 == 0" },
|
||||
{ 'C', "Lock", "SX shared block", "nsec",
|
||||
"lockstat:::sx-block", "arg2 != 0" },
|
||||
{ 'C', "Lock", "SX exclusive spin", "nsec",
|
||||
"lockstat:::sx-spin", "arg2 == 0" },
|
||||
{ 'C', "Lock", "SX shared spin", "nsec",
|
||||
"lockstat:::sx-spin", "arg2 != 0" },
|
||||
{ 'C', "Lock", "Unknown event (type 16)", "units" },
|
||||
{ 'C', "Lock", "Unknown event (type 17)", "units" },
|
||||
{ 'C', "Lock", "Unknown event (type 18)", "units" },
|
||||
@ -188,13 +196,17 @@ static ls_event_info_t g_event_info[LS_MAX_EVENTS] = {
|
||||
"lockstat:::spin-release", NULL,
|
||||
"lockstat:::spin-acquire" },
|
||||
{ 'H', "Lock", "R/W writer hold", "nsec",
|
||||
"lockstat:::rw-release", "arg1 == 0",
|
||||
"lockstat:::rw-acquire" },
|
||||
"lockstat::rw_wunlock:rw-release", NULL,
|
||||
"lockstat::rw_wlock:rw-acquire" },
|
||||
{ 'H', "Lock", "R/W reader hold", "nsec",
|
||||
"lockstat:::rw-release", "arg1 != 0",
|
||||
"lockstat:::rw-acquire" },
|
||||
{ 'H', "Lock", "Unknown event (type 36)", "units" },
|
||||
{ 'H', "Lock", "Unknown event (type 37)", "units" },
|
||||
"lockstat::rw_runlock:rw-release", NULL,
|
||||
"lockstat::rw_rlock:rw-acquire" },
|
||||
{ 'H', "Lock", "SX shared hold", "nsec",
|
||||
"lockstat::sx_sunlock:sx-release", NULL,
|
||||
"lockstat::sx_slock:sx-acquire" },
|
||||
{ 'H', "Lock", "SX exclusive hold", "nsec",
|
||||
"lockstat::sx_xunlock:sx-release", NULL,
|
||||
"lockstat::sx_xlock:sx-acquire" },
|
||||
{ 'H', "Lock", "Unknown event (type 38)", "units" },
|
||||
{ 'H', "Lock", "Unknown event (type 39)", "units" },
|
||||
{ 'H', "Lock", "Unknown event (type 40)", "units" },
|
||||
|
||||
@ -90,10 +90,10 @@ uint8_t dump_opt[256];
|
||||
typedef void object_viewer_t(objset_t *, uint64_t, void *data, size_t size);
|
||||
|
||||
extern void dump_intent_log(zilog_t *);
|
||||
uint64_t *zopt_object = NULL;
|
||||
int zopt_objects = 0;
|
||||
libzfs_handle_t *g_zfs;
|
||||
uint64_t max_inflight = 1000;
|
||||
static uint64_t *zopt_object = NULL;
|
||||
static int zopt_objects = 0;
|
||||
static libzfs_handle_t *g_zfs;
|
||||
static uint64_t max_inflight = 1000;
|
||||
|
||||
/*
|
||||
* These libumem hooks provide a reasonable set of defaults for the allocator's
|
||||
@ -1488,16 +1488,14 @@ dump_deadlist(dsl_deadlist_t *dl)
|
||||
dle = AVL_NEXT(&dl->dl_tree, dle)) {
|
||||
if (dump_opt['d'] >= 5) {
|
||||
char buf[128];
|
||||
(void) snprintf(buf, sizeof (buf), "mintxg %llu -> ",
|
||||
(longlong_t)dle->dle_mintxg,
|
||||
(void) snprintf(buf, sizeof (buf), "mintxg %llu -> "
|
||||
"obj %llu", (longlong_t)dle->dle_mintxg,
|
||||
(longlong_t)dle->dle_bpobj.bpo_object);
|
||||
|
||||
dump_bpobj(&dle->dle_bpobj, buf, 0);
|
||||
} else {
|
||||
(void) printf("mintxg %llu -> obj %llu\n",
|
||||
(longlong_t)dle->dle_mintxg,
|
||||
(longlong_t)dle->dle_bpobj.bpo_object);
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -592,6 +592,17 @@ finish_progress(char *done)
|
||||
pt_header = NULL;
|
||||
}
|
||||
|
||||
/*
|
||||
* Check if the dataset is mountable and should be automatically mounted.
|
||||
*/
|
||||
static boolean_t
|
||||
should_auto_mount(zfs_handle_t *zhp)
|
||||
{
|
||||
if (!zfs_prop_valid_for_type(ZFS_PROP_CANMOUNT, zfs_get_type(zhp)))
|
||||
return (B_FALSE);
|
||||
return (zfs_prop_get_int(zhp, ZFS_PROP_CANMOUNT) == ZFS_CANMOUNT_ON);
|
||||
}
|
||||
|
||||
/*
|
||||
* zfs clone [-p] [-o prop=value] ... <snap> <fs | vol>
|
||||
*
|
||||
@ -677,9 +688,22 @@ zfs_do_clone(int argc, char **argv)
|
||||
|
||||
clone = zfs_open(g_zfs, argv[1], ZFS_TYPE_DATASET);
|
||||
if (clone != NULL) {
|
||||
if (zfs_get_type(clone) != ZFS_TYPE_VOLUME)
|
||||
if ((ret = zfs_mount(clone, NULL, 0)) == 0)
|
||||
ret = zfs_share(clone);
|
||||
/*
|
||||
* If the user doesn't want the dataset
|
||||
* automatically mounted, then skip the mount/share
|
||||
* step.
|
||||
*/
|
||||
if (should_auto_mount(clone)) {
|
||||
if ((ret = zfs_mount(clone, NULL, 0)) != 0) {
|
||||
(void) fprintf(stderr, gettext("clone "
|
||||
"successfully created, "
|
||||
"but not mounted\n"));
|
||||
} else if ((ret = zfs_share(clone)) != 0) {
|
||||
(void) fprintf(stderr, gettext("clone "
|
||||
"successfully created, "
|
||||
"but not shared\n"));
|
||||
}
|
||||
}
|
||||
zfs_close(clone);
|
||||
}
|
||||
}
|
||||
@ -728,7 +752,6 @@ zfs_do_create(int argc, char **argv)
|
||||
int ret = 1;
|
||||
nvlist_t *props;
|
||||
uint64_t intval;
|
||||
int canmount = ZFS_CANMOUNT_OFF;
|
||||
|
||||
if (nvlist_alloc(&props, NV_UNIQUE_NAME, 0) != 0)
|
||||
nomem();
|
||||
@ -868,19 +891,15 @@ zfs_do_create(int argc, char **argv)
|
||||
goto error;
|
||||
|
||||
ret = 0;
|
||||
/*
|
||||
* if the user doesn't want the dataset automatically mounted,
|
||||
* then skip the mount/share step
|
||||
*/
|
||||
if (zfs_prop_valid_for_type(ZFS_PROP_CANMOUNT, type))
|
||||
canmount = zfs_prop_get_int(zhp, ZFS_PROP_CANMOUNT);
|
||||
|
||||
/*
|
||||
* Mount and/or share the new filesystem as appropriate. We provide a
|
||||
* verbose error message to let the user know that their filesystem was
|
||||
* in fact created, even if we failed to mount or share it.
|
||||
* If the user doesn't want the dataset automatically mounted,
|
||||
* then skip the mount/share step altogether.
|
||||
*/
|
||||
if (!nomount && canmount == ZFS_CANMOUNT_ON) {
|
||||
if (!nomount && should_auto_mount(zhp)) {
|
||||
if (zfs_mount(zhp, NULL, 0) != 0) {
|
||||
(void) fprintf(stderr, gettext("filesystem "
|
||||
"successfully created, but not mounted\n"));
|
||||
|
||||
@ -20,7 +20,7 @@
|
||||
*/
|
||||
/*
|
||||
* Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
|
||||
* Copyright (c) 2011, 2014 by Delphix. All rights reserved.
|
||||
* Copyright (c) 2011, 2015 by Delphix. All rights reserved.
|
||||
* Copyright 2011 Nexenta Systems, Inc. All rights reserved.
|
||||
* Copyright (c) 2012 Martin Matuska <mm@FreeBSD.org>. All rights reserved.
|
||||
* Copyright (c) 2013 Steven Hartland. All rights reserved.
|
||||
@ -969,21 +969,6 @@ ztest_random_spa_version(uint64_t initial_version)
|
||||
return (version);
|
||||
}
|
||||
|
||||
/*
|
||||
* Find the largest ashift used
|
||||
*/
|
||||
static uint64_t
|
||||
ztest_spa_get_ashift() {
|
||||
uint64_t i;
|
||||
uint64_t ashift = SPA_MINBLOCKSHIFT;
|
||||
vdev_t *rvd = ztest_spa->spa_root_vdev;
|
||||
|
||||
for (i = 0; i < rvd->vdev_children; i++) {
|
||||
ashift = MAX(ashift, rvd->vdev_child[i]->vdev_ashift);
|
||||
}
|
||||
return (ashift);
|
||||
}
|
||||
|
||||
static int
|
||||
ztest_random_blocksize(void)
|
||||
{
|
||||
@ -995,7 +980,7 @@ ztest_random_blocksize(void)
|
||||
int maxbs = SPA_OLD_MAXBLOCKSHIFT;
|
||||
if (spa_maxblocksize(ztest_spa) == SPA_MAXBLOCKSIZE)
|
||||
maxbs = 20;
|
||||
block_shift = ztest_random(maxbs - ztest_spa_get_ashift() + 1);
|
||||
block_shift = ztest_random(maxbs - ztest_spa->spa_max_ashift + 1);
|
||||
return (1 << (SPA_MINBLOCKSHIFT + block_shift));
|
||||
}
|
||||
|
||||
|
||||
@ -23,6 +23,7 @@
|
||||
* Copyright 2015 Nexenta Systems, Inc. All rights reserved.
|
||||
* Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
|
||||
* Copyright (c) 2013 by Delphix. All rights reserved.
|
||||
* Copyright 2015 RackTop Systems.
|
||||
*/
|
||||
|
||||
/*
|
||||
@ -1094,11 +1095,7 @@ zpool_open_func(void *arg)
|
||||
}
|
||||
(void) close(fd);
|
||||
|
||||
|
||||
rn->rn_config = config;
|
||||
if (config != NULL) {
|
||||
assert(rn->rn_nozpool == B_FALSE);
|
||||
}
|
||||
}
|
||||
|
||||
/*
|
||||
|
||||
14
cddl/lib/drti/Makefile.depend
Normal file
14
cddl/lib/drti/Makefile.depend
Normal file
@ -0,0 +1,14 @@
|
||||
# $FreeBSD$
|
||||
# Autogenerated - do NOT edit!
|
||||
|
||||
DIRDEPS = \
|
||||
include \
|
||||
include/xlocale \
|
||||
lib/libelf \
|
||||
|
||||
|
||||
.include <dirdeps.mk>
|
||||
|
||||
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
|
||||
# local dependencies - needed for -jN in clean tree
|
||||
.endif
|
||||
18
cddl/lib/libavl/Makefile.depend
Normal file
18
cddl/lib/libavl/Makefile.depend
Normal file
@ -0,0 +1,18 @@
|
||||
# $FreeBSD$
|
||||
# Autogenerated - do NOT edit!
|
||||
|
||||
DIRDEPS = \
|
||||
gnu/lib/csu \
|
||||
gnu/lib/libgcc \
|
||||
include \
|
||||
lib/${CSU_DIR} \
|
||||
lib/libc \
|
||||
lib/libcompiler_rt \
|
||||
usr.bin/xinstall.host \
|
||||
|
||||
|
||||
.include <dirdeps.mk>
|
||||
|
||||
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
|
||||
# local dependencies - needed for -jN in clean tree
|
||||
.endif
|
||||
21
cddl/lib/libctf/Makefile.depend
Normal file
21
cddl/lib/libctf/Makefile.depend
Normal file
@ -0,0 +1,21 @@
|
||||
# $FreeBSD$
|
||||
# Autogenerated - do NOT edit!
|
||||
|
||||
DIRDEPS = \
|
||||
gnu/lib/csu \
|
||||
gnu/lib/libgcc \
|
||||
include \
|
||||
include/xlocale \
|
||||
lib/${CSU_DIR} \
|
||||
lib/libc \
|
||||
lib/libcompiler_rt \
|
||||
lib/libelf \
|
||||
lib/libz \
|
||||
usr.bin/xinstall.host \
|
||||
|
||||
|
||||
.include <dirdeps.mk>
|
||||
|
||||
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
|
||||
# local dependencies - needed for -jN in clean tree
|
||||
.endif
|
||||
53
cddl/lib/libdtrace/Makefile.depend
Normal file
53
cddl/lib/libdtrace/Makefile.depend
Normal file
@ -0,0 +1,53 @@
|
||||
# $FreeBSD$
|
||||
# Autogenerated - do NOT edit!
|
||||
|
||||
DIRDEPS = \
|
||||
cddl/lib/libctf \
|
||||
gnu/lib/csu \
|
||||
gnu/lib/libgcc \
|
||||
include \
|
||||
include/arpa \
|
||||
include/xlocale \
|
||||
lib/${CSU_DIR} \
|
||||
lib/libc \
|
||||
lib/libcompiler_rt \
|
||||
lib/libelf \
|
||||
lib/libproc \
|
||||
lib/librtld_db \
|
||||
lib/libthr \
|
||||
usr.bin/xinstall.host \
|
||||
usr.bin/yacc.host \
|
||||
|
||||
|
||||
.include <dirdeps.mk>
|
||||
|
||||
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
|
||||
# local dependencies - needed for -jN in clean tree
|
||||
dt_cc.So: dt_grammar.h
|
||||
dt_cc.o: dt_grammar.h
|
||||
dt_cc.po: dt_grammar.h
|
||||
dt_cg.So: dt_grammar.h
|
||||
dt_cg.o: dt_grammar.h
|
||||
dt_cg.po: dt_grammar.h
|
||||
dt_errtags.So: dt_errtags.c
|
||||
dt_errtags.o: dt_errtags.c
|
||||
dt_errtags.po: dt_errtags.c
|
||||
dt_grammar.So: dt_grammar.c
|
||||
dt_grammar.o: dt_grammar.c
|
||||
dt_grammar.po: dt_grammar.c
|
||||
dt_lex.So: dt_grammar.h
|
||||
dt_lex.So: dt_lex.c
|
||||
dt_lex.o: dt_grammar.h
|
||||
dt_lex.o: dt_lex.c
|
||||
dt_lex.po: dt_grammar.h
|
||||
dt_lex.po: dt_lex.c
|
||||
dt_names.So: dt_names.c
|
||||
dt_names.o: dt_names.c
|
||||
dt_names.po: dt_names.c
|
||||
dt_parser.So: dt_grammar.h
|
||||
dt_parser.o: dt_grammar.h
|
||||
dt_parser.po: dt_grammar.h
|
||||
dt_xlator.So: dt_grammar.h
|
||||
dt_xlator.o: dt_grammar.h
|
||||
dt_xlator.po: dt_grammar.h
|
||||
.endif
|
||||
20
cddl/lib/libnvpair/Makefile.depend
Normal file
20
cddl/lib/libnvpair/Makefile.depend
Normal file
@ -0,0 +1,20 @@
|
||||
# $FreeBSD$
|
||||
# Autogenerated - do NOT edit!
|
||||
|
||||
DIRDEPS = \
|
||||
gnu/lib/csu \
|
||||
gnu/lib/libgcc \
|
||||
include \
|
||||
include/xlocale \
|
||||
lib/${CSU_DIR} \
|
||||
lib/libc \
|
||||
lib/libcompiler_rt \
|
||||
lib/msun \
|
||||
usr.bin/xinstall.host \
|
||||
|
||||
|
||||
.include <dirdeps.mk>
|
||||
|
||||
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
|
||||
# local dependencies - needed for -jN in clean tree
|
||||
.endif
|
||||
18
cddl/lib/libumem/Makefile.depend
Normal file
18
cddl/lib/libumem/Makefile.depend
Normal file
@ -0,0 +1,18 @@
|
||||
# $FreeBSD$
|
||||
# Autogenerated - do NOT edit!
|
||||
|
||||
DIRDEPS = \
|
||||
gnu/lib/csu \
|
||||
gnu/lib/libgcc \
|
||||
include \
|
||||
lib/${CSU_DIR} \
|
||||
lib/libc \
|
||||
lib/libcompiler_rt \
|
||||
usr.bin/xinstall.host \
|
||||
|
||||
|
||||
.include <dirdeps.mk>
|
||||
|
||||
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
|
||||
# local dependencies - needed for -jN in clean tree
|
||||
.endif
|
||||
19
cddl/lib/libuutil/Makefile.depend
Normal file
19
cddl/lib/libuutil/Makefile.depend
Normal file
@ -0,0 +1,19 @@
|
||||
# $FreeBSD$
|
||||
# Autogenerated - do NOT edit!
|
||||
|
||||
DIRDEPS = \
|
||||
gnu/lib/csu \
|
||||
gnu/lib/libgcc \
|
||||
include \
|
||||
include/xlocale \
|
||||
lib/${CSU_DIR} \
|
||||
lib/libc \
|
||||
lib/libcompiler_rt \
|
||||
usr.bin/xinstall.host \
|
||||
|
||||
|
||||
.include <dirdeps.mk>
|
||||
|
||||
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
|
||||
# local dependencies - needed for -jN in clean tree
|
||||
.endif
|
||||
@ -37,7 +37,6 @@ SRCS+= libzfs_changelist.c \
|
||||
zfs_comutil.c \
|
||||
zfs_deleg.c \
|
||||
zfs_fletcher.c \
|
||||
zfs_ioctl_compat.c \
|
||||
zfs_namecheck.c \
|
||||
zfs_prop.c \
|
||||
zpool_prop.c \
|
||||
|
||||
30
cddl/lib/libzfs/Makefile.depend
Normal file
30
cddl/lib/libzfs/Makefile.depend
Normal file
@ -0,0 +1,30 @@
|
||||
# $FreeBSD$
|
||||
# Autogenerated - do NOT edit!
|
||||
|
||||
DIRDEPS = \
|
||||
cddl/lib/libavl \
|
||||
cddl/lib/libnvpair \
|
||||
cddl/lib/libumem \
|
||||
cddl/lib/libuutil \
|
||||
cddl/lib/libzfs_core \
|
||||
gnu/lib/csu \
|
||||
gnu/lib/libgcc \
|
||||
include \
|
||||
include/xlocale \
|
||||
lib/${CSU_DIR} \
|
||||
lib/libc \
|
||||
lib/libcompiler_rt \
|
||||
lib/libexpat \
|
||||
lib/libgeom \
|
||||
lib/libmd \
|
||||
lib/libthr \
|
||||
lib/libutil \
|
||||
lib/msun \
|
||||
usr.bin/xinstall.host \
|
||||
|
||||
|
||||
.include <dirdeps.mk>
|
||||
|
||||
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
|
||||
# local dependencies - needed for -jN in clean tree
|
||||
.endif
|
||||
@ -11,7 +11,8 @@ DPADD= ${LIBNVPAIR}
|
||||
LDADD= -lnvpair
|
||||
|
||||
SRCS= libzfs_core.c \
|
||||
libzfs_core_compat.c
|
||||
libzfs_core_compat.c \
|
||||
zfs_ioctl_compat.c
|
||||
|
||||
SRCS+= libzfs_compat.c
|
||||
|
||||
|
||||
21
cddl/lib/libzfs_core/Makefile.depend
Normal file
21
cddl/lib/libzfs_core/Makefile.depend
Normal file
@ -0,0 +1,21 @@
|
||||
# $FreeBSD$
|
||||
# Autogenerated - do NOT edit!
|
||||
|
||||
DIRDEPS = \
|
||||
cddl/lib/libnvpair \
|
||||
gnu/lib/csu \
|
||||
gnu/lib/libgcc \
|
||||
include \
|
||||
include/xlocale \
|
||||
lib/${CSU_DIR} \
|
||||
lib/libc \
|
||||
lib/libcompiler_rt \
|
||||
lib/msun \
|
||||
usr.bin/xinstall.host \
|
||||
|
||||
|
||||
.include <dirdeps.mk>
|
||||
|
||||
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
|
||||
# local dependencies - needed for -jN in clean tree
|
||||
.endif
|
||||
26
cddl/lib/libzpool/Makefile.depend
Normal file
26
cddl/lib/libzpool/Makefile.depend
Normal file
@ -0,0 +1,26 @@
|
||||
# $FreeBSD$
|
||||
# Autogenerated - do NOT edit!
|
||||
|
||||
DIRDEPS = \
|
||||
cddl/lib/libavl \
|
||||
cddl/lib/libnvpair \
|
||||
cddl/lib/libumem \
|
||||
gnu/lib/csu \
|
||||
gnu/lib/libgcc \
|
||||
include \
|
||||
include/xlocale \
|
||||
lib/${CSU_DIR} \
|
||||
lib/libc \
|
||||
lib/libcompiler_rt \
|
||||
lib/libmd \
|
||||
lib/libthr \
|
||||
lib/libz \
|
||||
lib/msun \
|
||||
usr.bin/xinstall.host \
|
||||
|
||||
|
||||
.include <dirdeps.mk>
|
||||
|
||||
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
|
||||
# local dependencies - needed for -jN in clean tree
|
||||
.endif
|
||||
32
cddl/sbin/zfs/Makefile.depend
Normal file
32
cddl/sbin/zfs/Makefile.depend
Normal file
@ -0,0 +1,32 @@
|
||||
# $FreeBSD$
|
||||
# Autogenerated - do NOT edit!
|
||||
|
||||
DIRDEPS = \
|
||||
cddl/lib/libavl \
|
||||
cddl/lib/libnvpair \
|
||||
cddl/lib/libumem \
|
||||
cddl/lib/libuutil \
|
||||
cddl/lib/libzfs \
|
||||
cddl/lib/libzfs_core \
|
||||
gnu/lib/csu \
|
||||
gnu/lib/libgcc \
|
||||
include \
|
||||
include/xlocale \
|
||||
lib/${CSU_DIR} \
|
||||
lib/libc \
|
||||
lib/libcompiler_rt \
|
||||
lib/libexpat \
|
||||
lib/libgeom \
|
||||
lib/libjail \
|
||||
lib/libmd \
|
||||
lib/libsbuf \
|
||||
lib/libthr \
|
||||
lib/libutil \
|
||||
lib/msun \
|
||||
|
||||
|
||||
.include <dirdeps.mk>
|
||||
|
||||
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
|
||||
# local dependencies - needed for -jN in clean tree
|
||||
.endif
|
||||
31
cddl/sbin/zpool/Makefile.depend
Normal file
31
cddl/sbin/zpool/Makefile.depend
Normal file
@ -0,0 +1,31 @@
|
||||
# $FreeBSD$
|
||||
# Autogenerated - do NOT edit!
|
||||
|
||||
DIRDEPS = \
|
||||
cddl/lib/libavl \
|
||||
cddl/lib/libnvpair \
|
||||
cddl/lib/libumem \
|
||||
cddl/lib/libuutil \
|
||||
cddl/lib/libzfs \
|
||||
cddl/lib/libzfs_core \
|
||||
gnu/lib/csu \
|
||||
gnu/lib/libgcc \
|
||||
include \
|
||||
include/xlocale \
|
||||
lib/${CSU_DIR} \
|
||||
lib/libc \
|
||||
lib/libcompiler_rt \
|
||||
lib/libexpat \
|
||||
lib/libgeom \
|
||||
lib/libmd \
|
||||
lib/libsbuf \
|
||||
lib/libthr \
|
||||
lib/libutil \
|
||||
lib/msun \
|
||||
|
||||
|
||||
.include <dirdeps.mk>
|
||||
|
||||
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
|
||||
# local dependencies - needed for -jN in clean tree
|
||||
.endif
|
||||
26
cddl/usr.bin/ctfconvert/Makefile.depend
Normal file
26
cddl/usr.bin/ctfconvert/Makefile.depend
Normal file
@ -0,0 +1,26 @@
|
||||
# $FreeBSD$
|
||||
# Autogenerated - do NOT edit!
|
||||
|
||||
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
|
||||
|
||||
DIRDEPS = \
|
||||
cddl/lib/libctf \
|
||||
gnu/lib/csu \
|
||||
gnu/lib/libgcc \
|
||||
include \
|
||||
include/xlocale \
|
||||
lib/${CSU_DIR} \
|
||||
lib/libc \
|
||||
lib/libc_nonshared \
|
||||
lib/libcompiler_rt \
|
||||
lib/libdwarf \
|
||||
lib/libelf \
|
||||
lib/libthr \
|
||||
lib/libz \
|
||||
|
||||
|
||||
.include <dirdeps.mk>
|
||||
|
||||
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
|
||||
# local dependencies - needed for -jN in clean tree
|
||||
.endif
|
||||
24
cddl/usr.bin/ctfdump/Makefile.depend
Normal file
24
cddl/usr.bin/ctfdump/Makefile.depend
Normal file
@ -0,0 +1,24 @@
|
||||
# $FreeBSD$
|
||||
# Autogenerated - do NOT edit!
|
||||
|
||||
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
|
||||
|
||||
DIRDEPS = \
|
||||
gnu/lib/csu \
|
||||
gnu/lib/libgcc \
|
||||
include \
|
||||
include/xlocale \
|
||||
lib/${CSU_DIR} \
|
||||
lib/libc \
|
||||
lib/libc_nonshared \
|
||||
lib/libcompiler_rt \
|
||||
lib/libelf \
|
||||
lib/libthr \
|
||||
lib/libz \
|
||||
|
||||
|
||||
.include <dirdeps.mk>
|
||||
|
||||
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
|
||||
# local dependencies - needed for -jN in clean tree
|
||||
.endif
|
||||
26
cddl/usr.bin/ctfmerge/Makefile.depend
Normal file
26
cddl/usr.bin/ctfmerge/Makefile.depend
Normal file
@ -0,0 +1,26 @@
|
||||
# $FreeBSD$
|
||||
# Autogenerated - do NOT edit!
|
||||
|
||||
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
|
||||
|
||||
DIRDEPS = \
|
||||
cddl/lib/libctf \
|
||||
gnu/lib/csu \
|
||||
gnu/lib/libgcc \
|
||||
include \
|
||||
include/xlocale \
|
||||
lib/${CSU_DIR} \
|
||||
lib/libc \
|
||||
lib/libc_nonshared \
|
||||
lib/libcompiler_rt \
|
||||
lib/libdwarf \
|
||||
lib/libelf \
|
||||
lib/libthr \
|
||||
lib/libz \
|
||||
|
||||
|
||||
.include <dirdeps.mk>
|
||||
|
||||
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
|
||||
# local dependencies - needed for -jN in clean tree
|
||||
.endif
|
||||
19
cddl/usr.bin/sgsmsg/Makefile.depend
Normal file
19
cddl/usr.bin/sgsmsg/Makefile.depend
Normal file
@ -0,0 +1,19 @@
|
||||
# $FreeBSD$
|
||||
# Autogenerated - do NOT edit!
|
||||
|
||||
DIRDEPS = \
|
||||
gnu/lib/csu \
|
||||
gnu/lib/libgcc \
|
||||
include \
|
||||
include/xlocale \
|
||||
lib/${CSU_DIR} \
|
||||
lib/libc \
|
||||
lib/libcompiler_rt \
|
||||
lib/libelf \
|
||||
|
||||
|
||||
.include <dirdeps.mk>
|
||||
|
||||
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
|
||||
# local dependencies - needed for -jN in clean tree
|
||||
.endif
|
||||
33
cddl/usr.bin/zinject/Makefile.depend
Normal file
33
cddl/usr.bin/zinject/Makefile.depend
Normal file
@ -0,0 +1,33 @@
|
||||
# $FreeBSD$
|
||||
# Autogenerated - do NOT edit!
|
||||
|
||||
DIRDEPS = \
|
||||
cddl/lib/libavl \
|
||||
cddl/lib/libnvpair \
|
||||
cddl/lib/libumem \
|
||||
cddl/lib/libuutil \
|
||||
cddl/lib/libzfs \
|
||||
cddl/lib/libzfs_core \
|
||||
cddl/lib/libzpool \
|
||||
gnu/lib/csu \
|
||||
gnu/lib/libgcc \
|
||||
include \
|
||||
include/xlocale \
|
||||
lib/${CSU_DIR} \
|
||||
lib/libc \
|
||||
lib/libcompiler_rt \
|
||||
lib/libexpat \
|
||||
lib/libgeom \
|
||||
lib/libmd \
|
||||
lib/libsbuf \
|
||||
lib/libthr \
|
||||
lib/libutil \
|
||||
lib/libz \
|
||||
lib/msun \
|
||||
|
||||
|
||||
.include <dirdeps.mk>
|
||||
|
||||
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
|
||||
# local dependencies - needed for -jN in clean tree
|
||||
.endif
|
||||
26
cddl/usr.bin/zstreamdump/Makefile.depend
Normal file
26
cddl/usr.bin/zstreamdump/Makefile.depend
Normal file
@ -0,0 +1,26 @@
|
||||
# $FreeBSD$
|
||||
# Autogenerated - do NOT edit!
|
||||
|
||||
DIRDEPS = \
|
||||
cddl/lib/libavl \
|
||||
cddl/lib/libnvpair \
|
||||
cddl/lib/libumem \
|
||||
cddl/lib/libzpool \
|
||||
gnu/lib/csu \
|
||||
gnu/lib/libgcc \
|
||||
include \
|
||||
include/xlocale \
|
||||
lib/${CSU_DIR} \
|
||||
lib/libc \
|
||||
lib/libcompiler_rt \
|
||||
lib/libmd \
|
||||
lib/libthr \
|
||||
lib/libz \
|
||||
lib/msun \
|
||||
|
||||
|
||||
.include <dirdeps.mk>
|
||||
|
||||
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
|
||||
# local dependencies - needed for -jN in clean tree
|
||||
.endif
|
||||
33
cddl/usr.bin/ztest/Makefile.depend
Normal file
33
cddl/usr.bin/ztest/Makefile.depend
Normal file
@ -0,0 +1,33 @@
|
||||
# $FreeBSD$
|
||||
# Autogenerated - do NOT edit!
|
||||
|
||||
DIRDEPS = \
|
||||
cddl/lib/libavl \
|
||||
cddl/lib/libnvpair \
|
||||
cddl/lib/libumem \
|
||||
cddl/lib/libuutil \
|
||||
cddl/lib/libzfs \
|
||||
cddl/lib/libzfs_core \
|
||||
cddl/lib/libzpool \
|
||||
gnu/lib/csu \
|
||||
gnu/lib/libgcc \
|
||||
include \
|
||||
include/xlocale \
|
||||
lib/${CSU_DIR} \
|
||||
lib/libc \
|
||||
lib/libcompiler_rt \
|
||||
lib/libexpat \
|
||||
lib/libgeom \
|
||||
lib/libmd \
|
||||
lib/libsbuf \
|
||||
lib/libthr \
|
||||
lib/libutil \
|
||||
lib/libz \
|
||||
lib/msun \
|
||||
|
||||
|
||||
.include <dirdeps.mk>
|
||||
|
||||
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
|
||||
# local dependencies - needed for -jN in clean tree
|
||||
.endif
|
||||
32
cddl/usr.sbin/dtrace/Makefile.depend
Normal file
32
cddl/usr.sbin/dtrace/Makefile.depend
Normal file
@ -0,0 +1,32 @@
|
||||
# $FreeBSD$
|
||||
# Autogenerated - do NOT edit!
|
||||
|
||||
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
|
||||
|
||||
DIRDEPS = \
|
||||
cddl/lib/libctf \
|
||||
cddl/lib/libdtrace \
|
||||
gnu/lib/csu \
|
||||
gnu/lib/libgcc \
|
||||
include \
|
||||
include/xlocale \
|
||||
lib/${CSU_DIR} \
|
||||
lib/libc \
|
||||
lib/libc_nonshared \
|
||||
lib/libcompiler_rt \
|
||||
lib/libcxxrt \
|
||||
lib/libelf \
|
||||
lib/libproc \
|
||||
lib/librtld_db \
|
||||
lib/libthr \
|
||||
lib/libutil \
|
||||
lib/liby \
|
||||
lib/libz \
|
||||
usr.bin/lex/lib \
|
||||
|
||||
|
||||
.include <dirdeps.mk>
|
||||
|
||||
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
|
||||
# local dependencies - needed for -jN in clean tree
|
||||
.endif
|
||||
13
cddl/usr.sbin/dtruss/Makefile.depend
Normal file
13
cddl/usr.sbin/dtruss/Makefile.depend
Normal file
@ -0,0 +1,13 @@
|
||||
# $FreeBSD$
|
||||
# Autogenerated - do NOT edit!
|
||||
|
||||
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
|
||||
|
||||
DIRDEPS = \
|
||||
|
||||
|
||||
.include <dirdeps.mk>
|
||||
|
||||
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
|
||||
# local dependencies - needed for -jN in clean tree
|
||||
.endif
|
||||
28
cddl/usr.sbin/lockstat/Makefile.depend
Normal file
28
cddl/usr.sbin/lockstat/Makefile.depend
Normal file
@ -0,0 +1,28 @@
|
||||
# $FreeBSD$
|
||||
# Autogenerated - do NOT edit!
|
||||
|
||||
DIRDEPS = \
|
||||
cddl/lib/libctf \
|
||||
cddl/lib/libdtrace \
|
||||
gnu/lib/csu \
|
||||
gnu/lib/libgcc \
|
||||
include \
|
||||
include/xlocale \
|
||||
lib/${CSU_DIR} \
|
||||
lib/libc \
|
||||
lib/libcompiler_rt \
|
||||
lib/libcxxrt \
|
||||
lib/libelf \
|
||||
lib/libproc \
|
||||
lib/librt \
|
||||
lib/librtld_db \
|
||||
lib/libthr \
|
||||
lib/libutil \
|
||||
lib/libz \
|
||||
|
||||
|
||||
.include <dirdeps.mk>
|
||||
|
||||
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
|
||||
# local dependencies - needed for -jN in clean tree
|
||||
.endif
|
||||
33
cddl/usr.sbin/zdb/Makefile.depend
Normal file
33
cddl/usr.sbin/zdb/Makefile.depend
Normal file
@ -0,0 +1,33 @@
|
||||
# $FreeBSD$
|
||||
# Autogenerated - do NOT edit!
|
||||
|
||||
DIRDEPS = \
|
||||
cddl/lib/libavl \
|
||||
cddl/lib/libnvpair \
|
||||
cddl/lib/libumem \
|
||||
cddl/lib/libuutil \
|
||||
cddl/lib/libzfs \
|
||||
cddl/lib/libzfs_core \
|
||||
cddl/lib/libzpool \
|
||||
gnu/lib/csu \
|
||||
gnu/lib/libgcc \
|
||||
include \
|
||||
include/xlocale \
|
||||
lib/${CSU_DIR} \
|
||||
lib/libc \
|
||||
lib/libcompiler_rt \
|
||||
lib/libexpat \
|
||||
lib/libgeom \
|
||||
lib/libmd \
|
||||
lib/libsbuf \
|
||||
lib/libthr \
|
||||
lib/libutil \
|
||||
lib/libz \
|
||||
lib/msun \
|
||||
|
||||
|
||||
.include <dirdeps.mk>
|
||||
|
||||
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
|
||||
# local dependencies - needed for -jN in clean tree
|
||||
.endif
|
||||
33
cddl/usr.sbin/zhack/Makefile.depend
Normal file
33
cddl/usr.sbin/zhack/Makefile.depend
Normal file
@ -0,0 +1,33 @@
|
||||
# $FreeBSD$
|
||||
# Autogenerated - do NOT edit!
|
||||
|
||||
DIRDEPS = \
|
||||
cddl/lib/libavl \
|
||||
cddl/lib/libnvpair \
|
||||
cddl/lib/libumem \
|
||||
cddl/lib/libuutil \
|
||||
cddl/lib/libzfs \
|
||||
cddl/lib/libzfs_core \
|
||||
cddl/lib/libzpool \
|
||||
gnu/lib/csu \
|
||||
gnu/lib/libgcc \
|
||||
include \
|
||||
include/xlocale \
|
||||
lib/${CSU_DIR} \
|
||||
lib/libc \
|
||||
lib/libcompiler_rt \
|
||||
lib/libexpat \
|
||||
lib/libgeom \
|
||||
lib/libmd \
|
||||
lib/libsbuf \
|
||||
lib/libthr \
|
||||
lib/libutil \
|
||||
lib/libz \
|
||||
lib/msun \
|
||||
|
||||
|
||||
.include <dirdeps.mk>
|
||||
|
||||
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
|
||||
# local dependencies - needed for -jN in clean tree
|
||||
.endif
|
||||
@ -1,3 +1,9 @@
|
||||
2015-06-06 Simon J. Gerraty <sjg@bad.crufty.net>
|
||||
|
||||
* Makefile (MAKE_VERSION): 20150606
|
||||
Merge with NetBSD make, pick up
|
||||
o make.1: document .OBJDIR target
|
||||
|
||||
2015-05-05 Simon J. Gerraty <sjg@bad.crufty.net>
|
||||
|
||||
* Makefile (MAKE_VERSION): 20150505
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
# $Id: Makefile,v 1.38 2015/05/05 21:58:05 sjg Exp $
|
||||
# $Id: Makefile,v 1.39 2015/06/07 15:54:37 sjg Exp $
|
||||
|
||||
# Base version on src date
|
||||
MAKE_VERSION= 20150505
|
||||
MAKE_VERSION= 20150606
|
||||
|
||||
PROG= bmake
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
.\" $NetBSD: make.1,v 1.247 2015/04/10 08:43:32 wiz Exp $
|
||||
.\" $NetBSD: make.1,v 1.249 2015/06/05 07:33:40 wiz Exp $
|
||||
.\"
|
||||
.\" Copyright (c) 1990, 1993
|
||||
.\" The Regents of the University of California. All rights reserved.
|
||||
@ -29,7 +29,7 @@
|
||||
.\"
|
||||
.\" from: @(#)make.1 8.4 (Berkeley) 3/19/94
|
||||
.\"
|
||||
.Dd April 9, 2015
|
||||
.Dd June 4, 2015
|
||||
.Dt MAKE 1
|
||||
.Os
|
||||
.Sh NAME
|
||||
@ -993,14 +993,15 @@ This is especially useful with
|
||||
.Ql Ev MAKEOBJDIR .
|
||||
.Pp
|
||||
.Ql Va .OBJDIR
|
||||
may be modified in the makefile as a global variable.
|
||||
may be modified in the makefile via the special target
|
||||
.Ql Ic .OBJDIR .
|
||||
In all cases,
|
||||
.Nm
|
||||
will
|
||||
.Xr chdir 2
|
||||
to
|
||||
to the specified directory if it exists, and set
|
||||
.Ql Va .OBJDIR
|
||||
and set
|
||||
and
|
||||
.Ql Ev PWD
|
||||
to that directory before executing any targets.
|
||||
.
|
||||
@ -2001,6 +2002,15 @@ Disable parallel mode.
|
||||
Synonym for
|
||||
.Ic .NOTPARALLEL ,
|
||||
for compatibility with other pmake variants.
|
||||
.It Ic .OBJDIR
|
||||
The source is a new value for
|
||||
.Ql Va .OBJDIR .
|
||||
If it exists,
|
||||
.Nm
|
||||
will
|
||||
.Xr chdir 2
|
||||
to it and update the value of
|
||||
.Ql Va .OBJDIR .
|
||||
.It Ic .ORDER
|
||||
The named targets are made in sequence.
|
||||
This ordering does not add targets to the list of targets to be made.
|
||||
|
||||
@ -647,10 +647,10 @@ VVAARRIIAABBLLEE AASSSSIIGGNNMMEENNTTSS
|
||||
may be used. This is especially useful with
|
||||
`MAKEOBJDIR'.
|
||||
|
||||
`_._O_B_J_D_I_R' may be modified in the makefile as a global
|
||||
variable. In all cases, bbmmaakkee will chdir(2) to `_._O_B_J_D_I_R'
|
||||
and set `PWD' to that directory before executing any tar-
|
||||
gets.
|
||||
`_._O_B_J_D_I_R' may be modified in the makefile via the special
|
||||
target `..OOBBJJDDIIRR'. In all cases, bbmmaakkee will chdir(2) to
|
||||
the specified directory if it exists, and set `_._O_B_J_D_I_R'
|
||||
and `PWD' to that directory before executing any targets.
|
||||
|
||||
_._P_A_R_S_E_D_I_R A path to the directory of the current `_M_a_k_e_f_i_l_e' being
|
||||
parsed.
|
||||
@ -1271,6 +1271,9 @@ SSPPEECCIIAALL TTAARRGGEETTSS
|
||||
Synonym for ..NNOOTTPPAARRAALLLLEELL, for compatibility with other pmake
|
||||
variants.
|
||||
|
||||
..OOBBJJDDIIRR The source is a new value for `_._O_B_J_D_I_R'. If it exists, bbmmaakkee
|
||||
will chdir(2) to it and update the value of `_._O_B_J_D_I_R'.
|
||||
|
||||
..OORRDDEERR The named targets are made in sequence. This ordering does not
|
||||
add targets to the list of targets to be made. Since the depen-
|
||||
dents of a target do not get built until the target itself could
|
||||
@ -1449,4 +1452,4 @@ BBUUGGSS
|
||||
|
||||
There is no way of escaping a space character in a filename.
|
||||
|
||||
NetBSD 5.1 April 9, 2015 NetBSD 5.1
|
||||
NetBSD 5.1 June 4, 2015 NetBSD 5.1
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
.\" $NetBSD: make.1,v 1.247 2015/04/10 08:43:32 wiz Exp $
|
||||
.\" $NetBSD: make.1,v 1.249 2015/06/05 07:33:40 wiz Exp $
|
||||
.\"
|
||||
.\" Copyright (c) 1990, 1993
|
||||
.\" The Regents of the University of California. All rights reserved.
|
||||
@ -29,7 +29,7 @@
|
||||
.\"
|
||||
.\" from: @(#)make.1 8.4 (Berkeley) 3/19/94
|
||||
.\"
|
||||
.Dd April 9, 2015
|
||||
.Dd June 4, 2015
|
||||
.Dt MAKE 1
|
||||
.Os
|
||||
.Sh NAME
|
||||
@ -1004,14 +1004,15 @@ This is especially useful with
|
||||
.Ql Ev MAKEOBJDIR .
|
||||
.Pp
|
||||
.Ql Va .OBJDIR
|
||||
may be modified in the makefile as a global variable.
|
||||
may be modified in the makefile via the special target
|
||||
.Ql Ic .OBJDIR .
|
||||
In all cases,
|
||||
.Nm
|
||||
will
|
||||
.Xr chdir 2
|
||||
to
|
||||
to the specified directory if it exists, and set
|
||||
.Ql Va .OBJDIR
|
||||
and set
|
||||
and
|
||||
.Ql Ev PWD
|
||||
to that directory before executing any targets.
|
||||
.
|
||||
@ -2012,6 +2013,15 @@ Disable parallel mode.
|
||||
Synonym for
|
||||
.Ic .NOTPARALLEL ,
|
||||
for compatibility with other pmake variants.
|
||||
.It Ic .OBJDIR
|
||||
The source is a new value for
|
||||
.Ql Va .OBJDIR .
|
||||
If it exists,
|
||||
.Nm
|
||||
will
|
||||
.Xr chdir 2
|
||||
to it and update the value of
|
||||
.Ql Va .OBJDIR .
|
||||
.It Ic .ORDER
|
||||
The named targets are made in sequence.
|
||||
This ordering does not add targets to the list of targets to be made.
|
||||
|
||||
@ -1,3 +1,29 @@
|
||||
2015-06-06 Simon J. Gerraty <sjg@bad.crufty.net>
|
||||
|
||||
* install-mk (MK_VERSION): 20150606
|
||||
|
||||
* dirdeps.mk: don't rely on manually maintained Makefile.depend
|
||||
to set DEP_RELDIR and reset DIRDEPS.
|
||||
By setting DEP_RELDIR ourselves we can skip :tA
|
||||
|
||||
* gendirdeps.mk: skip setting DEP_RELDIR.
|
||||
|
||||
2015-05-24 Simon J. Gerraty <sjg@bad.crufty.net>
|
||||
|
||||
* dirdeps.mk: avoid wildcards like make(bootstrap*)
|
||||
|
||||
2015-05-20 Simon J. Gerraty <sjg@bad.crufty.net>
|
||||
|
||||
* install-mk (MK_VERSION): 20150520
|
||||
|
||||
* dirdeps.mk: when we are building dirdeps cache file we *want*
|
||||
meta_oodate to look at all the Makefile.depend files, so
|
||||
set .MAKE.DEPENDFILE to something that won't match.
|
||||
|
||||
* meta.stage.mk: for STAGE_AS_* basename of file may not be unique
|
||||
so first use absolute path as key.
|
||||
Also skip staging at level 0.
|
||||
|
||||
2015-04-30 Simon J. Gerraty <sjg@bad.crufty.net>
|
||||
|
||||
* install-mk (MK_VERSION): 20150430
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
# $Id: dirdeps.mk,v 1.51 2015/05/06 06:07:30 sjg Exp $
|
||||
# $Id: dirdeps.mk,v 1.54 2015/06/08 20:55:11 sjg Exp $
|
||||
|
||||
# Copyright (c) 2010-2013, Juniper Networks, Inc.
|
||||
# All rights reserved.
|
||||
@ -383,6 +383,7 @@ ${DIRDEPS_CACHE}: .META .NOMETA_CMP
|
||||
DIRDEPS="${DIRDEPS}" \
|
||||
MAKEFLAGS= ${.MAKE} -C ${_CURDIR} -f ${BUILD_DIRDEPS_MAKEFILE} \
|
||||
${BUILD_DIRDEPS_TARGETS} BUILD_DIRDEPS_CACHE=yes \
|
||||
.MAKE.DEPENDFILE=.none \
|
||||
3>&1 1>&2 | sed 's,${SRCTOP},$${SRCTOP},g' >> ${.TARGET}.new && \
|
||||
mv ${.TARGET}.new ${.TARGET}
|
||||
|
||||
@ -587,6 +588,11 @@ _qm := ${_m:C;(\.depend)$;\1.${d:E};:${M_dep_qual_fixes:ts:}}
|
||||
_DEP_TARGET_SPEC := ${d:E}
|
||||
# some makefiles may still look at this
|
||||
_DEP_MACHINE := ${d:E:C/,.*//}
|
||||
# set this "just in case"
|
||||
# we can skip :tA since we computed the path above
|
||||
DEP_RELDIR := ${_m:H:S,${SRCTOP}/,,}
|
||||
# and reset this
|
||||
DIRDEPS =
|
||||
.if ${_debug_reldir} && ${_qm} != ${_m}
|
||||
.info loading ${_m} for ${d:E}
|
||||
.endif
|
||||
@ -602,13 +608,15 @@ _DEP_MACHINE := ${d:E:C/,.*//}
|
||||
.elif ${.MAKE.LEVEL} > 42
|
||||
.error You should have stopped recursing by now.
|
||||
.else
|
||||
_DEP_RELDIR := ${DEP_RELDIR}
|
||||
# we are building something
|
||||
DEP_RELDIR := ${RELDIR}
|
||||
_DEP_RELDIR := ${RELDIR}
|
||||
# pickup local dependencies
|
||||
.-include <.depend>
|
||||
.endif
|
||||
|
||||
# bootstrapping new dependencies made easy?
|
||||
.if make(bootstrap*) && !target(bootstrap)
|
||||
.if (make(bootstrap) || make(bootstrap-recurse)) && !target(bootstrap)
|
||||
|
||||
.if exists(${.CURDIR}/${.MAKE.DEPENDFILE:T})
|
||||
# stop here
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
# $Id: gendirdeps.mk,v 1.26 2014/09/05 04:40:52 sjg Exp $
|
||||
# $Id: gendirdeps.mk,v 1.27 2015/06/08 20:55:11 sjg Exp $
|
||||
|
||||
# Copyright (c) 2010-2013, Juniper Networks, Inc.
|
||||
# All rights reserved.
|
||||
@ -311,7 +311,6 @@ CAT_DEPEND ?= .depend
|
||||
# to output _{VAR} tokens which we will turn into proper ${VAR} references.
|
||||
${_DEPENDFILE}: ${CAT_DEPEND:M.depend} ${META_FILES:O:u:@m@${exists($m):?$m:}@} ${_this} ${META2DEPS}
|
||||
@(echo '# Autogenerated - do NOT edit!'; echo; \
|
||||
echo 'DEP_RELDIR := $${_PARSEDIR:S,$${SRCTOP}/,,}'; echo; \
|
||||
echo 'DIRDEPS = \'; \
|
||||
echo '${DIRDEPS:@d@ $d \\${.newline}@}'; echo; \
|
||||
${_include_src_dirdeps} \
|
||||
@ -332,7 +331,6 @@ all: ${_DEPENDFILE}
|
||||
|
||||
${_DEPENDFILE}: ${MAKEFILE} ${_this}
|
||||
@(echo '# Autogenerated - do NOT edit!'; echo; \
|
||||
echo 'DEP_RELDIR := $${_PARSEDIR:S,$${SRCTOP}/,,}'; echo; \
|
||||
echo 'DIRDEPS = \'; \
|
||||
echo '${DIRDEPS:@d@ $d \\${.newline}@}'; echo; \
|
||||
echo '.include <dirdeps.mk>'; \
|
||||
|
||||
@ -55,7 +55,7 @@
|
||||
# Simon J. Gerraty <sjg@crufty.net>
|
||||
|
||||
# RCSid:
|
||||
# $Id: install-mk,v 1.110 2015/05/01 06:37:49 sjg Exp $
|
||||
# $Id: install-mk,v 1.112 2015/06/08 20:55:11 sjg Exp $
|
||||
#
|
||||
# @(#) Copyright (c) 1994 Simon J. Gerraty
|
||||
#
|
||||
@ -70,7 +70,7 @@
|
||||
# sjg@crufty.net
|
||||
#
|
||||
|
||||
MK_VERSION=20150430
|
||||
MK_VERSION=20150606
|
||||
OWNER=
|
||||
GROUP=
|
||||
MODE=444
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
# $Id: meta.stage.mk,v 1.34 2014/11/20 22:40:08 sjg Exp $
|
||||
# $Id: meta.stage.mk,v 1.35 2015/05/20 06:40:33 sjg Exp $
|
||||
#
|
||||
# @(#) Copyright (c) 2011, Simon J. Gerraty
|
||||
#
|
||||
@ -218,7 +218,7 @@ STAGE_AS.$s ?= ${.ALLSRC:N.dirdep}
|
||||
|
||||
stage_as: stage_as.$s
|
||||
stage_as.$s: .dirdep
|
||||
@${STAGE_AS_SCRIPT}; StageAs ${FLAGS.$@} ${STAGE_FILES_DIR.$s:U${STAGE_DIR.$s}:${STAGE_DIR_FILTER}} ${STAGE_AS.$s:@f@$f ${STAGE_AS_${f:T}:U${f:T}}@}
|
||||
@${STAGE_AS_SCRIPT}; StageAs ${FLAGS.$@} ${STAGE_FILES_DIR.$s:U${STAGE_DIR.$s}:${STAGE_DIR_FILTER}} ${STAGE_AS.$s:@f@$f ${STAGE_AS_${f:tA}:U${STAGE_AS_${f:T}:U${f:T}}}@}
|
||||
@touch $@
|
||||
|
||||
.endfor
|
||||
@ -238,7 +238,9 @@ staging:
|
||||
# generally we want staging to wait until everything else is done
|
||||
STAGING_WAIT ?= .WAIT
|
||||
|
||||
.if ${.MAKE.LEVEL} > 0
|
||||
all: ${STAGING_WAIT} staging
|
||||
.endif
|
||||
|
||||
.if exists(${.PARSEDIR}/stage-install.sh) && !defined(STAGE_INSTALL)
|
||||
# this will run install(1) and then followup with .dirdep files.
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
# $Id: meta.sys.mk,v 1.20 2014/08/04 05:12:27 sjg Exp $
|
||||
# $Id: meta.sys.mk,v 1.21 2015/06/01 22:43:49 sjg Exp $
|
||||
|
||||
#
|
||||
# @(#) Copyright (c) 2010, Simon J. Gerraty
|
||||
@ -108,11 +108,16 @@ _metaError: .NOMETA .NOTMAIN
|
||||
.if ${.MAKE.MODE:Mmeta*} != ""
|
||||
MKDEP_MK = meta.autodep.mk
|
||||
|
||||
# if we think we are updating dependencies,
|
||||
# then filemon had better be present
|
||||
.if ${UPDATE_DEPENDFILE:Uyes:tl} != "no" && !exists(/dev/filemon)
|
||||
.if ${UPDATE_DEPENDFILE:Uyes:tl} != "no"
|
||||
.if ${.MAKEFLAGS:Uno:M-k} != ""
|
||||
# make this more obvious
|
||||
.warning Setting UPDATE_DEPENDFILE=NO due to -k
|
||||
UPDATE_DEPENDFILE= NO
|
||||
.export UPDATE_DEPENDFILE
|
||||
.elif !exists(/dev/filemon)
|
||||
.error ${.newline}ERROR: The filemon module (/dev/filemon) is not loaded.
|
||||
.endif
|
||||
.endif
|
||||
|
||||
.if ${.MAKE.LEVEL} == 0
|
||||
# make sure dirdeps target exists and do it first
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
:
|
||||
# $Id: mkopt.sh,v 1.8 2014/11/15 07:07:18 sjg Exp $
|
||||
# $Id: mkopt.sh,v 1.10 2015/06/07 17:29:08 sjg Exp $
|
||||
#
|
||||
# @(#) Copyright (c) 2014, Simon J. Gerraty
|
||||
#
|
||||
@ -19,9 +19,10 @@
|
||||
|
||||
# no need to be included more than once
|
||||
_MKOPT_SH=:
|
||||
_MKOPT_PREFIX=${_MKOPT_PREFIX:-MK_}
|
||||
|
||||
#
|
||||
# _mk_opt OPT default
|
||||
# _mk_opt default OPT
|
||||
#
|
||||
# Set MK_$OPT
|
||||
#
|
||||
@ -35,7 +36,7 @@ _MKOPT_SH=:
|
||||
#
|
||||
_mk_opt() {
|
||||
_d=$1
|
||||
_mo=MK_$2 _wo=WITHOUT_$2 _wi=WITH_$2
|
||||
_mo=${_MKOPT_PREFIX}$2 _wo=WITHOUT_$2 _wi=WITH_$2
|
||||
eval "_mov=\$$_mo _wov=\$$_wo _wiv=\$$_wi"
|
||||
|
||||
case "$_wiv" in
|
||||
@ -63,15 +64,23 @@ _mk_opts() {
|
||||
_d=no
|
||||
for _o in "$@"
|
||||
do
|
||||
case "$_o" in
|
||||
case "$_o" in
|
||||
*/*) # option is dirname default comes from basename
|
||||
eval "_d=\$${_MKOPT_PREFIX}${_o#*/}"
|
||||
_o=${_o%/*}
|
||||
;;
|
||||
yes|no) _d=$_o; continue;;
|
||||
esac
|
||||
_mk_opt $_d $_o
|
||||
done
|
||||
}
|
||||
|
||||
# handle either options.mk style OPTIONS_DEFAULT_*
|
||||
# or FreeBSD's new bsd.mkopt.mk style __DEFAULT_*_OPTIONS
|
||||
_mk_opts_defaults() {
|
||||
_mk_opts no $__DEFAULT_NO_OPTIONS yes $__DEFAULT_YES_OPTIONS
|
||||
_mk_opts no $OPTIONS_DEFAULT_NO $__DEFAULT_NO_OPTIONS \
|
||||
yes $OPTIONS_DEFAULT_YES $__DEFAULT_YES_OPTIONS \
|
||||
$OPTIONS_DEFAULT_DEPENDENT $__DEFAULT_DEPENDENT_OPTIONS
|
||||
}
|
||||
|
||||
case "/$0" in
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
/* $NetBSD: targ.c,v 1.59 2014/09/07 20:55:34 joerg Exp $ */
|
||||
/* $NetBSD: targ.c,v 1.60 2015/05/25 09:01:06 manu Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 1988, 1989, 1990, 1993
|
||||
@ -69,14 +69,14 @@
|
||||
*/
|
||||
|
||||
#ifndef MAKE_NATIVE
|
||||
static char rcsid[] = "$NetBSD: targ.c,v 1.59 2014/09/07 20:55:34 joerg Exp $";
|
||||
static char rcsid[] = "$NetBSD: targ.c,v 1.60 2015/05/25 09:01:06 manu Exp $";
|
||||
#else
|
||||
#include <sys/cdefs.h>
|
||||
#ifndef lint
|
||||
#if 0
|
||||
static char sccsid[] = "@(#)targ.c 8.2 (Berkeley) 3/19/94";
|
||||
#else
|
||||
__RCSID("$NetBSD: targ.c,v 1.59 2014/09/07 20:55:34 joerg Exp $");
|
||||
__RCSID("$NetBSD: targ.c,v 1.60 2015/05/25 09:01:06 manu Exp $");
|
||||
#endif
|
||||
#endif /* not lint */
|
||||
#endif
|
||||
|
||||
@ -1349,6 +1349,14 @@ set_shstrtab(struct elfcopy *ecp)
|
||||
|
||||
s = ecp->shstrtab;
|
||||
|
||||
if (s->os == NULL) {
|
||||
/* Input object does not contain .shstrtab section */
|
||||
if ((s->os = elf_newscn(ecp->eout)) == NULL)
|
||||
errx(EXIT_FAILURE, "elf_newscn failed: %s",
|
||||
elf_errmsg(-1));
|
||||
insert_to_sec_list(ecp, s, 1);
|
||||
}
|
||||
|
||||
if (gelf_getshdr(s->os, &sh) == NULL)
|
||||
errx(EXIT_FAILURE, "692 gelf_getshdr() failed: %s",
|
||||
elf_errmsg(-1));
|
||||
|
||||
@ -1,3 +1,56 @@
|
||||
2015-06-11 8:52 Christos Zoulas <christos@zoulas.com>
|
||||
|
||||
* redo long option encoding to fix off-by-one in 5.23
|
||||
|
||||
2015-06-10 13:50 Christos Zoulas <christos@zoulas.com>
|
||||
|
||||
* release 5.23
|
||||
|
||||
2015-06-09 16:10 Christos Zoulas <christos@zoulas.com>
|
||||
|
||||
* Fix issue with regex range for magic with offset
|
||||
* Always return true from mget with USE (success to mget not match
|
||||
indication). Fixes mime evaluation after USE magic
|
||||
* PR/459: Don't insert magic entries to the list if there are parsing
|
||||
errors for them.
|
||||
|
||||
2015-06-03 16:00 Christos Zoulas <christos@zoulas.com>
|
||||
|
||||
* PR/455: Add utf-7 encoding
|
||||
|
||||
2015-06-03 14:30 Christos Zoulas <christos@zoulas.com>
|
||||
|
||||
* PR/455: Implement -Z, look inside, but don't report on compression
|
||||
* PR/454: Fix allocation error on bad magic.
|
||||
|
||||
2015-05-29 10:30 Christos Zoulas <christos@zoulas.com>
|
||||
|
||||
* handle MAGIC_CONTINUE everywhere, not just in softmagic
|
||||
|
||||
2015-05-21 14:30 Christos Zoulas <christos@zoulas.com>
|
||||
|
||||
* don't print descriptions for NAME types when mime.
|
||||
|
||||
2015-04-09 15:59 Christos Zoulas <christos@zoulas.com>
|
||||
|
||||
* Add --extension to list the known extensions for this file type
|
||||
Idea by Andrew J Roazen
|
||||
|
||||
2015-02-14 12:23 Christos Zoulas <christos@zoulas.com>
|
||||
|
||||
* Bump file search buffer size to 1M.
|
||||
|
||||
2015-01-09 14:35 Christos Zoulas <christos@zoulas.com>
|
||||
|
||||
* Fix multiple issues with date formats reported by Christoph Biedl:
|
||||
- T_LOCAL meaning was reversed
|
||||
- Arithmetic did not work
|
||||
Also stop adjusting daylight savings for gmt printing.
|
||||
|
||||
2015-01-05 13:00 Christos Zoulas <christos@zoulas.com>
|
||||
|
||||
* PR/411: Fix memory corruption from corrupt cdf file.
|
||||
|
||||
2015-01-02 15:15 Christos Zoulas <christos@zoulas.com>
|
||||
|
||||
* release 5.22
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
# Makefile.in generated by automake 1.14 from Makefile.am.
|
||||
# Makefile.in generated by automake 1.15 from Makefile.am.
|
||||
# @configure_input@
|
||||
|
||||
# Copyright (C) 1994-2013 Free Software Foundation, Inc.
|
||||
# Copyright (C) 1994-2014 Free Software Foundation, Inc.
|
||||
|
||||
# This Makefile.in is free software; the Free Software Foundation
|
||||
# gives unlimited permission to copy and/or distribute it,
|
||||
@ -14,7 +14,17 @@
|
||||
|
||||
@SET_MAKE@
|
||||
VPATH = @srcdir@
|
||||
am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
|
||||
am__is_gnu_make = { \
|
||||
if test -z '$(MAKELEVEL)'; then \
|
||||
false; \
|
||||
elif test -n '$(MAKE_HOST)'; then \
|
||||
true; \
|
||||
elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
|
||||
true; \
|
||||
else \
|
||||
false; \
|
||||
fi; \
|
||||
}
|
||||
am__make_running_with_option = \
|
||||
case $${target_option-} in \
|
||||
?) ;; \
|
||||
@ -77,11 +87,6 @@ POST_UNINSTALL = :
|
||||
build_triplet = @build@
|
||||
host_triplet = @host@
|
||||
subdir = .
|
||||
DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
|
||||
$(top_srcdir)/configure $(am__configure_deps) \
|
||||
$(srcdir)/config.h.in AUTHORS COPYING ChangeLog INSTALL NEWS \
|
||||
README TODO compile config.guess config.sub depcomp install-sh \
|
||||
missing ltmain.sh
|
||||
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
|
||||
am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \
|
||||
$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
|
||||
@ -89,6 +94,8 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \
|
||||
$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
|
||||
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
|
||||
$(ACLOCAL_M4)
|
||||
DIST_COMMON = $(srcdir)/Makefile.am $(top_srcdir)/configure \
|
||||
$(am__configure_deps) $(am__DIST_COMMON)
|
||||
am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
|
||||
configure.lineno config.status.lineno
|
||||
mkinstalldirs = $(install_sh) -d
|
||||
@ -152,6 +159,9 @@ ETAGS = etags
|
||||
CTAGS = ctags
|
||||
CSCOPE = cscope
|
||||
DIST_SUBDIRS = $(SUBDIRS)
|
||||
am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/config.h.in AUTHORS \
|
||||
COPYING ChangeLog INSTALL NEWS README TODO compile \
|
||||
config.guess config.sub depcomp install-sh ltmain.sh missing
|
||||
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
|
||||
distdir = $(PACKAGE)-$(VERSION)
|
||||
top_distdir = $(distdir)
|
||||
@ -336,7 +346,6 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
|
||||
echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile'; \
|
||||
$(am__cd) $(top_srcdir) && \
|
||||
$(AUTOMAKE) --foreign Makefile
|
||||
.PRECIOUS: Makefile
|
||||
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
|
||||
@case '$?' in \
|
||||
*config.status*) \
|
||||
@ -567,15 +576,15 @@ dist-xz: distdir
|
||||
$(am__post_remove_distdir)
|
||||
|
||||
dist-tarZ: distdir
|
||||
@echo WARNING: "Support for shar distribution archives is" \
|
||||
"deprecated." >&2
|
||||
@echo WARNING: "Support for distribution archives compressed with" \
|
||||
"legacy program 'compress' is deprecated." >&2
|
||||
@echo WARNING: "It will be removed altogether in Automake 2.0" >&2
|
||||
tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
|
||||
$(am__post_remove_distdir)
|
||||
|
||||
dist-shar: distdir
|
||||
@echo WARNING: "Support for distribution archives compressed with" \
|
||||
"legacy program 'compress' is deprecated." >&2
|
||||
@echo WARNING: "Support for shar distribution archives is" \
|
||||
"deprecated." >&2
|
||||
@echo WARNING: "It will be removed altogether in Automake 2.0" >&2
|
||||
shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
|
||||
$(am__post_remove_distdir)
|
||||
@ -611,16 +620,17 @@ distcheck: dist
|
||||
esac
|
||||
chmod -R a-w $(distdir)
|
||||
chmod u+w $(distdir)
|
||||
mkdir $(distdir)/_build $(distdir)/_inst
|
||||
mkdir $(distdir)/_build $(distdir)/_build/sub $(distdir)/_inst
|
||||
chmod a-w $(distdir)
|
||||
test -d $(distdir)/_build || exit 0; \
|
||||
dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \
|
||||
&& dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
|
||||
&& am__cwd=`pwd` \
|
||||
&& $(am__cd) $(distdir)/_build \
|
||||
&& ../configure --srcdir=.. --prefix="$$dc_install_base" \
|
||||
&& $(am__cd) $(distdir)/_build/sub \
|
||||
&& ../../configure \
|
||||
$(AM_DISTCHECK_CONFIGURE_FLAGS) \
|
||||
$(DISTCHECK_CONFIGURE_FLAGS) \
|
||||
--srcdir=../.. --prefix="$$dc_install_base" \
|
||||
&& $(MAKE) $(AM_MAKEFLAGS) \
|
||||
&& $(MAKE) $(AM_MAKEFLAGS) dvi \
|
||||
&& $(MAKE) $(AM_MAKEFLAGS) check \
|
||||
@ -797,6 +807,8 @@ uninstall-am:
|
||||
mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \
|
||||
uninstall-am
|
||||
|
||||
.PRECIOUS: Makefile
|
||||
|
||||
|
||||
# Tell versions [3.59,3.63) of GNU make to not export all variables.
|
||||
# Otherwise a system limit (for SysV at least) may be exceeded.
|
||||
|
||||
@ -17,3 +17,6 @@ hard-wired routines). In this regard, note that hplip, which is
|
||||
BSD-licensed, has a magic reimplementation in Python.
|
||||
|
||||
Read the kerberos magic entry for more ideas.
|
||||
|
||||
Write a string merger to make magic entry sizes dynamic.
|
||||
Strings will be converted to offsets from the string table.
|
||||
|
||||
67
contrib/file/aclocal.m4
vendored
67
contrib/file/aclocal.m4
vendored
@ -1,6 +1,6 @@
|
||||
# generated automatically by aclocal 1.14 -*- Autoconf -*-
|
||||
# generated automatically by aclocal 1.15 -*- Autoconf -*-
|
||||
|
||||
# Copyright (C) 1996-2013 Free Software Foundation, Inc.
|
||||
# Copyright (C) 1996-2014 Free Software Foundation, Inc.
|
||||
|
||||
# This file is free software; the Free Software Foundation
|
||||
# gives unlimited permission to copy and/or distribute it,
|
||||
@ -21,7 +21,7 @@ If you have problems, you may need to regenerate the build system entirely.
|
||||
To do so, use the procedure documented by the package, typically 'autoreconf'.])])
|
||||
|
||||
# visibility.m4 serial 5 (gettext-0.18.2)
|
||||
dnl Copyright (C) 2005, 2008, 2010-2013 Free Software Foundation, Inc.
|
||||
dnl Copyright (C) 2005, 2008, 2010-2014 Free Software Foundation, Inc.
|
||||
dnl This file is free software; the Free Software Foundation
|
||||
dnl gives unlimited permission to copy and/or distribute it,
|
||||
dnl with or without modifications, as long as this notice is preserved.
|
||||
@ -98,7 +98,7 @@ AC_DEFUN([gl_VISIBILITY],
|
||||
[Define to 1 or 0, depending whether the compiler supports simple visibility declarations.])
|
||||
])
|
||||
|
||||
# Copyright (C) 2002-2013 Free Software Foundation, Inc.
|
||||
# Copyright (C) 2002-2014 Free Software Foundation, Inc.
|
||||
#
|
||||
# This file is free software; the Free Software Foundation
|
||||
# gives unlimited permission to copy and/or distribute it,
|
||||
@ -110,10 +110,10 @@ AC_DEFUN([gl_VISIBILITY],
|
||||
# generated from the m4 files accompanying Automake X.Y.
|
||||
# (This private macro should not be called outside this file.)
|
||||
AC_DEFUN([AM_AUTOMAKE_VERSION],
|
||||
[am__api_version='1.14'
|
||||
[am__api_version='1.15'
|
||||
dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
|
||||
dnl require some minimum version. Point them to the right macro.
|
||||
m4_if([$1], [1.14], [],
|
||||
m4_if([$1], [1.15], [],
|
||||
[AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
|
||||
])
|
||||
|
||||
@ -129,14 +129,14 @@ m4_define([_AM_AUTOCONF_VERSION], [])
|
||||
# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
|
||||
# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
|
||||
AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
|
||||
[AM_AUTOMAKE_VERSION([1.14])dnl
|
||||
[AM_AUTOMAKE_VERSION([1.15])dnl
|
||||
m4_ifndef([AC_AUTOCONF_VERSION],
|
||||
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
|
||||
_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
|
||||
|
||||
# AM_AUX_DIR_EXPAND -*- Autoconf -*-
|
||||
|
||||
# Copyright (C) 2001-2013 Free Software Foundation, Inc.
|
||||
# Copyright (C) 2001-2014 Free Software Foundation, Inc.
|
||||
#
|
||||
# This file is free software; the Free Software Foundation
|
||||
# gives unlimited permission to copy and/or distribute it,
|
||||
@ -181,15 +181,14 @@ _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
|
||||
# configured tree to be moved without reconfiguration.
|
||||
|
||||
AC_DEFUN([AM_AUX_DIR_EXPAND],
|
||||
[dnl Rely on autoconf to set up CDPATH properly.
|
||||
AC_PREREQ([2.50])dnl
|
||||
# expand $ac_aux_dir to an absolute path
|
||||
am_aux_dir=`cd $ac_aux_dir && pwd`
|
||||
[AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl
|
||||
# Expand $ac_aux_dir to an absolute path.
|
||||
am_aux_dir=`cd "$ac_aux_dir" && pwd`
|
||||
])
|
||||
|
||||
# AM_CONDITIONAL -*- Autoconf -*-
|
||||
|
||||
# Copyright (C) 1997-2013 Free Software Foundation, Inc.
|
||||
# Copyright (C) 1997-2014 Free Software Foundation, Inc.
|
||||
#
|
||||
# This file is free software; the Free Software Foundation
|
||||
# gives unlimited permission to copy and/or distribute it,
|
||||
@ -220,7 +219,7 @@ AC_CONFIG_COMMANDS_PRE(
|
||||
Usually this means the macro was only invoked conditionally.]])
|
||||
fi])])
|
||||
|
||||
# Copyright (C) 1999-2013 Free Software Foundation, Inc.
|
||||
# Copyright (C) 1999-2014 Free Software Foundation, Inc.
|
||||
#
|
||||
# This file is free software; the Free Software Foundation
|
||||
# gives unlimited permission to copy and/or distribute it,
|
||||
@ -411,7 +410,7 @@ _AM_SUBST_NOTMAKE([am__nodep])dnl
|
||||
|
||||
# Generate code to set up dependency tracking. -*- Autoconf -*-
|
||||
|
||||
# Copyright (C) 1999-2013 Free Software Foundation, Inc.
|
||||
# Copyright (C) 1999-2014 Free Software Foundation, Inc.
|
||||
#
|
||||
# This file is free software; the Free Software Foundation
|
||||
# gives unlimited permission to copy and/or distribute it,
|
||||
@ -487,7 +486,7 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
|
||||
|
||||
# Do all the work for Automake. -*- Autoconf -*-
|
||||
|
||||
# Copyright (C) 1996-2013 Free Software Foundation, Inc.
|
||||
# Copyright (C) 1996-2014 Free Software Foundation, Inc.
|
||||
#
|
||||
# This file is free software; the Free Software Foundation
|
||||
# gives unlimited permission to copy and/or distribute it,
|
||||
@ -577,8 +576,8 @@ AC_REQUIRE([AC_PROG_MKDIR_P])dnl
|
||||
# <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
|
||||
# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
|
||||
AC_SUBST([mkdir_p], ['$(MKDIR_P)'])
|
||||
# We need awk for the "check" target. The system "awk" is bad on
|
||||
# some platforms.
|
||||
# We need awk for the "check" target (and possibly the TAP driver). The
|
||||
# system "awk" is bad on some platforms.
|
||||
AC_REQUIRE([AC_PROG_AWK])dnl
|
||||
AC_REQUIRE([AC_PROG_MAKE_SET])dnl
|
||||
AC_REQUIRE([AM_SET_LEADING_DOT])dnl
|
||||
@ -651,7 +650,11 @@ to "yes", and re-run configure.
|
||||
END
|
||||
AC_MSG_ERROR([Your 'rm' program is bad, sorry.])
|
||||
fi
|
||||
fi])
|
||||
fi
|
||||
dnl The trailing newline in this macro's definition is deliberate, for
|
||||
dnl backward compatibility and to allow trailing 'dnl'-style comments
|
||||
dnl after the AM_INIT_AUTOMAKE invocation. See automake bug#16841.
|
||||
])
|
||||
|
||||
dnl Hook into '_AC_COMPILER_EXEEXT' early to learn its expansion. Do not
|
||||
dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further
|
||||
@ -680,7 +683,7 @@ for _am_header in $config_headers :; do
|
||||
done
|
||||
echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
|
||||
|
||||
# Copyright (C) 2001-2013 Free Software Foundation, Inc.
|
||||
# Copyright (C) 2001-2014 Free Software Foundation, Inc.
|
||||
#
|
||||
# This file is free software; the Free Software Foundation
|
||||
# gives unlimited permission to copy and/or distribute it,
|
||||
@ -691,7 +694,7 @@ echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_co
|
||||
# Define $install_sh.
|
||||
AC_DEFUN([AM_PROG_INSTALL_SH],
|
||||
[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
|
||||
if test x"${install_sh}" != xset; then
|
||||
if test x"${install_sh+set}" != xset; then
|
||||
case $am_aux_dir in
|
||||
*\ * | *\ *)
|
||||
install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;
|
||||
@ -701,7 +704,7 @@ if test x"${install_sh}" != xset; then
|
||||
fi
|
||||
AC_SUBST([install_sh])])
|
||||
|
||||
# Copyright (C) 2003-2013 Free Software Foundation, Inc.
|
||||
# Copyright (C) 2003-2014 Free Software Foundation, Inc.
|
||||
#
|
||||
# This file is free software; the Free Software Foundation
|
||||
# gives unlimited permission to copy and/or distribute it,
|
||||
@ -722,7 +725,7 @@ AC_SUBST([am__leading_dot])])
|
||||
|
||||
# Check to see how 'make' treats includes. -*- Autoconf -*-
|
||||
|
||||
# Copyright (C) 2001-2013 Free Software Foundation, Inc.
|
||||
# Copyright (C) 2001-2014 Free Software Foundation, Inc.
|
||||
#
|
||||
# This file is free software; the Free Software Foundation
|
||||
# gives unlimited permission to copy and/or distribute it,
|
||||
@ -772,7 +775,7 @@ rm -f confinc confmf
|
||||
|
||||
# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*-
|
||||
|
||||
# Copyright (C) 1997-2013 Free Software Foundation, Inc.
|
||||
# Copyright (C) 1997-2014 Free Software Foundation, Inc.
|
||||
#
|
||||
# This file is free software; the Free Software Foundation
|
||||
# gives unlimited permission to copy and/or distribute it,
|
||||
@ -811,7 +814,7 @@ fi
|
||||
|
||||
# Helper functions for option handling. -*- Autoconf -*-
|
||||
|
||||
# Copyright (C) 2001-2013 Free Software Foundation, Inc.
|
||||
# Copyright (C) 2001-2014 Free Software Foundation, Inc.
|
||||
#
|
||||
# This file is free software; the Free Software Foundation
|
||||
# gives unlimited permission to copy and/or distribute it,
|
||||
@ -840,7 +843,7 @@ AC_DEFUN([_AM_SET_OPTIONS],
|
||||
AC_DEFUN([_AM_IF_OPTION],
|
||||
[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
|
||||
|
||||
# Copyright (C) 1999-2013 Free Software Foundation, Inc.
|
||||
# Copyright (C) 1999-2014 Free Software Foundation, Inc.
|
||||
#
|
||||
# This file is free software; the Free Software Foundation
|
||||
# gives unlimited permission to copy and/or distribute it,
|
||||
@ -887,7 +890,7 @@ AC_LANG_POP([C])])
|
||||
# For backward compatibility.
|
||||
AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])])
|
||||
|
||||
# Copyright (C) 2001-2013 Free Software Foundation, Inc.
|
||||
# Copyright (C) 2001-2014 Free Software Foundation, Inc.
|
||||
#
|
||||
# This file is free software; the Free Software Foundation
|
||||
# gives unlimited permission to copy and/or distribute it,
|
||||
@ -906,7 +909,7 @@ AC_DEFUN([AM_RUN_LOG],
|
||||
|
||||
# Check to make sure that the build environment is sane. -*- Autoconf -*-
|
||||
|
||||
# Copyright (C) 1996-2013 Free Software Foundation, Inc.
|
||||
# Copyright (C) 1996-2014 Free Software Foundation, Inc.
|
||||
#
|
||||
# This file is free software; the Free Software Foundation
|
||||
# gives unlimited permission to copy and/or distribute it,
|
||||
@ -987,7 +990,7 @@ AC_CONFIG_COMMANDS_PRE(
|
||||
rm -f conftest.file
|
||||
])
|
||||
|
||||
# Copyright (C) 2009-2013 Free Software Foundation, Inc.
|
||||
# Copyright (C) 2009-2014 Free Software Foundation, Inc.
|
||||
#
|
||||
# This file is free software; the Free Software Foundation
|
||||
# gives unlimited permission to copy and/or distribute it,
|
||||
@ -1047,7 +1050,7 @@ AC_SUBST([AM_BACKSLASH])dnl
|
||||
_AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl
|
||||
])
|
||||
|
||||
# Copyright (C) 2001-2013 Free Software Foundation, Inc.
|
||||
# Copyright (C) 2001-2014 Free Software Foundation, Inc.
|
||||
#
|
||||
# This file is free software; the Free Software Foundation
|
||||
# gives unlimited permission to copy and/or distribute it,
|
||||
@ -1075,7 +1078,7 @@ fi
|
||||
INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
|
||||
AC_SUBST([INSTALL_STRIP_PROGRAM])])
|
||||
|
||||
# Copyright (C) 2006-2013 Free Software Foundation, Inc.
|
||||
# Copyright (C) 2006-2014 Free Software Foundation, Inc.
|
||||
#
|
||||
# This file is free software; the Free Software Foundation
|
||||
# gives unlimited permission to copy and/or distribute it,
|
||||
@ -1094,7 +1097,7 @@ AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
|
||||
|
||||
# Check how to create a tarball. -*- Autoconf -*-
|
||||
|
||||
# Copyright (C) 2004-2013 Free Software Foundation, Inc.
|
||||
# Copyright (C) 2004-2014 Free Software Foundation, Inc.
|
||||
#
|
||||
# This file is free software; the Free Software Foundation
|
||||
# gives unlimited permission to copy and/or distribute it,
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
|
||||
scriptversion=2012-10-14.11; # UTC
|
||||
|
||||
# Copyright (C) 1999-2013 Free Software Foundation, Inc.
|
||||
# Copyright (C) 1999-2014 Free Software Foundation, Inc.
|
||||
# Written by Tom Tromey <tromey@cygnus.com>.
|
||||
#
|
||||
# This program is free software; you can redistribute it and/or modify
|
||||
|
||||
@ -62,6 +62,9 @@
|
||||
/* Define to 1 if you have the `getpagesize' function. */
|
||||
#undef HAVE_GETPAGESIZE
|
||||
|
||||
/* Define to 1 if you have the `gmtime_r' function. */
|
||||
#undef HAVE_GMTIME_R
|
||||
|
||||
/* Define to 1 if the system has the type `intptr_t'. */
|
||||
#undef HAVE_INTPTR_T
|
||||
|
||||
@ -80,6 +83,9 @@
|
||||
/* Define to 1 if you have the <locale.h> header file. */
|
||||
#undef HAVE_LOCALE_H
|
||||
|
||||
/* Define to 1 if you have the `localtime_r' function. */
|
||||
#undef HAVE_LOCALTIME_R
|
||||
|
||||
/* Define to 1 if mbrtowc and mbstate_t are properly declared. */
|
||||
#undef HAVE_MBRTOWC
|
||||
|
||||
@ -107,6 +113,12 @@
|
||||
/* Define to 1 if you have the `setlocale' function. */
|
||||
#undef HAVE_SETLOCALE
|
||||
|
||||
/* Define to 1 if you have the <signal.h> header file. */
|
||||
#undef HAVE_SIGNAL_H
|
||||
|
||||
/* Have sig_t type */
|
||||
#undef HAVE_SIG_T
|
||||
|
||||
/* Define to 1 if you have the <stddef.h> header file. */
|
||||
#undef HAVE_STDDEF_H
|
||||
|
||||
|
||||
72
contrib/file/configure
vendored
72
contrib/file/configure
vendored
@ -1,6 +1,6 @@
|
||||
#! /bin/sh
|
||||
# Guess values for system-dependent variables and create Makefiles.
|
||||
# Generated by GNU Autoconf 2.69 for file 5.22.
|
||||
# Generated by GNU Autoconf 2.69 for file 5.23.
|
||||
#
|
||||
# Report bugs to <christos@astron.com>.
|
||||
#
|
||||
@ -590,8 +590,8 @@ MAKEFLAGS=
|
||||
# Identity of this package.
|
||||
PACKAGE_NAME='file'
|
||||
PACKAGE_TARNAME='file'
|
||||
PACKAGE_VERSION='5.22'
|
||||
PACKAGE_STRING='file 5.22'
|
||||
PACKAGE_VERSION='5.23'
|
||||
PACKAGE_STRING='file 5.23'
|
||||
PACKAGE_BUGREPORT='christos@astron.com'
|
||||
PACKAGE_URL=''
|
||||
|
||||
@ -1327,7 +1327,7 @@ if test "$ac_init_help" = "long"; then
|
||||
# Omit some internal or obsolete options to make the list less imposing.
|
||||
# This message is too long to be a string in the A/UX 3.1 sh.
|
||||
cat <<_ACEOF
|
||||
\`configure' configures file 5.22 to adapt to many kinds of systems.
|
||||
\`configure' configures file 5.23 to adapt to many kinds of systems.
|
||||
|
||||
Usage: $0 [OPTION]... [VAR=VALUE]...
|
||||
|
||||
@ -1397,7 +1397,7 @@ fi
|
||||
|
||||
if test -n "$ac_init_help"; then
|
||||
case $ac_init_help in
|
||||
short | recursive ) echo "Configuration of file 5.22:";;
|
||||
short | recursive ) echo "Configuration of file 5.23:";;
|
||||
esac
|
||||
cat <<\_ACEOF
|
||||
|
||||
@ -1507,7 +1507,7 @@ fi
|
||||
test -n "$ac_init_help" && exit $ac_status
|
||||
if $ac_init_version; then
|
||||
cat <<\_ACEOF
|
||||
file configure 5.22
|
||||
file configure 5.23
|
||||
generated by GNU Autoconf 2.69
|
||||
|
||||
Copyright (C) 2012 Free Software Foundation, Inc.
|
||||
@ -2163,7 +2163,7 @@ cat >config.log <<_ACEOF
|
||||
This file contains any messages produced by compilers while
|
||||
running configure, to aid debugging if configure makes a mistake.
|
||||
|
||||
It was created by file $as_me 5.22, which was
|
||||
It was created by file $as_me 5.23, which was
|
||||
generated by GNU Autoconf 2.69. Invocation command line was
|
||||
|
||||
$ $0 $@
|
||||
@ -2514,7 +2514,7 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $
|
||||
ac_compiler_gnu=$ac_cv_c_compiler_gnu
|
||||
|
||||
|
||||
am__api_version='1.14'
|
||||
am__api_version='1.15'
|
||||
|
||||
ac_aux_dir=
|
||||
for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
|
||||
@ -2715,8 +2715,8 @@ test "$program_suffix" != NONE &&
|
||||
ac_script='s/[\\$]/&&/g;s/;s,x,x,$//'
|
||||
program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"`
|
||||
|
||||
# expand $ac_aux_dir to an absolute path
|
||||
am_aux_dir=`cd $ac_aux_dir && pwd`
|
||||
# Expand $ac_aux_dir to an absolute path.
|
||||
am_aux_dir=`cd "$ac_aux_dir" && pwd`
|
||||
|
||||
if test x"${MISSING+set}" != xset; then
|
||||
case $am_aux_dir in
|
||||
@ -2735,7 +2735,7 @@ else
|
||||
$as_echo "$as_me: WARNING: 'missing' script is too old or missing" >&2;}
|
||||
fi
|
||||
|
||||
if test x"${install_sh}" != xset; then
|
||||
if test x"${install_sh+set}" != xset; then
|
||||
case $am_aux_dir in
|
||||
*\ * | *\ *)
|
||||
install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;
|
||||
@ -3029,7 +3029,7 @@ fi
|
||||
|
||||
# Define the identity of the package.
|
||||
PACKAGE='file'
|
||||
VERSION='5.22'
|
||||
VERSION='5.23'
|
||||
|
||||
|
||||
cat >>confdefs.h <<_ACEOF
|
||||
@ -3063,8 +3063,8 @@ MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
|
||||
# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
|
||||
mkdir_p='$(MKDIR_P)'
|
||||
|
||||
# We need awk for the "check" target. The system "awk" is bad on
|
||||
# some platforms.
|
||||
# We need awk for the "check" target (and possibly the TAP driver). The
|
||||
# system "awk" is bad on some platforms.
|
||||
# Always define AMTAR for backward compatibility. Yes, it's still used
|
||||
# in the wild :-( We should find a proper way to deprecate it ...
|
||||
AMTAR='$${TAR-tar}'
|
||||
@ -3121,6 +3121,7 @@ END
|
||||
as_fn_error $? "Your 'rm' program is bad, sorry." "$LINENO" 5
|
||||
fi
|
||||
fi
|
||||
|
||||
# Check whether --enable-silent-rules was given.
|
||||
if test "${enable_silent_rules+set}" = set; then :
|
||||
enableval=$enable_silent_rules;
|
||||
@ -12785,7 +12786,7 @@ fi
|
||||
|
||||
done
|
||||
|
||||
for ac_header in getopt.h err.h xlocale.h
|
||||
for ac_header in getopt.h err.h xlocale.h signal.h
|
||||
do :
|
||||
as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
|
||||
ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
|
||||
@ -12823,6 +12824,17 @@ fi
|
||||
|
||||
done
|
||||
|
||||
ac_fn_c_check_type "$LINENO" "sig_t" "ac_cv_type_sig_t" "
|
||||
#ifdef HAVE_SIGNAL_H
|
||||
#include <signal.h>
|
||||
#endif
|
||||
"
|
||||
if test "x$ac_cv_type_sig_t" = xyes; then :
|
||||
|
||||
$as_echo "#define HAVE_SIG_T 1" >>confdefs.h
|
||||
|
||||
fi
|
||||
|
||||
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for an ANSI C-conforming const" >&5
|
||||
$as_echo_n "checking for an ANSI C-conforming const... " >&6; }
|
||||
@ -14308,6 +14320,32 @@ esac
|
||||
|
||||
fi
|
||||
|
||||
ac_fn_c_check_func "$LINENO" "localtime_r" "ac_cv_func_localtime_r"
|
||||
if test "x$ac_cv_func_localtime_r" = xyes; then :
|
||||
$as_echo "#define HAVE_LOCALTIME_R 1" >>confdefs.h
|
||||
|
||||
else
|
||||
case " $LIBOBJS " in
|
||||
*" localtime_r.$ac_objext "* ) ;;
|
||||
*) LIBOBJS="$LIBOBJS localtime_r.$ac_objext"
|
||||
;;
|
||||
esac
|
||||
|
||||
fi
|
||||
|
||||
ac_fn_c_check_func "$LINENO" "gmtime_r" "ac_cv_func_gmtime_r"
|
||||
if test "x$ac_cv_func_gmtime_r" = xyes; then :
|
||||
$as_echo "#define HAVE_GMTIME_R 1" >>confdefs.h
|
||||
|
||||
else
|
||||
case " $LIBOBJS " in
|
||||
*" gmtime_r.$ac_objext "* ) ;;
|
||||
*) LIBOBJS="$LIBOBJS gmtime_r.$ac_objext"
|
||||
;;
|
||||
esac
|
||||
|
||||
fi
|
||||
|
||||
ac_fn_c_check_func "$LINENO" "pread" "ac_cv_func_pread"
|
||||
if test "x$ac_cv_func_pread" = xyes; then :
|
||||
$as_echo "#define HAVE_PREAD 1" >>confdefs.h
|
||||
@ -14998,7 +15036,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
|
||||
# report actual input values of CONFIG_FILES etc. instead of their
|
||||
# values after options handling.
|
||||
ac_log="
|
||||
This file was extended by file $as_me 5.22, which was
|
||||
This file was extended by file $as_me 5.23, which was
|
||||
generated by GNU Autoconf 2.69. Invocation command line was
|
||||
|
||||
CONFIG_FILES = $CONFIG_FILES
|
||||
@ -15064,7 +15102,7 @@ _ACEOF
|
||||
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
|
||||
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
|
||||
ac_cs_version="\\
|
||||
file config.status 5.22
|
||||
file config.status 5.23
|
||||
configured by $0, generated by GNU Autoconf 2.69,
|
||||
with options \\"\$ac_cs_config\\"
|
||||
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
x
Reference in New Issue
Block a user