Index: Makefile.in
--- Makefile.in.orig	2021-01-07 15:30:43.000000000 +0100
+++ Makefile.in	2021-01-07 19:29:13.323702000 +0100
@@ -1477,7 +1477,7 @@
 top_srcdir = @top_srcdir@
 ACLOCAL_AMFLAGS = -I m4
 EXTRA_DIST = ChangeLog.1 Make.rules
-SUBDIRS = doc gnu lib rmt src scripts po tests
+SUBDIRS = doc gnu lib src
 gen_start_date = 2009-03-06
 prev_change_log = ChangeLog.CVS
 changelog_dir = .
Index: gnu/argp-help.c
--- gnu/argp-help.c.orig	2021-01-07 19:29:13.324098000 +0100
+++ gnu/argp-help.c	2021-01-07 19:31:12.455554000 +0100
@@ -583,10 +583,7 @@
 /* Iterate across the long options of the given ENTRY.  Call FUNC for each.
    Stop when such a call returns a non-zero value, and return this value.
    If all FUNC invocations returned 0, return 0.  */
-static inline int
-#if (__GNUC__ >= 3) || (__clang_major__ >= 4)
-__attribute__ ((always_inline))
-#endif
+static int
 hol_entry_long_iterate (const struct hol_entry *entry,
                         int (*func)(const struct argp_option *opt,
                                     const struct argp_option *real,
Index: gnu/strerror.c
--- gnu/strerror.c.orig	2021-01-07 15:29:45.000000000 +0100
+++ gnu/strerror.c	2021-01-07 19:29:13.324333000 +0100
@@ -24,6 +24,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <limits.h>
 
 #include "intprops.h"
 #include "strerror-override.h"
Index: src/tar.c
--- src/tar.c.orig	2021-01-06 16:52:09.000000000 +0100
+++ src/tar.c	2021-01-07 19:29:13.324618000 +0100
@@ -18,6 +18,7 @@
    with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include <system.h>
+#include <locale.h>
 
 #include <fnmatch.h>
 #include <argp.h>
Index: src/utf8.c
--- src/utf8.c.orig	2021-01-06 16:52:09.000000000 +0100
+++ src/utf8.c	2021-01-07 19:29:13.324722000 +0100
@@ -23,6 +23,9 @@
 #include "common.h"
 #ifdef HAVE_ICONV_H
 # include <iconv.h>
+#else
+# define iconv_t void *
+# define ICONV_CONST const
 #endif
 
 #ifndef ICONV_CONST
Index: src/xheader.c
--- src/xheader.c.orig	2021-01-06 16:52:09.000000000 +0100
+++ src/xheader.c	2021-01-07 19:29:13.324926000 +0100
@@ -26,6 +26,10 @@
 
 #include "common.h"
 
+#ifndef SIZE_MAX
+# define SIZE_MAX ((size_t) -1)
+#endif
+
 static void xheader_init (struct xheader *xhdr);
 static bool xheader_protected_pattern_p (char const *pattern);
 static bool xheader_protected_keyword_p (char const *keyword);