[yade] 01/02: Set explicitly gcc-4.8 as the compiler for some archs. Thanks to Peter Green <plugwash at p10link.net>. (Closes: #726009)

[Anton Gladky]

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

gladk pushed a commit to branch master
in repository yade.

commit 91cd9f0093db964da412c5b17049f827ba8df9bf
Author: Anton Gladky <gladky.anton at gmail.com>
Date:   Thu Oct 24 18:26:53 2013 +0200

    Set explicitly gcc-4.8 as the compiler for some archs. Thanks to  Peter Green <plugwash at p10link.net>. (Closes: #726009)
---
 debian/patches/20_disable_release-mode.patch |    6 ++----
 debian/rules                                 |   10 ++++++++--
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/debian/patches/20_disable_release-mode.patch b/debian/patches/20_disable_release-mode.patch
index d696708..cac3f30 100644
--- a/debian/patches/20_disable_release-mode.patch
+++ b/debian/patches/20_disable_release-mode.patch
@@ -10,13 +10,11 @@ Last-Update: 2013-10-15
 
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -46,8 +46,7 @@
+@@ -46,7 +46,6 @@
      SET(CMAKE_BUILD_TYPE Debug)
      SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -DYADE_PTR_CAST=static_pointer_cast -DYADE_CAST=static_cast -DYADE_DEBUG")
    ELSE (DEBUG)
 -    SET(CMAKE_BUILD_TYPE Release)
--    SET(CMAKE_CXX_FLAGS  "${CMAKE_CXX_FLAGS} -DYADE_PTR_CAST=static_pointer_cast -DYADE_CAST=static_cast -fPIC")
-+    SET(CMAKE_CXX_FLAGS  "${CMAKE_CXX_FLAGS} -DYADE_PTR_CAST=static_pointer_cast -DYADE_CAST=static_cast -fPIC -ftrack-macro-expansion=0")
+     SET(CMAKE_CXX_FLAGS  "${CMAKE_CXX_FLAGS} -DYADE_PTR_CAST=static_pointer_cast -DYADE_CAST=static_cast -fPIC")
    ENDIF (DEBUG)
  ELSE (CMAKE_CXX_FLAGS)
-   #If flags are not set, add all useful flags
diff --git a/debian/rules b/debian/rules
index f0c6f6e..153dfe3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,8 +6,14 @@ tmpDirMatplotLib = $(CURDIR)/debian/matplotlib
 %:
 	dh $@ --buildsystem=cmake --builddirectory=$(BUILDDIR) --with python2 
 
-export DEB_CFLAGS_MAINT_APPEND  = -Wall -pedantic
-export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed
+export DEB_CXXFLAGS_MAINT_APPEND  = -ftrack-macro-expansion=0
+export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed,-no-keep-memory
+
+# This hack is to fix #726009. Can be removed, when those arch will have gcc-4.8 as the default compiler
+ifneq (,$(filter $(DEB_HOST_ARCH), ia64 powerpc s390x sparc))
+	export CC=/usr/bin/gcc-4.8
+	export CXX=/usr/bin/gcc-4.8
+endif
 
 export MPLCONFIGDIR := $(tmpDirMatplotLib) 
 export HOME := $(tmpDirMatplotLib) 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/yade.git