[yade] 01/02: Use clang on archs, where gcc fails. (Closes: #726009)
Anton Gladky
gladk at alioth.debian.org
Sun Oct 27 06:01:41 UTC 2013
This is an automated email from the git hooks/post-receive script.
gladk pushed a commit to branch master
in repository yade.
commit b4d2aa32cf8a9a5dce99230c472ef5006f27195a
Author: Anton Gladky <gladky.anton at gmail.com>
Date: Sat Oct 26 22:25:09 2013 +0200
Use clang on archs, where gcc fails. (Closes: #726009)
---
debian/control | 1 +
debian/rules | 8 ++++----
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/debian/control b/debian/control
index e271a4e..1fd8d3d 100644
--- a/debian/control
+++ b/debian/control
@@ -8,6 +8,7 @@ Vcs-Git: git://anonscm.debian.org/debian-science/packages/yade.git
Vcs-Browser: http://anonscm.debian.org/gitweb/?p=debian-science/packages/yade.git
X-Python-Version: current
Build-Depends:
+ clang,
cmake,
debhelper (>= 9),
freeglut3-dev,
diff --git a/debian/rules b/debian/rules
index 153dfe3..c9858e3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,15 +4,15 @@ tmpInstall = $(CURDIR)/debian/tmp
tmpDirMatplotLib = $(CURDIR)/debian/matplotlib
%:
- dh $@ --buildsystem=cmake --builddirectory=$(BUILDDIR) --with python2
+ dh $@ --buildsystem=cmake --builddirectory=$(BUILDDIR) --with python2
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
+ifeq (,$(filter $(DEB_HOST_ARCH), amd64 i386))
+ export CC=/usr/bin/clang
+ export CXX=/usr/bin/clang
endif
export MPLCONFIGDIR := $(tmpDirMatplotLib)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/yade.git
More information about the debian-science-commits
mailing list