[SCM] SETI at home packaging branch, master, updated. debian/6.97_svn1409-1-29-gc6d695f

[Steffen Moeller]

The following commit has been merged in the master branch:
commit c6d695fb787570790a7136a7712318013dd3e1e0
Author: Steffen Moeller <steffen_moeller at gmx.de>
Date:   Sat Dec 22 21:21:07 2012 +0100

    Compiling without AVX

diff --git a/debian/patches/series b/debian/patches/series
index 0a3fe32..0282797 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
+disable_avx_in_configure.patch
 101_freebsd_build.patch
 210_fix_fgets_warning.patch
 211_give_stderr_some_output.patch
diff --git a/debian/rules b/debian/rules
index 0632933..5bc40fa 100755
--- a/debian/rules
+++ b/debian/rules
@@ -10,6 +10,10 @@ export  CC := gcc-4.8
 export CXX := g++-4.8
 export CPP := cpp-4.8
 
+# Uncomment for clang (llvm)
+#export CC  = clang
+#export CXX = clang
+
 
 DEB_BUILD_GNU_CPU  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_CPU)
 DEB_HOST_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
@@ -47,11 +51,17 @@ export LDFLAGS  := $(shell dpkg-buildflags --get LDFLAGS)
 
 
 # Append this to CFLAGS and CXXFLAGS.
-CFLAGS_APPEND += -O3
 CFLAGS_APPEND += -I/usr/include/boinc -I/usr/include/boinc/lib -I/usr/include/boinc/api
+
+ifneq (clang,$(CXX))
+CFLAGS_APPEND += -O3
+#CFLAGS_APPEND += -mnative
+CFLAGS_APPEND += -mno-avx
+CFLAGS_APPEND += -msse4.2
 GCCVERSION=$(shell $(CXX) --version | tr " " "\n" | egrep '^[0-9]+\.[0-9]+\.[0-9]+$$' | cut -f1,2 -d.)
 # gcc 4.6 on precise has issues while gcc 4.7 on sid is just fine
-ifneq (4.6,$(GCCVERSION))
+#ifneq (4.8,$(GCCVERSION))
+ifneq (4.7,$(GCCVERSION))
 ifneq (4.5,$(GCCVERSION))
 ifneq (4.4,$(GCCVERSION))
   CFLAGS_APPEND += -flto
@@ -59,6 +69,14 @@ ifneq (4.4,$(GCCVERSION))
 endif
 endif
 endif
+endif
+#endif
+
+ifeq (clang,$(CXX))
+GCCVERSION=$(shell $(CXX) --version | tr " " "\n" | egrep '^[0-9]+\.[0-9]+-[0-9]+$$' | cut -f1 -d-)
+CFLAGS_APPEND += -O3
+# -O4 implies link-time optimisation with clang, fails
+endif
 
 # Although all source file are C++, some handwritten rules in
 # client/Makefile.am seem to use CFLAGS only.
@@ -70,6 +88,7 @@ SETIEXTRAFLAGS= --disable-altivec
 
 ifeq ($(DEB_BUILD_GNU_CPU),x86_64)
   SETIEXTRAFLAGS += --enable-sse3
+  SETIEXTRAFLAGS += --disable-avx
 #  SETIEXTRAFLAGS += --enable-sse2 --enable-sse --enable-mmx
 endif
 

-- 
SETI at home packaging