← Back to team overview

yade-dev team mailing list archive

[SCM] Yet Another Dynamic Engine. Platform for discrete element modeling. branch, master, updated. upstream/0.60.3-90-g0fba761

 

The following commit has been merged in the master branch:
commit 0fba761b2a2a259b2fb94ca59971f3610293dce8
Author: Anton Gladky <gladky.anton@xxxxxxxxx>
Date:   Sun Jul 3 13:02:01 2011 +0200

    Update Changelog (closing bug), add -j1 to build.

diff --git a/debian/changelog b/debian/changelog
index ca3bbf3..cff5ad9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,6 @@
 yade (0.60.3-2) unstable; urgency=low
 
-  * [67adc6c] Fix FTBFS on powerpc.
+  * [67adc6c] Fix FTBFS on powerpc (Closes: #632503)
 
  -- Anton Gladky <gladky.anton@xxxxxxxxx>  Sat, 02 Jul 2011 15:08:46 +0200
 
diff --git a/debian/rules b/debian/rules
index a72b15b..252c6e2 100755
--- a/debian/rules
+++ b/debian/rules
@@ -32,7 +32,7 @@ override_dh_auto_build:
 	-cat /proc/meminfo
 	-cat /proc/cpuinfo
 	# the last argument specified that we only want files in lib installed -- common files (the executable) are already in the optimized package
-	export MPLCONFIGDIR=$(tmpDirMatplotLib) HOME=$(tmpDirMatplotLib)$ ; NO_SCONS_GET_RECENT= scons profile=deb buildPrefix=debian runtimePREFIX=/usr version='' brief=0 chunkSize=2 features=vtk,gts,opengl,qt4,openmp PREFIX=$(tmpInstallDbg) variant='' CXXFLAGS='$(CXXFLAGS)' optimize=0 march= debug=1 
+	export MPLCONFIGDIR=$(tmpDirMatplotLib) HOME=$(tmpDirMatplotLib)$ ; NO_SCONS_GET_RECENT= scons profile=deb buildPrefix=debian runtimePREFIX=/usr version='' brief=0 chunkSize=2 features=vtk,gts,opengl,qt4,openmp PREFIX=$(tmpInstallDbg) variant='' CXXFLAGS='$(CXXFLAGS)' optimize=0 -j1 march= debug=1 
 	#optimized build
 	export MPLCONFIGDIR=$(tmpDirMatplotLib) HOME=$(tmpDirMatplotLib) ; NO_SCONS_GET_RECENT= scons profile=deb PREFIX=$(tmpInstall) variant=''  -j1 optimize=1 debug=0
 	# generate manpages

-- 
Yet Another Dynamic Engine. Platform for discrete element modeling.