You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by el...@apache.org on 2012/09/17 21:30:08 UTC
svn commit: r1386784 - in
/hadoop/common/trunk/hadoop-common-project/hadoop-common: CHANGES.txt
src/CMakeLists.txt
Author: eli
Date: Mon Sep 17 19:30:07 2012
New Revision: 1386784
URL: http://svn.apache.org/viewvc?rev=1386784&view=rev
Log:
HADOOP-8806. libhadoop.so: dlopen should be better at locating libsnappy.so, etc. Contributed by Colin Patrick McCabe
Modified:
hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/CMakeLists.txt
Modified: hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1386784&r1=1386783&r2=1386784&view=diff
==============================================================================
--- hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt (original)
+++ hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt Mon Sep 17 19:30:07 2012
@@ -235,6 +235,9 @@ Release 2.0.3-alpha - Unreleased
HADOOP-8755. Print thread dump when tests fail due to timeout. (Andrey
Klochkov via atm)
+ HADOOP-8806. libhadoop.so: dlopen should be better at locating
+ libsnappy.so, etc. (Colin Patrick McCabe via eli)
+
OPTIMIZATIONS
BUG FIXES
Modified: hadoop/common/trunk/hadoop-common-project/hadoop-common/src/CMakeLists.txt
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-common-project/hadoop-common/src/CMakeLists.txt?rev=1386784&r1=1386783&r2=1386784&view=diff
==============================================================================
--- hadoop/common/trunk/hadoop-common-project/hadoop-common/src/CMakeLists.txt (original)
+++ hadoop/common/trunk/hadoop-common-project/hadoop-common/src/CMakeLists.txt Mon Sep 17 19:30:07 2012
@@ -109,6 +109,7 @@ add_executable(test_bulk_crc32
)
set_property(SOURCE main.cpp PROPERTY INCLUDE_DIRECTORIES "\"-Werror\" \"-Wall\"")
+SET(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE)
add_dual_library(hadoop
${D}/io/compress/lz4/Lz4Compressor.c
${D}/io/compress/lz4/Lz4Decompressor.c
@@ -125,6 +126,17 @@ add_dual_library(hadoop
${D}/util/NativeCrc32.c
${D}/util/bulk_crc32.c
)
+
+IF (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
+ #
+ # By embedding '$ORIGIN' into the RPATH of libhadoop.so,
+ # dlopen will look in the directory containing libhadoop.so.
+ # However, $ORIGIN is not supported by all operating systems.
+ #
+ SET_TARGET_PROPERTIES(hadoop
+ PROPERTIES INSTALL_RPATH "\$ORIGIN/")
+ENDIF()
+
target_link_dual_libraries(hadoop
dl
${JAVA_JVM_LIBRARY}