yade-dev team mailing list archive

["Anton Gladky" <gladky.anton@xxxxxxxxx>]

The following commit has been merged in the master branch:
commit 2259a3fca5b1bc44761a8f0cfa516789a0b3bfd1
Author: Anton Gladky <gladky.anton@xxxxxxxxx>
Date:   Wed May 9 20:34:22 2012 +0200

    Fix FTBFS against gcc-4.7. (Closes: #672126)

diff --git a/debian/patches/fix_ftbfs-gcc-4.7.patch b/debian/patches/fix_ftbfs-gcc-4.7.patch
new file mode 100644
index 0000000..bcd0c1c
--- /dev/null
+++ b/debian/patches/fix_ftbfs-gcc-4.7.patch
@@ -0,0 +1,27 @@
+Description: fix FTBFS against gcc-4.7
+Author: Anton Gladky <gladky.anton@xxxxxxxxx>
+Bug-Debian: http://bugs.debian.org/672126
+Last-Update: 2012-05-09
+
+--- a/SConstruct
++++ b/SConstruct
+@@ -460,9 +460,7 @@
+ ### LINKER
+ ## libs for all plugins
+ env.Append(LIBS=[],SHLINKFLAGS=['-rdynamic'])
+-env.Append(LINKFLAGS=['-rdynamic','-Wl,-z,origin'])
+ 
+-if not env['debug']: env.Append(SHLINKFLAGS=['-W,--strip-all'])
+ 
+ # makes dynamic library loading easier (no LD_LIBRARY_PATH) and perhaps faster
+ env.Append(RPATH=runtimeLibDirs)
+--- a/lib/SConscript
++++ b/lib/SConscript
+@@ -9,6 +9,6 @@
+ 		+(Split('triangulation/KinematicLocalisationAnalyser.cpp triangulation/Timer.cpp triangulation/basicVTKwritter.cpp triangulation/FlowBoundingSphere.cpp triangulation/PeriodicFlow.cpp triangulation/Tenseur3.cpp triangulation/TriaxialState.cpp') if 'cgal' in env['features'] else [])
+ 		+(['opengl/GLUtils.cpp'] if 'opengl' in env['features'] else [])
+ 		),
+- 		],LIBS=['dl','m']+[l for l in env['LIBS'] if l!='yade-support']+(['glut','GL','GLU'] if 'opengl' in env['features'] else []),LINKFLAGS=env['LINKFLAGS']+['-pthread','-Wl','-Bsymbolic-function','-ansi'],CXXFLAGS=env['CXXFLAGS']+['-pthread','-fPIC','-frounding-math','-ansi']
++ 		],LIBS=['dl','m']+[l for l in env['LIBS'] if l!='yade-support']+(['glut','GL','GLU'] if 'opengl' in env['features'] else []),LINKFLAGS=env['LINKFLAGS']+['-pthread','-Bsymbolic-function','-ansi'],CXXFLAGS=env['CXXFLAGS']+['-pthread','-fPIC','-frounding-math','-ansi']
+ ))
+ 
diff --git a/debian/patches/series b/debian/patches/series
index e6e8a48..5d77ab5 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 get_rid_off_suffix.patch
 fix_FTBFS_on_KFreeBSD.patch
+fix_ftbfs-gcc-4.7.patch

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