Repository: hadoop Updated Branches: refs/heads/branch-2 2eabbae29 -> 19c8f7b72
HADOOP-11410. Make the rpath of libhadoop.so configurable (cmccabe) (cherry picked from commit fb20797b6237054f3d16ff94a665cbad4cbe3293) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/19c8f7b7 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/19c8f7b7 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/19c8f7b7 Branch: refs/heads/branch-2 Commit: 19c8f7b72cb2d74e99c3b3b22ae86efa238497d0 Parents: 2eabbae2 Author: Colin Patrick Mccabe <[email protected]> Authored: Mon Dec 15 16:16:02 2014 -0800 Committer: Colin Patrick Mccabe <[email protected]> Committed: Mon Dec 15 18:55:38 2014 -0800 ---------------------------------------------------------------------- hadoop-common-project/hadoop-common/CHANGES.txt | 2 ++ hadoop-common-project/hadoop-common/pom.xml | 3 ++- hadoop-common-project/hadoop-common/src/CMakeLists.txt | 6 +++++- 3 files changed, 9 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/19c8f7b7/hadoop-common-project/hadoop-common/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt index 21aa992..fde5c68 100644 --- a/hadoop-common-project/hadoop-common/CHANGES.txt +++ b/hadoop-common-project/hadoop-common/CHANGES.txt @@ -57,6 +57,8 @@ Release 2.7.0 - UNRELEASED HADOOP-10476) Bumping the findbugs version to 3.0.0. (wheat9) + HADOOP-11410. Make the rpath of libhadoop.so configurable (cmccabe) + OPTIMIZATIONS HADOOP-11323. WritableComparator#compare keeps reference to byte array. http://git-wip-us.apache.org/repos/asf/hadoop/blob/19c8f7b7/hadoop-common-project/hadoop-common/pom.xml ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-common/pom.xml b/hadoop-common-project/hadoop-common/pom.xml index a2f14c2..04ad3a2 100644 --- a/hadoop-common-project/hadoop-common/pom.xml +++ b/hadoop-common-project/hadoop-common/pom.xml @@ -536,6 +536,7 @@ <require.openssl>false</require.openssl> <runningWithNative>true</runningWithNative> <bundle.openssl.in.bin>false</bundle.openssl.in.bin> + <extra.libhadoop.rpath></extra.libhadoop.rpath> </properties> <build> <plugins> @@ -607,7 +608,7 @@ <configuration> <target> <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 executable="make" dir="${project.build.directory}/native" failonerror="true"> <arg line="VERBOSE=1"/> http://git-wip-us.apache.org/repos/asf/hadoop/blob/19c8f7b7/hadoop-common-project/hadoop-common/src/CMakeLists.txt ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-common/src/CMakeLists.txt b/hadoop-common-project/hadoop-common/src/CMakeLists.txt index 29fa2b8..ddb3abf 100644 --- a/hadoop-common-project/hadoop-common/src/CMakeLists.txt +++ b/hadoop-common-project/hadoop-common/src/CMakeLists.txt @@ -267,8 +267,12 @@ IF (${CMAKE_SYSTEM_NAME} MATCHES "Linux") # dlopen will look in the directory containing libhadoop.so. # 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 - PROPERTIES INSTALL_RPATH "\$ORIGIN/") + PROPERTIES INSTALL_RPATH "${RPATH}") ENDIF() target_link_dual_libraries(hadoop
