summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSteven Chamberlain <stevenc@debian.org>2017-03-04 07:11:16 +0000
committerNiels Thykier <niels@thykier.net>2017-03-04 07:11:16 +0000
commite2b4cb10ad09f77c3e91e0d8603d1ccfa5327125 (patch)
treebaab1f2ddc661820d449c10f390bb40dc9408c64
parent90ed90ddfbe705e2a9a95b258d9620aa1fc04162 (diff)
downloaddebhelper-e2b4cb10ad09f77c3e91e0d8603d1ccfa5327125.tar.gz
dh_auto_configure: wrong CMAKE_SYSTEM_NAME for kfreebsd cross-builds
Signed-off-by: Niels Thykier <niels@thykier.net>
-rw-r--r--Debian/Debhelper/Buildsystem/cmake.pm2
-rw-r--r--debian/changelog5
2 files changed, 6 insertions, 1 deletions
diff --git a/Debian/Debhelper/Buildsystem/cmake.pm b/Debian/Debhelper/Buildsystem/cmake.pm
index 338f65e0..e9a6bbb0 100644
--- a/Debian/Debhelper/Buildsystem/cmake.pm
+++ b/Debian/Debhelper/Buildsystem/cmake.pm
@@ -21,7 +21,7 @@ my @STANDARD_CMAKE_FLAGS = qw(
my %DEB_HOST2CMAKE_SYSTEM = (
'linux' => 'Linux',
- 'kfreebsd' => 'FreeBSD',
+ 'kfreebsd' => 'kFreeBSD',
'hurd' => 'GNU',
);
diff --git a/debian/changelog b/debian/changelog
index 20788970..852b0c82 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,11 @@ debhelper (10.2.6) UNRELEASED; urgency=medium
of the order of the fields in a given paragraph of debian/control.
(Closes: #847138)
+ [ Steven Chamberlain ]
+ * When cross-compiling for GNU/kFreeBSD host systems, set
+ CMAKE_SYSTEM_NAME to the correct value "kFreeBSD", not "FreeBSD".
+ (Closes: #856688)
+
-- Helmut Grohne <helmut@subdivi.de> Sat, 18 Feb 2017 17:49:08 +0000
debhelper (10.2.5) unstable; urgency=medium