[bollin] r5473 committed - * Disable sse on i386 architectures to fix FTBS....

[bol...@googlecode.com]

Revision: 5473
Author: Soeren.Sonnenburg
Date: Mon Jul 7 14:56:42 2014 UTC
Log: * Disable sse on i386 architectures to fix FTBS.
* Add arc4random to build deps.
http://code.google.com/p/bollin/source/detail?r=5473

Added:
/shogun/trunk/debian/patches/disable_sse.diff
/shogun/trunk/debian/patches/series
Modified:
/shogun/trunk/debian/changelog
/shogun/trunk/debian/control
/shogun/trunk/debian/rules

=======================================
--- /dev/null
+++ /shogun/trunk/debian/patches/disable_sse.diff Mon Jul 7 14:56:42 2014
UTC
@@ -0,0 +1,19 @@
+--- a/debian/bollin/shogun/build-area/shogun_3.2.0/CMakeLists.txt
++++ b/debian/bollin/shogun/build-area/shogun_3.2.0/CMakeLists.txt
+@@ -482,14 +482,14 @@ CHECK_CXX_SOURCE_COMPILES(
+ AppendToDefines(HAVE_STD_ISNAN)
+
+ # check SSE and SSE2 intrinsics header
+-IF(NOT CYGWIN)
++IF((NOT CYGWIN) AND (NOT DISABLE_SSE))
+ include(CheckIncludeFile)
+ CHECK_INCLUDE_FILE(xmmintrin.h HAVE_BUILTIN_VECTOR)
+ CHECK_INCLUDE_FILE(emmintrin.h HAVE_SSE2)
+ IF(HAVE_SSE2)
+ LIST(APPEND DEFINES HAVE_SSE2)
+ ENDIF(HAVE_SSE2)
+-ENDIF(NOT CYGWIN)
++ENDIF((NOT CYGWIN) AND (NOT DISABLE_SSE))
+
+ ###### checks for random
+ CHECK_FUNCTION_EXISTS(arc4random HAVE_ARC4RANDOM) IF(NOT HAVE_ARC4RANDOM)
# assume that /dev/random is non-blocking if /dev/urandom does not exist
if(EXISTS /dev/urandom) set(DEV_RANDOM "/dev/urandom" CACHE INTERNAL ""
FORCE)
=======================================
--- /dev/null
+++ /shogun/trunk/debian/patches/series Mon Jul 7 14:56:42 2014 UTC
@@ -0,0 +1,1 @@
+disable_sse.diff
=======================================
--- /shogun/trunk/debian/changelog Sun Jul 6 01:56:38 2014 UTC
+++ /shogun/trunk/debian/changelog Mon Jul 7 14:56:42 2014 UTC
@@ -1,3 +1,10 @@
+shogun (3.2.0-4) unstable; urgency=low
+
+ * Disable sse on i386 architectures to fix FTBS.
+ * Add arc4random to build deps.
+
+ -- Soeren Sonnenburg <so...@debian.org> Sun, 06 Jul 2014 04:18:46 +0200
+
shogun (3.2.0-3) unstable; urgency=low

* Add build-dependency on colpack.
=======================================
--- /shogun/trunk/debian/control Sun Jul 6 01:56:38 2014 UTC
+++ /shogun/trunk/debian/control Mon Jul 7 14:56:42 2014 UTC
@@ -5,7 +5,7 @@
Build-Depends: libatlas-dev [!powerpc !alpha !arm !armel !armhf !sh4],
libatlas-base-dev [!powerpc !alpha !arm !armel !armhf !sh4] |
liblapack-dev,
libeigen3-dev, debhelper (>= 9), libreadline-dev | libreadline5-dev,
ghostscript,
- libblas-dev, doxygen-latex, graphviz, libglpk-dev, libnlopt-dev,
+ libblas-dev, doxygen-latex, graphviz, libglpk-dev, libnlopt-dev,
libbsd-dev,
liblzo2-dev, zlib1g-dev, liblzma-dev, libxml2-dev, libjson-c-dev |
libjson0-dev, cmake,
libarpack2-dev, libsnappy-dev, libhdf5-dev (>= 1.8.8~) |
libhdf5-serial-dev,
libprotobuf-dev, protobuf-compiler, libcurl4-gnutls-dev, libbz2-dev,
libcolpack-dev,
=======================================
--- /shogun/trunk/debian/rules Sat Mar 1 06:00:14 2014 UTC
+++ /shogun/trunk/debian/rules Mon Jul 7 14:56:42 2014 UTC
@@ -2,18 +2,23 @@

BUILDDIR = $(CURDIR)/debian/build

-ARCH=$(shell /bin/uname -m)
+ARCH=$(shell dpkg-architecture -qDEB_BUILD_ARCH)
OVERRIDE_COMPILER=
+DISABLE_SSE=

ifeq ($(ARCH),$(filter $(ARCH),powerpc mips mipsel))
OVERRIDE_COMPILER=-DCMAKE_C_COMPILER=/usr/bin/clang
-DCMAKE_CXX_COMPILER=/usr/bin/clang++
endif

+ifeq ($(ARCH),$(filter $(ARCH),i386 hurd-i386 kfreebsd-i386))
+ $(DISABLE_SSE)="-DDISABLE_SSE=ON"
+endif
+
%:
dh $@ --buildsystem=cmake --builddirectory=$(BUILDDIR)

override_dh_auto_configure:
- dh_auto_configure -- -DCMAKE_SKIP_RPATH=TRUE -DBUILD_EXAMPLES=OFF
-DUSE_SVMLIGHT=OFF -DCmdLineStatic=ON $(OVERRIDE_COMPILER)
+ dh_auto_configure -- -DCMAKE_SKIP_RPATH=TRUE -DBUILD_EXAMPLES=OFF
-DUSE_SVMLIGHT=OFF -DCmdLineStatic=ON $(OVERRIDE_COMPILER) $(DISABLE_SSE)

override_dh_install:
$(MAKE) -C doc doc