summaryrefslogtreecommitdiffstats
path: root/scripts/Dpkg
diff options
context:
space:
mode:
Diffstat (limited to 'scripts/Dpkg')
-rw-r--r--scripts/Dpkg/Vendor/Debian.pm15
1 files changed, 9 insertions, 6 deletions
diff --git a/scripts/Dpkg/Vendor/Debian.pm b/scripts/Dpkg/Vendor/Debian.pm
index fcf5b1e..b3be69e 100644
--- a/scripts/Dpkg/Vendor/Debian.pm
+++ b/scripts/Dpkg/Vendor/Debian.pm
@@ -117,7 +117,7 @@ sub set_build_features {
time64 => undef,
},
qa => {
- bug => 0,
+ bug => undef,
'bug-implicit-func' => undef,
canary => 0,
},
@@ -297,10 +297,6 @@ sub set_build_features {
if ($use_feature{abi}{time64} && ! $builtin_feature{abi}{time64}) {
# On glibc 64-bit time_t support requires LFS.
$use_feature{abi}{lfs} = 1 if $libc eq 'gnu';
-
- # Require -Werror=implicit-function-declaration, to avoid linking
- # against the wrong symbol.
- $use_feature{qa}{'bug-implicit-func'} = 1;
}
# XXX: Handle lfs alias from future abi feature area.
@@ -311,7 +307,14 @@ sub set_build_features {
## Area: qa
- $use_feature{qa}{'bug-implicit-func'} //= $use_feature{qa}{bug};
+ # For time64 we require -Werror=implicit-function-declaration, to avoid
+ # linking against the wrong symbol. Instead of enabling this conditionally
+ # on time64 being enabled, do it unconditionally so that the effects are
+ # uniform and visible on all architectures. Unless it has been set
+ # explicitly.
+ $use_feature{qa}{'bug-implicit-func'} //= $use_feature{qa}{bug} // 1;
+
+ $use_feature{qa}{bug} //= 0;
## Area: reproducible