From 114994b110ffd93b075f2969d70748bcd14472d3 Mon Sep 17 00:00:00 2001 From: Felix Geyer Date: Sat, 13 Sep 2014 15:39:17 +0200 Subject: [PATCH] Detect the processor when running on Hurd. * Detect the processor when running on Hurd. (Closes: #761060) - Add hurd_host_system_processor.diff, cherry-picked from upstream. --- debian/changelog | 2 ++ .../patches/hurd_host_system_processor.diff | 28 +++++++++++++++++++ debian/patches/series | 1 + 3 files changed, 31 insertions(+) create mode 100644 debian/patches/hurd_host_system_processor.diff diff --git a/debian/changelog b/debian/changelog index a6b617f45..63724f5ad 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,8 @@ cmake (3.0.2-1) UNRELEASED; urgency=medium * New upstream release. - Adds support for OpenRISC (or1k). (Closes: #749004) + * Detect the processor when running on Hurd. (Closes: #761060) + - Add hurd_host_system_processor.diff, cherry-picked from upstream. -- Felix Geyer Sat, 13 Sep 2014 15:31:25 +0200 diff --git a/debian/patches/hurd_host_system_processor.diff b/debian/patches/hurd_host_system_processor.diff new file mode 100644 index 000000000..8ae20f62a --- /dev/null +++ b/debian/patches/hurd_host_system_processor.diff @@ -0,0 +1,28 @@ +From 89d7a5a417dccbdc97107d30a6678e94ced9ca5d Mon Sep 17 00:00:00 2001 +From: Felix Geyer +Date: Wed, 10 Sep 2014 08:55:00 -0400 +Subject: [PATCH] Fix CMAKE_HOST_SYSTEM_PROCESSOR detection on GNU/Hurd + (#15147) + +On Debian GNU/Hurd 'uname -p' prints "unknown", so use 'uname -m' +instead. +--- + Modules/CMakeDetermineSystem.cmake | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Modules/CMakeDetermineSystem.cmake b/Modules/CMakeDetermineSystem.cmake +index 1c0941a..fe292ea 100644 +--- a/Modules/CMakeDetermineSystem.cmake ++++ b/Modules/CMakeDetermineSystem.cmake +@@ -47,7 +47,7 @@ if(CMAKE_HOST_UNIX) + if(CMAKE_UNAME) + exec_program(uname ARGS -s OUTPUT_VARIABLE CMAKE_HOST_SYSTEM_NAME) + exec_program(uname ARGS -r OUTPUT_VARIABLE CMAKE_HOST_SYSTEM_VERSION) +- if(CMAKE_HOST_SYSTEM_NAME MATCHES "Linux|CYGWIN.*|Darwin") ++ if(CMAKE_HOST_SYSTEM_NAME MATCHES "Linux|CYGWIN.*|Darwin|^GNU$") + exec_program(uname ARGS -m OUTPUT_VARIABLE CMAKE_HOST_SYSTEM_PROCESSOR + RETURN_VALUE val) + if(CMAKE_HOST_SYSTEM_NAME STREQUAL "Darwin" AND +-- +1.7.10.4 + diff --git a/debian/patches/series b/debian/patches/series index e6362deae..080b2cff0 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -6,3 +6,4 @@ fix-FindImageMagick-1.diff fix-FindImageMagick-2.diff fix-hdf5-hl.patch FindJNI_ppc64le.diff +hurd_host_system_processor.diff