summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHelmut Grohne <helmut@subdivi.de>2019-05-17 19:41:39 +0000
committerNiels Thykier <niels@thykier.net>2019-05-17 19:52:34 +0000
commitbc0cc3204fd919e362e35f18b7df9547f37d30ce (patch)
treeb158dff52d440dcb1245fa048f23e0c5a3c70a54
parent10202ad96b99a1e357b5d11d2dad549ae198fbad (diff)
downloaddebhelper-bc0cc3204fd919e362e35f18b7df9547f37d30ce.tar.gz
cmake.pm: Emit correct CMAKE_SYSTEM_PROCESSOR for mips64el during cross builds
Signed-off-by: Niels Thykier <niels@thykier.net>
-rw-r--r--debian/changelog5
-rw-r--r--lib/Debian/Debhelper/Buildsystem/cmake.pm1
2 files changed, 6 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index d94abfd1..9e40c973 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,16 @@
debhelper (12.1.2) UNRELEASED; urgency=medium
+ [ Niels Thykier ]
* Dh_Lib: Ensure the error function always triggers the same
exit code on termination. Previously, it depended on the
value of the last error (if any).
* Buildsystem/make: Fix regression where cross-flags were
passed in a non-cross build. (Closes: #925175)
+ [ Helmut Grohne ]
+ * Buildsystem/cmake: Fix CMAKE_SYSTEM_PROCESSOR for mips64el.
+ (Closes: #926815)
+
-- Niels Thykier <niels@thykier.net> Mon, 25 Feb 2019 07:23:03 +0000
debhelper (12.1.1) unstable; urgency=medium
diff --git a/lib/Debian/Debhelper/Buildsystem/cmake.pm b/lib/Debian/Debhelper/Buildsystem/cmake.pm
index ee8abb26..1d5bd1a9 100644
--- a/lib/Debian/Debhelper/Buildsystem/cmake.pm
+++ b/lib/Debian/Debhelper/Buildsystem/cmake.pm
@@ -27,6 +27,7 @@ my %DEB_HOST2CMAKE_SYSTEM = (
);
my %GNU_CPU2SYSTEM_PROCESSOR = (
+ 'mips64el' => 'mips64',
'powerpc64le' => 'ppc64le',
);