[beignet] 01/03: Don't #define __SSE(2)__

[Rebecca Palmer]

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

rnpalmer-guest pushed a commit to branch master
in repository beignet.

commit e9f90520f7a38a363cc13b9ee37834f88005a43e
Author: Rebecca N. Palmer <rebecca_palmer at zoho.com>
Date:   Tue May 3 07:31:23 2016 +0100

    Don't #define __SSE(2)__
    
    This was causing an FTBFS on i386, and possibly unrunnable code on
    very old processors (while beignet can't do anything useful on such
    processors, we do expect it to be able to say so without crashing)
---
 debian/changelog                                   |  4 +++
 .../Debian-compliant-compiler-flags-handling.patch | 34 +++++++++++++++++++++-
 2 files changed, 37 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index fc56c4b..806fff1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,11 @@
 beignet (1.1.2-2) UNRELEASED; urgency=medium
 
+  [ Andreas Beckmann ]
   * Drop the -dbg package in favor of autogenerated -dbgsym packages.
 
+  [ Rebecca N. Palmer ]
+  * Remove SSE(2) #defines to fix i386 FTBFS.
+
  -- Andreas Beckmann <anbe at debian.org>  Mon, 02 May 2016 11:49:55 +0200
 
 beignet (1.1.2-1) unstable; urgency=medium
diff --git a/debian/patches/Debian-compliant-compiler-flags-handling.patch b/debian/patches/Debian-compliant-compiler-flags-handling.patch
index 0ea9a26..07d00fc 100644
--- a/debian/patches/Debian-compliant-compiler-flags-handling.patch
+++ b/debian/patches/Debian-compliant-compiler-flags-handling.patch
@@ -35,4 +35,36 @@ Author: Simon Richter <sjr at debian.org>,Rebecca Palmer <rebecca_palmer at zoho.com>
  set (CMAKE_CXX_FLAGS_DEBUG          "-O0 -g -DGBE_DEBUG=1")
  set (CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -g -DGBE_DEBUG=1")
  set (CMAKE_CXX_FLAGS_MINSIZEREL     "-Os -DNDEBUG -DGBE_DEBUG=0")
-
+--- beignet-1.1.2.orig/backend/src/sys/platform.hpp
++++ beignet-1.1.2/backend/src/sys/platform.hpp
+@@ -41,15 +41,6 @@
+ #define __X86__
+ #endif
+ 
+-/* We require SSE ... */
+-#ifndef __SSE__
+-#define __SSE__
+-#endif
+-
+-/* ... and SSE2 */
+-#ifndef __SSE2__
+-#define __SSE2__
+-#endif
+ 
+ #if defined(_INCLUDED_IMM)
+ // #define __AVX__
+--- beignet-1.1.2.orig/utests/CMakeLists.txt
++++ beignet-1.1.2/utests/CMakeLists.txt
+@@ -260,6 +260,12 @@ add_custom_target(utest_generator
+     WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+     )
+ 
++#the test suite doesn't go into the final package, and compiler_{degrees,radians,function_argument2} use equality comparison of floats
++if (COMPILER STREQUAL "GCC")
++  SET(CMAKE_CXX_FLAGS "-msse -mfpmath=sse ${CMAKE_CXX_FLAGS}")
++  SET(CMAKE_C_FLAGS "-msse -mfpmath=sse ${CMAKE_C_FLAGS}")
++endif ()
++
+ if (EGL_FOUND AND MESA_SOURCE_FOUND)
+   SET(utests_sources ${utests_sources} compiler_fill_gl_image.cpp)
+   SET(CMAKE_CXX_FLAGS "-DHAS_EGL ${CMAKE_CXX_FLAGS} ${DEF_OCL_PCH_PCM_PATH}")

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-opencl/beignet.git