[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

tar rebootstrap fix for hurd-i386



Hello,

tar currently FTBFS in the hurd-i386 rebootstrap, because we don't plan
to take the time to fix year 2038 on that arch when hurd-amd64 is there.
Here is a fix to ignore the issue, also available in my tree

git@salsa.debian.org:sthibault/rebootstrap.git

as d66f8e86280af0c8677c9fe1f8d9bc05f4034e49

Samuel
commit d66f8e86280af0c8677c9fe1f8d9bc05f4034e49
Author: Samuel Thibault <samuel.thibault@ens-lyon.org>
Date:   Tue Jul 8 14:54:55 2025 +0200

    hurd-i386: avoid hurd-i386 y2038 concern
    
    as submitted in #1078002

diff --git a/bootstrap.sh b/bootstrap.sh
index 1e5b46b..bfea05d 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -3136,6 +3136,34 @@ add_automatic sqlite3
 add_automatic sysvinit
 
 add_automatic tar
+patch_tar() {
+	echo "avoid hurd-i386 y2038 concern #1078002"
+	drop_privs patch -p0 <<'EOF'
+--- debian/rules.original	2024-08-05 20:11:02.000000000 +0200
++++ debian/rules	2024-08-05 20:11:15.000000000 +0200
+@@ -5,6 +5,10 @@
+ export DEB_BUILD_MAINT_OPTIONS = future=+lfs
+ export DEB_CFLAGS_MAINT_APPEND = -Wall -Wno-analyzer-null-argument
+ 
++ifeq ($(DEB_HOST_ARCH),hurd-i386)
++  Y2038 = --disable-year2038
++endif
++
+ %:
+ 	dh $@
+ 
+@@ -18,7 +22,8 @@
+ 		--libexecdir=/usr/sbin \
+ 		--enable-backup-scripts \
+ 		--with-lzma=xz \
+-		--disable-silent-rules
++		--disable-silent-rules \
++		$(Y2038)
+ 
+ override_dh_auto_test:
+ ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
+EOF
+}
 buildenv_tar() {
 	if dpkg-architecture "-a$1" -ignu-any-any; then
 		echo "struct dirent contains working d_ino on glibc systems"

Reply to: