Bug#1060246: perl: diff for NMU version 5.38.2-3.1

2024-02-29 Thread Niko Tyni
On Thu, Feb 29, 2024 at 10:24:06AM +0100, Julian Andres Klode wrote:
> Control: tags 1060246 + patch
> Control: tags 1060246 + pending
> 
> Dear maintainer,
> 
> I have prepared the following NMU, taking into consideration the
> feedback to only override the ABI on the affected architectures.
> 
> I'm not sure I want to upload it now, but as it stands, anything
> build-depending on libapt-pkg-perl and other perl bindings to t64
> libraries will FTBFS.
> 
> I uploaded it to Ubuntu but it's stuck waiting for db5.3; I believe
> vorlon has done binary-uploads for db5.3 in Debian to unblock it
> there though.
> 
> Let me know what you think.

Thanks.

It's clear that the perlapi names need to be bumped on the affected
ports like this patch does. Just binNMU'ing perl as-is would lead to a
perl that can't load the binary modules in arch:any lib*-perl packages
in the archive.

I'm much less clear on whether a libperl5.38t64 package will be needed.

Any necessary NMUs are welcome (assuming the uploader takes the normal
responsibility of course). I don't intend to upload time64 related changes
myself (at least not on any kind of a short notice after waiting a month
for comments.)

No idea if the test failures mentioned in this bug will block things,
but I'm sure the uploader will find out.

That said,

> +ifeq (,$(findstring $(DEB_HOST_ARCH), amd64 arm64 hurd-i386 i386 mips64el 
> ppc64el riscv64 s390x))

isn't this a substring match where i386 already covers hurd-i386? Guess
that doesn't matter much though and none of those words match any intended
port architectures.
-- 
Niko



Bug#1060246: perl: diff for NMU version 5.38.2-3.1

2024-02-29 Thread Julian Andres Klode
Control: tags 1060246 + patch
Control: tags 1060246 + pending

Dear maintainer,

I have prepared the following NMU, taking into consideration the
feedback to only override the ABI on the affected architectures.

I'm not sure I want to upload it now, but as it stands, anything
build-depending on libapt-pkg-perl and other perl bindings to t64
libraries will FTBFS.

I uploaded it to Ubuntu but it's stuck waiting for db5.3; I believe
vorlon has done binary-uploads for db5.3 in Debian to unblock it
there though.

Let me know what you think.

Regards.


-- 
debian developer - deb.li/jak | jak-linux.org - free software dev
ubuntu core developer  i speak de, en
diff -Nru perl-5.38.2/debian/changelog perl-5.38.2/debian/changelog
--- perl-5.38.2/debian/changelog	2024-01-12 17:16:08.0 +0100
+++ perl-5.38.2/debian/changelog	2024-02-29 10:18:06.0 +0100
@@ -1,3 +1,9 @@
+perl (5.38.2-3.1) unstable; urgency=medium
+
+  * debian/rules: Use t64 perl ABI on 32-bit architectures
+
+ -- Julian Andres Klode   Thu, 29 Feb 2024 10:18:06 +0100
+
 perl (5.38.2-3) unstable; urgency=medium
 
   * Unbreak locale initialization when embedding perl. (Closes: #1060456)
diff -Nru perl-5.38.2/debian/control perl-5.38.2/debian/control
--- perl-5.38.2/debian/control	2024-01-09 20:57:59.0 +0100
+++ perl-5.38.2/debian/control	2024-02-29 10:07:25.0 +0100
@@ -1,7 +1,8 @@
 Source: perl
 Section: perl
 Priority: standard
-Maintainer: Niko Tyni 
+Maintainer: Ubuntu Developers 
+XSBC-Original-Maintainer: Niko Tyni 
 Uploaders: Dominic Hargreaves 
 Standards-Version: 3.9.8
 Homepage: http://dev.perl.org/perl5/
diff -Nru perl-5.38.2/debian/rules perl-5.38.2/debian/rules
--- perl-5.38.2/debian/rules	2024-01-06 16:59:56.0 +0100
+++ perl-5.38.2/debian/rules	2024-02-29 10:04:01.0 +0100
@@ -23,7 +23,12 @@
 
 # If nonempty, this will determine $Config{debian_abi} and Provides: entries
 # (otherwise, the Provides: entries will be generated by debian/mkprovides)
-perlabi =
+ifeq (,$(findstring $(DEB_HOST_ARCH), amd64 arm64 hurd-i386 i386 mips64el ppc64el riscv64 s390x))
+	# see #1060246
+	perlabi = 5.38.2t64
+else
+	perlabi =
+endif
 
 DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)