Bug#1026204: tar FTBFS on armel, armhf, i386, hppa, powerpc and sparc64

[Paul Gevers]

Control: tags -1 pending patch

Hi all,

On Tue, 31 Jan 2023 18:27:27 +0100 Andreas Henriksson <andr...@fatal.se> wrote:

> So, please use this hunk instead. It compiles for me on amd64 and 32-bit hppa.
> ------------
> export DEB_BUILD_MAINT_OPTIONS = future=+lfs
> export DEB_CFLAGS_MAINT_APPEND = -Wall -Wno-analyzer-null-argument

Might be useful to add a comment here saying:

# Workaround gnulib issue: The below three lines can be dropped once tar >= 
1.35 is used.
> ifneq ($(shell dpkg-architecture -qDEB_TARGET_ARCH_BITS),64)
> export DEB_CPPFLAGS_MAINT_APPEND = -D_TIME_BITS=64
> endif

> include /usr/share/dpkg/buildflags.mk
> -----------

> > DPKG_EXPORT_BUILDFLAGS = 1

Paul

diff -Nru tar-1.34+dfsg/debian/changelog tar-1.34+dfsg/debian/changelog
--- tar-1.34+dfsg/debian/changelog      2022-11-20 15:52:41.000000000 +0100
+++ tar-1.34+dfsg/debian/changelog      2023-04-06 16:25:47.000000000 +0200
@@ -1,3 +1,11 @@
+tar (1.34+dfsg-1.2) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Build with lfs and -D_TIME_BITS=64 on 32 bits archs (Closes: #1026204)
+    Thanks to Andreas Henriksson and Helge Deller
+
+ -- Paul Gevers <elb...@debian.org>  Thu, 06 Apr 2023 16:25:47 +0200
+
 tar (1.34+dfsg-1.1) unstable; urgency=medium
 
   * Non-maintainer upload
diff -Nru tar-1.34+dfsg/debian/rules tar-1.34+dfsg/debian/rules
--- tar-1.34+dfsg/debian/rules  2022-11-19 16:38:39.000000000 +0100
+++ tar-1.34+dfsg/debian/rules  2023-04-06 16:25:47.000000000 +0200
@@ -1,15 +1,23 @@
 #!/usr/bin/make -f
 
+include /usr/share/dpkg/architecture.mk
+
 DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 ifneq ($(DEB_BUILD_GNU_TYPE),$(DEB_HOST_GNU_TYPE))
 CONFARGS = --host=$(DEB_HOST_GNU_TYPE)
 endif
 
-CFLAGS = `dpkg-buildflags --get CFLAGS`
-CFLAGS += -Wall -Wno-analyzer-null-argument
-LDFLAGS += `dpkg-buildflags --get LDFLAGS`
-CPPFLAGS = `dpkg-buildflags --get CPPFLAGS`
+export DEB_BUILD_MAINT_OPTIONS = future=+lfs
+export DEB_CFLAGS_MAINT_APPEND = -Wall -Wno-analyzer-null-argument
+# Workaround gnulib issue: The below three lines can be dropped once
+# tar >= 1.35 is used.
+ifeq (32,$(DEB_HOST_ARCH_BITS))
+export DEB_CPPFLAGS_MAINT_APPEND = -D_TIME_BITS=64
+endif
+
+DPKG_EXPORT_BUILDFLAGS = 1
+include /usr/share/dpkg/buildflags.mk
 
 export BUILD_DATE = $(shell dpkg-parsechangelog | sed -n -e 's/^Date: //p')
 

I have uploaded the attached debdiff to DELAYED/2 and pushed my changes to salsa. If nobody shouts that I understood the intentions correctly and/or cancels the upload, it should land in two days in unstable

OpenPGP_signature
Description: OpenPGP digital signature