From 2c63a716942f5de758412a968b867371609beb1a Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Thu, 11 Feb 2010 11:17:55 +0000 Subject: [PATCH] From Alberto Luaces, "he new GNU linker, "gold", is going to replace soon the current ld in almost all Linux distributions. Although it is 100% compatible with ld, by default it gives an error if a library has unresolved symbols at link time, that is, it has set -Wl,--no-undefined by default. Debian folks have found that libosg.so and libosgDB.so use some functions belonging to libdl.so {dlsym,dlopen,dlclose,dlerror} without linking to it. My changes link those two libraries to libdl.so explicitly in the same way it is already done for libm.so and librt.so." --- CMakeLists.txt | 1 + src/osg/CMakeLists.txt | 2 +- src/osgDB/CMakeLists.txt | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 2569e85d7..e611de63f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -152,6 +152,7 @@ IF(UNIX) FIND_PACKAGE(X11) # Some Unicies need explicit linkage to the Math library or the build fails. FIND_LIBRARY(MATH_LIBRARY m) + FIND_LIBRARY(DL_LIBRARY dl) IF( CMAKE_SYSTEM MATCHES "Linux" ) FIND_LIBRARY( RT_LIBRARY rt ) ENDIF( CMAKE_SYSTEM MATCHES "Linux" ) diff --git a/src/osg/CMakeLists.txt b/src/osg/CMakeLists.txt index a8b4cbe95..68911d91b 100644 --- a/src/osg/CMakeLists.txt +++ b/src/osg/CMakeLists.txt @@ -331,7 +331,7 @@ ADD_LIBRARY(${LIB_NAME} LINK_INTERNAL(${LIB_NAME} OpenThreads ) -LINK_EXTERNAL(${LIB_NAME} ${CMAKE_THREAD_LIBS_INIT} ${MATH_LIBRARY} ${RT_LIBRARY} ) +LINK_EXTERNAL(${LIB_NAME} ${CMAKE_THREAD_LIBS_INIT} ${MATH_LIBRARY} ${RT_LIBRARY} ${DL_LIBRARY}) LINK_CORELIB_DEFAULT(${LIB_NAME} ${CMAKE_THREAD_LIBS_INIT} ${MATH_LIBRARY} ${RT_LIBRARY} ) INCLUDE(ModuleInstall OPTIONAL) diff --git a/src/osgDB/CMakeLists.txt b/src/osgDB/CMakeLists.txt index 89c2c7d28..d363a0cae 100644 --- a/src/osgDB/CMakeLists.txt +++ b/src/osgDB/CMakeLists.txt @@ -135,7 +135,7 @@ LINK_INTERNAL(${LIB_NAME} osg OpenThreads ) -LINK_EXTERNAL(${LIB_NAME} ${OSGDB_PLATFORM_SPECIFIC_LIBRARIES}) +LINK_EXTERNAL(${LIB_NAME} ${OSGDB_PLATFORM_SPECIFIC_LIBRARIES} ${DL_LIBRARY}) LINK_WITH_VARIABLES(${LIB_NAME} ${COMPRESSION_LIBRARIES}) LINK_CORELIB_DEFAULT(${LIB_NAME})