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

HADOOP-12647. Add /usr/lib default for ISAL library and fix missing .c file in CMakeLists (Kai Zheng via cmccabe)

This commit is contained in:
Colin Patrick Mccabe 2015-12-18 09:12:29 -08:00
parent 058cfddebb
commit f349d0a76c
3 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -545,6 +545,9 @@ Trunk (Unreleased)
HADOOP-12615. Fix NPE in MiniKMS.start(). (Wei-Chiu Chuang via zhz) 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 OPTIMIZATIONS
HADOOP-7761. Improve the performance of raw comparisons. (todd) HADOOP-7761. Improve the performance of raw comparisons. (todd)

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

@ -672,7 +672,7 @@
<arg value="-c"/> <arg value="-c"/>
<arg value="[ ! -f ${project.build.directory}/native/erasure_code_test ] || ${project.build.directory}/native/erasure_code_test"/> <arg value="[ ! -f ${project.build.directory}/native/erasure_code_test ] || ${project.build.directory}/native/erasure_code_test"/>
<env key="SKIPTESTS" value="${skipTests}"/> <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> </exec>
</target> </target>
</configuration> </configuration>

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

@ -99,12 +99,13 @@ hadoop_set_find_shared_library_version("2")
find_library(ISAL_LIBRARY find_library(ISAL_LIBRARY
NAMES isal NAMES isal
PATHS ${CUSTOM_ISAL_PREFIX} ${CUSTOM_ISAL_PREFIX}/lib 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}) set(CMAKE_FIND_LIBRARY_SUFFIXES ${STORED_CMAKE_FIND_LIBRARY_SUFFIXES})
if (ISAL_LIBRARY) if (ISAL_LIBRARY)
GET_FILENAME_COMPONENT(HADOOP_ISAL_LIBRARY ${ISAL_LIBRARY} NAME) GET_FILENAME_COMPONENT(HADOOP_ISAL_LIBRARY ${ISAL_LIBRARY} NAME)
set(ISAL_INCLUDE_DIR ${SRC}/io/erasurecode/include) set(ISAL_INCLUDE_DIR ${SRC}/io/erasurecode/include)
set(ISAL_SOURCE_FILES set(ISAL_SOURCE_FILES
${SRC}/io/erasurecode/coder/erasure_code_native.c
${SRC}/io/erasurecode/erasure_code.c) ${SRC}/io/erasurecode/erasure_code.c)
add_executable(erasure_code_test add_executable(erasure_code_test
${SRC}/io/erasurecode/erasure_code.c ${SRC}/io/erasurecode/erasure_code.c