← Back to team overview

yade-dev team mailing list archive

[SCM] Yet Another Dynamic Engine. Platform for discrete element modeling. branch, master, updated. debian/0.80.0-1-1-g17ac3c8

 

The following commit has been merged in the master branch:
commit 17ac3c84ecdd0ce8b09e623c782f4aade428e89a
Author: Anton Gladky <gladky.anton@xxxxxxxxx>
Date:   Thu May 3 22:27:03 2012 +0200

    Recover fix_FTBFS_on_KFreeBSD.patch.

diff --git a/debian/patches/fix_FTBFS_on_KFreeBSD.patch b/debian/patches/fix_FTBFS_on_KFreeBSD.patch
new file mode 100644
index 0000000..b8e7267
--- /dev/null
+++ b/debian/patches/fix_FTBFS_on_KFreeBSD.patch
@@ -0,0 +1,16 @@
+Description: fix FTBFS on KFreeBSD and hopefully on other platforms, where was a problem with compiling qglviewer. Adding additional pathes for finding necessary header-files.
+Author: Anton Gladky <gladky.anton@xxxxxxxxx>
+Bug-Debian: http://bugs.debian.org/628376
+Last-Update: 2012-05-03
+
+--- a/SConstruct
++++ b/SConstruct
+@@ -100,7 +100,7 @@
+ 	('chunkSize','Maximum files to compile in one translation unit when building plugins. (unlimited if <= 0, per-file linkage is used if 1)',7,None,int),
+ 	('version','Yade version (if not specified, guess will be attempted)',None),
+ 	('realVersion','Revision (usually bzr revision); guessed automatically unless specified',None),
+-	('CPPPATH', 'Additional paths for the C preprocessor (colon-separated)','/usr/include/vtk-5.0:/usr/include/vtk-5.2:/usr/include/vtk-5.4:/usr/include/vtk-5.6:/usr/include/vtk-5.8:/usr/include/vtk'), # hardy has vtk-5.0
++	('CPPPATH', 'Additional paths for the C preprocessor (colon-separated)','/usr/include/vtk-5.0:/usr/include/vtk-5.2:/usr/include/vtk-5.4:/usr/include/vtk-5.6:/usr/include/vtk-5.8:/usr/include/vtk:/usr/include/qt4/QtCore/:/usr/include/qt4/:/usr/include/qt4/QtXml:/usr/include/qt4/QtOpenGL:/usr/include/qt4/QtGui'), # hardy has vtk-5.0
+ 	('LIBPATH','Additional paths for the linker (colon-separated)',None),
+ 	('libstdcxx','Specify libstdc++ location by hand (opened dynamically at startup), usually not needed',None),
+ 	('QT4CXX','Specify a different compiler for files including qt4; this is necessary for older qt version (<=4.7) which don\'t compile with clang',None),
diff --git a/debian/patches/series b/debian/patches/series
index fead62e..e6e8a48 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 get_rid_off_suffix.patch
+fix_FTBFS_on_KFreeBSD.patch

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