Hi Paul,
Collin Funk <collin.fu...@gmail.com> writes:
> Some library names in Gnulib changed on or around 2023-01-07 (see NEWS).
> This patch fixes variables in tar's Makefile's.
I think this patch might have gotten lost like my bug-gzip one.
I've attached a fixed version that doesn't incorrectly remove
$(LIB_ACL). Could you please check it?
Also, building GNU tar fails on my system using xgettext 0.22.5 from
this error:
/usr/bin/xgettext: Non-ASCII comment at or before src/checkpoint.c:251.
Please specify the source encoding through --from-code.
make[3]: *** [Makefile:307: tar.pot-update] Error 1
make[3]: Leaving directory '/home/collin/.local/src/tar/po'
make[2]: *** [Makefile:375: tar.pot] Error 2
make[2]: Leaving directory '/home/collin/.local/src/tar/po'
make[1]: *** [Makefile:1936: all-recursive] Error 1
make[1]: Leaving directory '/home/collin/.local/src/tar'
make: *** [Makefile:1876: all] Error 2
I think my second patch should fix this by using the '--from-code=UTF-8'
argument.
Collin
>From 2fcc9cba8f6d415fe07b388e0d6d2f6104fa8576 Mon Sep 17 00:00:00 2001
From: Collin Funk <collin.fu...@gmail.com>
Date: Wed, 11 Sep 2024 18:52:47 -0700
Subject: [PATCH 1/2] maint: Update library names used by Gnulib.
* src/Makefile.am (tar_LDADD):
* tests/Makefile.am (LDADD): Update library names according to Gnulib.
---
src/Makefile.am | 6 +++---
tests/Makefile.am | 6 +++---
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/Makefile.am b/src/Makefile.am
index 10b12e3e..ea690097 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -50,7 +50,7 @@ AM_CPPFLAGS = -I$(top_srcdir)/gnu -I../ -I../gnu -I$(top_srcdir)/lib -I../lib
AM_CFLAGS = $(WARN_CFLAGS) $(WERROR_CFLAGS)
tar_LDADD = $(LIBS) ../lib/libtar.a ../gnu/libgnu.a\
- $(LIB_ACL) $(LIB_CLOCK_GETTIME) $(LIB_EACCESS)\
- $(LIB_GETRANDOM) $(LIB_HARD_LOCALE) $(FILE_HAS_ACL_LIB) $(LIB_MBRTOWC)\
- $(LIB_SELINUX) $(LIB_SETLOCALE_NULL) \
+ $(LIB_ACL) $(QCOPY_ACL_LIB) $(CLOCK_TIME_LIB) $(EUIDACCESS_LIBGEN)\
+ $(GETRANDOM_LIB) $(HARD_LOCALE_LIB) $(FILE_HAS_ACL_LIB) $(MBRTOWC_LIB)\
+ $(LIB_SELINUX) $(SETLOCALE_NULL_LIB) \
$(LIBINTL) $(LIBICONV)
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 5b890b7c..b7431666 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -340,7 +340,7 @@ AM_CPPFLAGS = \
-DLOCALEDIR=\"$(localedir)\"
LDADD = ../gnu/libgnu.a\
- $(LIB_ACL) $(LIB_CLOCK_GETTIME) $(LIB_EACCESS)\
- $(LIB_GETRANDOM) $(LIB_HARD_LOCALE) $(FILE_HAS_ACL_LIB) $(LIB_MBRTOWC)\
- $(LIB_SELINUX) $(LIB_SETLOCALE_NULL) \
+ $(LIB_ACL) $(QCOPY_ACL_LIB) $(CLOCK_TIME_LIB) $(EUIDACCESS_LIBGEN)\
+ $(GETRANDOM_LIB) $(HARD_LOCALE_LIB) $(FILE_HAS_ACL_LIB) $(MBRTOWC_LIB)\
+ $(LIB_SELINUX) $(SETLOCALE_NULL_LIB) \
$(LIBINTL) $(LIBICONV)
--
2.46.0
>From b6e70d8a404cdd0522564be4fa666483448b9b05 Mon Sep 17 00:00:00 2001
From: Collin Funk <collin.fu...@gmail.com>
Date: Wed, 11 Sep 2024 19:02:47 -0700
Subject: [PATCH 2/2] maint: Fix build error caused by xgettext.
* bootstrap.conf (XGETTEXT_OPTIONS): Add --from-code=UTF-8.
---
bootstrap.conf | 1 +
1 file changed, 1 insertion(+)
diff --git a/bootstrap.conf b/bootstrap.conf
index fb75422c..497e5765 100644
--- a/bootstrap.conf
+++ b/bootstrap.conf
@@ -41,6 +41,7 @@ XGETTEXT_OPTIONS=$XGETTEXT_OPTIONS'\\\
--flag=__argp_failure:4:c-format\\\
--flag=argp_fmtstream_printf:2:c-format\\\
--flag=__argp_fmtstream_printf:2:c-format\\\
+ --from-code=UTF-8\\\
'
# Gettext supplies these files, but we don't need them since
--
2.46.0
