diff options
| author | Steven Chamberlain <steven@pyro.eu.org> | 2016-05-10 03:17:29 +0200 |
|---|---|---|
| committer | Guillem Jover <guillem@debian.org> | 2016-07-03 18:44:21 +0200 |
| commit | c7fc55a0b1d82dd2056d8f0a35d016f976ba6fab (patch) | |
| tree | da91cb8a111bc3aaecc69c0225928fac6defa59f | |
| parent | ae799cf4b90d97fa29803bbb84f711e106f4466a (diff) | |
| download | dpkg-c7fc55a0b1d82dd2056d8f0a35d016f976ba6fab.tar.gz | |
Dpkg::Vendor::Debian: Do not disable PIE buildflags on */kFreeBSD anymore
The flag should work on all current */kFreeBSD systems now.
Closes: #823877
Signed-off-by: Guillem Jover <guillem@debian.org>
| -rw-r--r-- | debian/changelog | 2 | ||||
| -rw-r--r-- | scripts/Dpkg/Vendor/Debian.pm | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog index f1bf4e599..148a407fb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,8 @@ dpkg (1.18.8) UNRELEASED; urgency=medium [ Guillem Jover ] + * Do not disable PIE buildflags on */kFreeBSD anymore. Closes: #823877 + Thanks to Steven Chamberlain <steven@pyro.eu.org>. * Perl modules: - Use warnings::warnif() instead of carp() for deprecated warnings. * Test suite: diff --git a/scripts/Dpkg/Vendor/Debian.pm b/scripts/Dpkg/Vendor/Debian.pm index 207486dc2..fa5e1c257 100644 --- a/scripts/Dpkg/Vendor/Debian.pm +++ b/scripts/Dpkg/Vendor/Debian.pm @@ -269,9 +269,9 @@ sub _add_hardening_flags { $self->_parse_feature_area('hardening', \%use_feature); # Mask features that are not available on certain architectures. - if ($os !~ /^(?:linux|knetbsd|hurd)$/ or + if ($os !~ /^(?:linux|kfreebsd|knetbsd|hurd)$/ or $cpu =~ /^(?:hppa|avr32)$/) { - # Disabled on non-linux/knetbsd/hurd (see #430455 and #586215). + # Disabled on non-(linux/kfreebsd/knetbsd/hurd). # Disabled on hppa, avr32 # (#574716). $use_feature{pie} = 0; |