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 cm...@apache.org on 2015/12/18 18:33:25 UTC
hadoop git commit: HADOOP-12647. Add /usr/lib default for ISAL
library and fix missing .c file in CMakeLists (Kai Zheng via cmccabe)
Repository: hadoop
Updated Branches:
refs/heads/trunk 058cfddeb -> f349d0a76
HADOOP-12647. Add /usr/lib default for ISAL library and fix missing .c file in CMakeLists (Kai Zheng via cmccabe)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/f349d0a7
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/f349d0a7
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/f349d0a7
Branch: refs/heads/trunk
Commit: f349d0a76c8fa9c19a9f697c23a3c9337309c383
Parents: 058cfdd
Author: Colin Patrick Mccabe <cm...@cloudera.com>
Authored: Fri Dec 18 09:12:29 2015 -0800
Committer: Colin Patrick Mccabe <cm...@cloudera.com>
Committed: Fri Dec 18 09:27:26 2015 -0800
----------------------------------------------------------------------
hadoop-common-project/hadoop-common/CHANGES.txt | 3 +++
hadoop-common-project/hadoop-common/pom.xml | 2 +-
hadoop-common-project/hadoop-common/src/CMakeLists.txt | 3 ++-
3 files changed, 6 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/f349d0a7/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 6263f74..5a2e836 100644
--- a/hadoop-common-project/hadoop-common/CHANGES.txt
+++ b/hadoop-common-project/hadoop-common/CHANGES.txt
@@ -545,6 +545,9 @@ Trunk (Unreleased)
HADOOP-12615. Fix NPE in MiniKMS.start(). (Wei-Chiu Chuang via zhz)
+ HADOOP-12647. Add /usr/lib default for ISAL library and fix missing .c file
+ in CMakeLists (Kai Zheng via cmccabe)
+
OPTIMIZATIONS
HADOOP-7761. Improve the performance of raw comparisons. (todd)
http://git-wip-us.apache.org/repos/asf/hadoop/blob/f349d0a7/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 5c759e8..d8e4621 100644
--- a/hadoop-common-project/hadoop-common/pom.xml
+++ b/hadoop-common-project/hadoop-common/pom.xml
@@ -672,7 +672,7 @@
<arg value="-c"/>
<arg value="[ ! -f ${project.build.directory}/native/erasure_code_test ] || ${project.build.directory}/native/erasure_code_test"/>
<env key="SKIPTESTS" value="${skipTests}"/>
- <env key="LD_LIBRARY_PATH" value="${LD_LIBRARY_PATH}:${isal.lib}:${isal.prefix}"/>
+ <env key="LD_LIBRARY_PATH" value="${LD_LIBRARY_PATH}:${isal.lib}:${isal.prefix}:/usr/lib"/>
</exec>
</target>
</configuration>
http://git-wip-us.apache.org/repos/asf/hadoop/blob/f349d0a7/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 63bb773..eaa8d88 100644
--- a/hadoop-common-project/hadoop-common/src/CMakeLists.txt
+++ b/hadoop-common-project/hadoop-common/src/CMakeLists.txt
@@ -99,12 +99,13 @@ hadoop_set_find_shared_library_version("2")
find_library(ISAL_LIBRARY
NAMES isal
PATHS ${CUSTOM_ISAL_PREFIX} ${CUSTOM_ISAL_PREFIX}/lib
- ${CUSTOM_ISAL_PREFIX}/lib64 ${CUSTOM_ISAL_LIB})
+ ${CUSTOM_ISAL_PREFIX}/lib64 ${CUSTOM_ISAL_LIB /usr/lib})
set(CMAKE_FIND_LIBRARY_SUFFIXES ${STORED_CMAKE_FIND_LIBRARY_SUFFIXES})
if (ISAL_LIBRARY)
GET_FILENAME_COMPONENT(HADOOP_ISAL_LIBRARY ${ISAL_LIBRARY} NAME)
set(ISAL_INCLUDE_DIR ${SRC}/io/erasurecode/include)
set(ISAL_SOURCE_FILES
+ ${SRC}/io/erasurecode/coder/erasure_code_native.c
${SRC}/io/erasurecode/erasure_code.c)
add_executable(erasure_code_test
${SRC}/io/erasurecode/erasure_code.c