[pocl] 02/03: fix cmake i386 detection

[Andreas Beckmann]

This is an automated email from the git hooks/post-receive script.

anbe pushed a commit to branch experimental
in repository pocl.

commit 53535427cd70a33691cd7a620820cf14f6672632
Author: Andreas Beckmann <anbe at debian.org>
Date:   Tue Nov 28 02:00:12 2017 +0100

    fix cmake i386 detection
---
 debian/changelog                    |  6 ++++++
 debian/patches/fix-tests-i386.patch | 13 ++++++++++++-
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 73a0f26..72305ae 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+pocl (0.13-13) UNRELEASED; urgency=medium
+
+  * Fix cmake i386 detection, thanks to James Price.  (Closes: #882875)
+
+ -- Andreas Beckmann <anbe at debian.org>  Tue, 28 Nov 2017 01:58:53 +0100
+
 pocl (0.13-12) experimental; urgency=medium
 
   * Switch to cmake build system.
diff --git a/debian/patches/fix-tests-i386.patch b/debian/patches/fix-tests-i386.patch
index 33a5ff0..5a940fc 100644
--- a/debian/patches/fix-tests-i386.patch
+++ b/debian/patches/fix-tests-i386.patch
@@ -3,7 +3,7 @@ Description: also skip test on i586 CPU
 
 --- a/tests/testsuite.at
 +++ b/tests/testsuite.at
-@@ -87,7 +87,7 @@ AT_CLEANUP
+@@ -88,7 +88,7 @@ AT_CLEANUP
  
  AT_SETUP([Kernel functions printf])
  # On 32-bit x86, accessing int4 via va_arg segfaults (wrong alignment?)
@@ -12,3 +12,14 @@ Description: also skip test on i586 CPU
  AT_XFAIL_IF([egrep -q "#define LLVM_3_2|#define LLVM_3_3" $abs_top_builddir/config.h])
  AT_KEYWORDS([printf])
  AT_CHECK_UNQUOTED([$abs_top_builddir/tests/kernel/kernel test_printf], 0,
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -42,7 +42,7 @@ elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "a
+   set(ARMV7 1)
+ elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "armv6")
+   set(ARMV6 1)
+-elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "(i386|AMD64|x86_64)")
++elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "(i.86|AMD64|x86_64)")
+   if(POCL_DEVICE_ADDRESS_BITS MATCHES "32")
+     set(I386 1)
+   else()

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/collab-maint/pocl.git