[yade] 02/04: Do not use clang explicitly.
Anton Gladky
gladk at alioth.debian.org
Mon Oct 28 19:56:06 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 82b304755662ccdef56493bb18d3c454929e8d62
Author: Anton Gladky <gladk at debian.org>
Date: Mon Oct 28 20:50:11 2013 +0100
Do not use clang explicitly.
---
debian/control | 1 -
debian/rules | 6 ------
2 files changed, 7 deletions(-)
diff --git a/debian/control b/debian/control
index 1fd8d3d..e271a4e 100644
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,6 @@ 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 c9858e3..bf184c4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,12 +9,6 @@ tmpDirMatplotLib = $(CURDIR)/debian/matplotlib
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
-ifeq (,$(filter $(DEB_HOST_ARCH), amd64 i386))
- export CC=/usr/bin/clang
- export CXX=/usr/bin/clang
-endif
-
export MPLCONFIGDIR := $(tmpDirMatplotLib)
export HOME := $(tmpDirMatplotLib)
export LD_LIBRARY_PATH := $(tmpInstall)/usr/lib/$(DEB_HOST_MULTIARCH)/yade/py:$(tmpInstall)/usr/lib/$(DEB_HOST_MULTIARCH)/yade:$(tmpInstall)/usr/lib/$(DEB_HOST_MULTIARCH)/yade/py:$(tmpInstall)/usr/lib/$(DEB_HOST_MULTIARCH)/yade/py/gts:$(tmpInstall)/usr/lib/$(DEB_HOST_MULTIARCH)/yade/py/yade:$(tmpInstall)/usr/lib/$(DEB_HOST_MULTIARCH)/yade/py/yade/qt:$(LD_LIBRARY_PATH);
--
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