← Back to branch summary

~ubuntu-branches/debian/experimental/openscenegraph/experimental

« back to all changes in this revision

Viewing changes to debian/patches/bug-555869-ftbfs_with_binutils_gold.dpatch

  • Committer: Bazaar Package Importer
  • Author(s): Alberto Luaces
  • Date: 2010-05-03 21:42:01 UTC
  • mfrom: (1.1.9 upstream) (2.1.11 sid)
  • Revision ID: james.westby@ubuntu.com-20100503214201-iy060qxb94vsfv87
Tags: 2.8.3-3
http://bugs.debian.org/580079
* Added README.source. Thanks Manuel Montecelo.
* Removed FindGDAL.cmake file supplied by upstream since it does not
  detect current libgdal1-1.6.0. The script provided by CMake works
  fine.
* Removed openthreads-doc since OpenThreads documentation is shared with
  OpenSceneGraph's, hence this package was empty.
* Now ccache handling is being done automatically by CMake.
* Drop conflict dependencies with previous versions to let them coexist
  with current ones (Closes: #580079 #580081).

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/bug-555869-ftbfs_with_binutils_gold.dpatch
 
1
#! /bin/sh /usr/share/dpatch/dpatch-run
 
2
 
 
3
@DPATCH@
 
4
--- a/OpenSceneGraph/src/osg/CMakeLists.txt
 
5
+++ b/OpenSceneGraph/src/osg/CMakeLists.txt
 
6
@@ -323,7 +323,7 @@
 
7
 LINK_INTERNAL(${LIB_NAME}     
 
8
     OpenThreads
 
9
 )
 
10
-LINK_EXTERNAL(${LIB_NAME} ${CMAKE_THREAD_LIBS_INIT}    ${MATH_LIBRARY} )
 
11
+LINK_EXTERNAL(${LIB_NAME} ${CMAKE_THREAD_LIBS_INIT}    ${MATH_LIBRARY} -ldl )
 
12
 LINK_CORELIB_DEFAULT(${LIB_NAME} ${CMAKE_THREAD_LIBS_INIT} ${MATH_LIBRARY} )
 
13
 
 
14
 INCLUDE(ModuleInstall OPTIONAL)