This is an automated email from the git hooks/post-receive script. guillem pushed a commit to branch main in repository dpkg.
View the commit online: https://git.dpkg.org/cgit/dpkg/dpkg.git/commit/?id=549e8cd21c979ab62d6fb91dcf3bb2abe9d73647 commit 549e8cd21c979ab62d6fb91dcf3bb2abe9d73647 Author: Guillem Jover <[email protected]> AuthorDate: Thu May 18 02:39:40 2023 +0200 Dpkg::Vendor::Debian: Only use ABI bits to suppress LFS or time64 features The CPU bits are not relevant for the actual ABI, and we should not use them here, or we can get incorrect results for architectures that run on a 64-bit CPU but have a 32-bit ABI. --- scripts/Dpkg/Vendor/Debian.pm | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/scripts/Dpkg/Vendor/Debian.pm b/scripts/Dpkg/Vendor/Debian.pm index d80564356..6f90842e8 100644 --- a/scripts/Dpkg/Vendor/Debian.pm +++ b/scripts/Dpkg/Vendor/Debian.pm @@ -166,7 +166,6 @@ sub set_build_features { my $arch = Dpkg::Arch::get_host_arch(); my ($abi, $libc, $os, $cpu) = Dpkg::Arch::debarch_to_debtuple($arch); my ($abi_bits, $abi_endian) = Dpkg::Arch::debarch_to_abiattrs($arch); - my $cpu_bits = Dpkg::Arch::debarch_to_cpubits($arch); unless (defined $abi and defined $libc and defined $os and defined $cpu) { warning(g_("unknown host architecture '%s'"), $arch); @@ -177,8 +176,7 @@ sub set_build_features { if ($use_feature{future}{time64}) { if (any { $cpu eq $_ } qw(arc or1k) or - $abi_bits != 32 or - $cpu_bits != 32) { + $abi_bits != 32) { $use_feature{future}{time64} = 0; } else { # On glibc 64-bit time_t support requires LFS. @@ -187,7 +185,7 @@ sub set_build_features { } if ($use_feature{future}{lfs}) { - if ($abi_bits != 32 or $cpu_bits != 32) { + if ($abi_bits != 32) { $use_feature{future}{lfs} = 0; } } -- Dpkg.Org's dpkg
