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

[Steffen Moeller]

The following commit has been merged in the master branch:
commit 175e5bd9a23e6bdc5057cb933b3e3dd1f86ff5ff
Author: Steffen Moeller <steffen_moeller at gmx.de>
Date:   Sat Dec 29 00:06:04 2012 +0100

    Simplified debian/rules
    
    For the very new machines, the -mavx setting is just what users want.
    It seems like our workaround to make link time optimisation is just
    a bit too early and we should grant lto some time to mature.

diff --git a/debian/rules b/debian/rules
index 5bc40fa..1b0b804 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,9 +6,9 @@
 #export CPP=/usr/lib/gcc-snapshot/bin/cpp
 
 # Uncomment for particular version of gcc
-export  CC := gcc-4.8
-export CXX := g++-4.8
-export CPP := cpp-4.8
+#export  CC := gcc-4.7
+#export CXX := g++-4.7
+#export CPP := cpp-4.7
 
 # Uncomment for clang (llvm)
 #export CC  = clang
@@ -56,21 +56,12 @@ CFLAGS_APPEND += -I/usr/include/boinc -I/usr/include/boinc/lib -I/usr/include/bo
 ifneq (clang,$(CXX))
 CFLAGS_APPEND += -O3
 #CFLAGS_APPEND += -mnative
-CFLAGS_APPEND += -mno-avx
-CFLAGS_APPEND += -msse4.2
+#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.8,$(GCCVERSION))
-ifneq (4.7,$(GCCVERSION))
-ifneq (4.5,$(GCCVERSION))
-ifneq (4.4,$(GCCVERSION))
-  CFLAGS_APPEND += -flto
-  LDFLAGS += -flto
-endif
-endif
-endif
-endif
-#endif
+# gcc 4.6 on precise has issues while gcc 4.7 and 4.8 on sid are just fine with -mno-avx set on non bulldozer/SandyBridge machines
+# CFLAGS_APPEND += -flto
+# LDFLAGS += -flto
 
 ifeq (clang,$(CXX))
 GCCVERSION=$(shell $(CXX) --version | tr " " "\n" | egrep '^[0-9]+\.[0-9]+-[0-9]+$$' | cut -f1 -d-)
@@ -122,6 +113,8 @@ override_dh_auto_configure:
 	  --disable-server \
 	  --enable-dependency-tracking \
 	  --with-gnu-ld $(SETIEXTRAFLAGS)
+	# helping boinc-dev  >´ 7.0.42
+	touch client/project_specific_defines.h
 
 override_dh_auto_clean:
 	if [ -r Makefile ]; then make clean; fi

-- 
SETI at home packaging