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.
This commit is contained in:
parent
4822fb610c
commit
114994b110
2
debian/changelog
vendored
2
debian/changelog
vendored
@ -2,6 +2,8 @@ cmake (3.0.2-1) UNRELEASED; urgency=medium
|
|||||||
|
|
||||||
* New upstream release.
|
* New upstream release.
|
||||||
- Adds support for OpenRISC (or1k). (Closes: #749004)
|
- 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 <fgeyer@debian.org> Sat, 13 Sep 2014 15:31:25 +0200
|
-- Felix Geyer <fgeyer@debian.org> Sat, 13 Sep 2014 15:31:25 +0200
|
||||||
|
|
||||||
|
28
debian/patches/hurd_host_system_processor.diff
vendored
Normal file
28
debian/patches/hurd_host_system_processor.diff
vendored
Normal file
@ -0,0 +1,28 @@
|
|||||||
|
From 89d7a5a417dccbdc97107d30a6678e94ced9ca5d Mon Sep 17 00:00:00 2001
|
||||||
|
From: Felix Geyer <debfx@ubuntu.com>
|
||||||
|
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
|
||||||
|
|
1
debian/patches/series
vendored
1
debian/patches/series
vendored
@ -6,3 +6,4 @@ fix-FindImageMagick-1.diff
|
|||||||
fix-FindImageMagick-2.diff
|
fix-FindImageMagick-2.diff
|
||||||
fix-hdf5-hl.patch
|
fix-hdf5-hl.patch
|
||||||
FindJNI_ppc64le.diff
|
FindJNI_ppc64le.diff
|
||||||
|
hurd_host_system_processor.diff
|
||||||
|
Loading…
x
Reference in New Issue
Block a user