From f349d0a76c8fa9c19a9f697c23a3c9337309c383 Mon Sep 17 00:00:00 2001
From: Colin Patrick Mccabe <cmccabe@cloudera.com>
Date: Fri, 18 Dec 2015 09:12:29 -0800
Subject: [PATCH] HADOOP-12647. Add /usr/lib default for ISAL library and fix
 missing .c file in CMakeLists (Kai Zheng via cmccabe)

---
 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(-)

diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt
index 6263f74cc95..5a2e8360bea 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)
diff --git a/hadoop-common-project/hadoop-common/pom.xml b/hadoop-common-project/hadoop-common/pom.xml
index 5c759e82f9f..d8e462161d6 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>
diff --git a/hadoop-common-project/hadoop-common/src/CMakeLists.txt b/hadoop-common-project/hadoop-common/src/CMakeLists.txt
index 63bb773fb2b..eaa8d88ccc0 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