Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HADOOP-11410. Make the rpath of libhadoop.so configurable (cmccabe) 

(cherry picked from commit fb20797b62)
This commit is contained in:
Colin Patrick Mccabe 2014-12-15 16:16:02 -08:00
parent 2eabbae292
commit 19c8f7b72c
3 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hadoop-common-project/hadoop-common/CHANGES.txt
View File

@ -57,6 +57,8 @@ Release 2.7.0 - UNRELEASED
HADOOP-10476) Bumping the findbugs version to 3.0.0. (wheat9) HADOOP-10476) Bumping the findbugs version to 3.0.0. (wheat9)
HADOOP-11410. Make the rpath of libhadoop.so configurable (cmccabe)
OPTIMIZATIONS OPTIMIZATIONS
HADOOP-11323. WritableComparator#compare keeps reference to byte array. HADOOP-11323. WritableComparator#compare keeps reference to byte array.

3
hadoop-common-project/hadoop-common/pom.xml
View File

@ -536,6 +536,7 @@
<require.openssl>false</require.openssl> <require.openssl>false</require.openssl>
<runningWithNative>true</runningWithNative> <runningWithNative>true</runningWithNative>
<bundle.openssl.in.bin>false</bundle.openssl.in.bin> <bundle.openssl.in.bin>false</bundle.openssl.in.bin>
<extra.libhadoop.rpath></extra.libhadoop.rpath>
</properties> </properties>
<build> <build>
<plugins> <plugins>
@ -607,7 +608,7 @@
<configuration> <configuration>
<target> <target>
<exec executable="cmake" dir="${project.build.directory}/native" failonerror="true"> <exec executable="cmake" dir="${project.build.directory}/native" failonerror="true">
<arg line="${basedir}/src/ -DGENERATED_JAVAH=${project.build.directory}/native/javah -DJVM_ARCH_DATA_MODEL=${sun.arch.data.model} -DREQUIRE_BZIP2=${require.bzip2} -DREQUIRE_SNAPPY=${require.snappy} -DCUSTOM_SNAPPY_PREFIX=${snappy.prefix} -DCUSTOM_SNAPPY_LIB=${snappy.lib} -DCUSTOM_SNAPPY_INCLUDE=${snappy.include} -DREQUIRE_OPENSSL=${require.openssl} -DCUSTOM_OPENSSL_PREFIX=${openssl.prefix} -DCUSTOM_OPENSSL_LIB=${openssl.lib} -DCUSTOM_OPENSSL_INCLUDE=${openssl.include}"/> <arg line="${basedir}/src/ -DGENERATED_JAVAH=${project.build.directory}/native/javah -DJVM_ARCH_DATA_MODEL=${sun.arch.data.model} -DREQUIRE_BZIP2=${require.bzip2} -DREQUIRE_SNAPPY=${require.snappy} -DCUSTOM_SNAPPY_PREFIX=${snappy.prefix} -DCUSTOM_SNAPPY_LIB=${snappy.lib} -DCUSTOM_SNAPPY_INCLUDE=${snappy.include} -DREQUIRE_OPENSSL=${require.openssl} -DCUSTOM_OPENSSL_PREFIX=${openssl.prefix} -DCUSTOM_OPENSSL_LIB=${openssl.lib} -DCUSTOM_OPENSSL_INCLUDE=${openssl.include} -DEXTRA_LIBHADOOP_RPATH=${extra.libhadoop.rpath}"/>
</exec> </exec>
<exec executable="make" dir="${project.build.directory}/native" failonerror="true"> <exec executable="make" dir="${project.build.directory}/native" failonerror="true">
<arg line="VERBOSE=1"/> <arg line="VERBOSE=1"/>

6
hadoop-common-project/hadoop-common/src/CMakeLists.txt
View File

@ -267,8 +267,12 @@ IF (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
# dlopen will look in the directory containing libhadoop.so. # dlopen will look in the directory containing libhadoop.so.
# However, $ORIGIN is not supported by all operating systems. # However, $ORIGIN is not supported by all operating systems.
# #
set(RPATH "\$ORIGIN/")
if (EXTRA_LIBHADOOP_RPATH)
set(RPATH "${RPATH}:${EXTRA_LIBHADOOP_RPATH}/")
endif(EXTRA_LIBHADOOP_RPATH)
SET_TARGET_PROPERTIES(hadoop SET_TARGET_PROPERTIES(hadoop
PROPERTIES INSTALL_RPATH "\$ORIGIN/") PROPERTIES INSTALL_RPATH "${RPATH}")
ENDIF() ENDIF()
target_link_dual_libraries(hadoop target_link_dual_libraries(hadoop