Skip to content

Commit 4efce94

Browse files
author
ripley
committed
add bsdtar to commands checked for TAR
git-svn-id: https://svn.r-project.org/R/trunk@88327 00db46b3-68df-0310-9c12-caf00c1e9a41
1 parent 59b2586 commit 4efce94

File tree

4 files changed

+7
-5
lines changed

4 files changed

+7
-5
lines changed

configure

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5665,7 +5665,7 @@ printf "%s\n" "$as_me: WARNING: ${warn_pager}" >&2;}
56655665
fi
56665666

56675667
## Tar -- we prefer a GNU version
5668-
for ac_prog in ${TAR} gtar gnutar tar
5668+
for ac_prog in ${TAR} gtar gnutar tar bsdtar
56695669
do
56705670
# Extract the first word of "$ac_prog", so it can be a program name with args.
56715671
set dummy $ac_prog; ac_word=$2

configure.ac

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -705,7 +705,7 @@ AC_SUBST(MAKE)
705705
## Pager
706706
R_PROG_PAGER
707707
## Tar -- we prefer a GNU version
708-
AC_PATH_PROGS(TAR, [${TAR} gtar gnutar tar], "")
708+
AC_PATH_PROGS(TAR, [${TAR} gtar gnutar tar bsdtar], "")
709709
## TeXMF stuff
710710
R_PROG_TEXMF
711711
## Unzip & zip & gzip & bip2

doc/NEWS.Rd

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,8 @@
6666
6767
\subsection{INSTALLATION}{
6868
\itemize{
69-
\item .
69+
\item \command{configure} appends \command{bsdtar} to the list of
70+
command names it tries when finding a default for \env{TAR}.
7071
}
7172
}
7273

src/library/utils/man/tar.Rd

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -105,11 +105,12 @@ tar(tarfile, files = NULL,
105105
FreeBSD and Windows 10 use \command{bsdtar} from the \I{libarchive}
106106
project (but for macOS often a quite-old version), and commercial
107107
Unixes will have their own versions. \command{bsdtar} is available for
108-
many other platforms: macOS up to at least 10.9 (but not recently) had
108+
many other platforms (sometimes bundled with \code{libarchive},
109+
sometimes not) : macOS used to have
109110
GNU \command{tar} as \command{gnutar} and other platforms,
110111
e.g.\sspace{}Solaris, have it as \command{gtar}: on a Unix-alike
111112
\command{configure} will try \command{gnutar} and \command{gtar}
112-
before \code{tar}.
113+
before \command{tar} (and then \command{bsdtar}).
113114

114115
%% Heirloom Toolchest (http://heirloom.sourceforge.net/) is
115116
%% another implementation available on NetBSD, but probably not the default.

0 commit comments

Comments
 (0)