HDFS-9025. Fix compilation issues on arch linux. Contributed by Owen O'Malley.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/f81439d4 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/f81439d4 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/f81439d4 Branch: refs/heads/HDFS-8707 Commit: f81439d4a7c7545628b8fe9102b6b48cc1a7abaa Parents: 2533bc3 Author: Haohui Mai <whe...@apache.org> Authored: Fri Sep 11 13:45:51 2015 -0700 Committer: Haohui Mai <whe...@apache.org> Committed: Wed Oct 7 00:17:13 2015 -0700 ---------------------------------------------------------------------- hadoop-hdfs-project/hadoop-hdfs-client/pom.xml | 10 ++++++++++ .../src/main/native/libhdfspp/lib/proto/CMakeLists.txt | 4 ++-- .../main/native/libhdfspp/lib/proto/protoc_gen_hrpc.cc | 2 ++ .../src/main/native/libhdfspp/tests/CMakeLists.txt | 6 +++--- 4 files changed, 17 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/f81439d4/hadoop-hdfs-project/hadoop-hdfs-client/pom.xml ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs-client/pom.xml b/hadoop-hdfs-project/hadoop-hdfs-client/pom.xml index 7df2fa9..bb24a48 100644 --- a/hadoop-hdfs-project/hadoop-hdfs-client/pom.xml +++ b/hadoop-hdfs-project/hadoop-hdfs-client/pom.xml @@ -130,6 +130,16 @@ http://maven.apache.org/xsd/maven-4.0.0.xsd";> <artifactId>maven-antrun-plugin</artifactId> <executions> <execution> + <id>debug</id> + <phase>compile</phase> + <goals><goal>run</goal></goals> + <configuration> + <target> + <echo>[PROTOC] ${env.HADOOP_PROTOC_PATH}</echo> + </target> + </configuration> + </execution> + <execution> <id>make</id> <phase>compile</phase> <goals><goal>run</goal></goals> http://git-wip-us.apache.org/repos/asf/hadoop/blob/f81439d4/hadoop-hdfs-project/hadoop-hdfs-client/src/main/native/libhdfspp/lib/proto/CMakeLists.txt ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/native/libhdfspp/lib/proto/CMakeLists.txt b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/native/libhdfspp/lib/proto/CMakeLists.txt index 3f703b2..4b0bac6 100644 --- a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/native/libhdfspp/lib/proto/CMakeLists.txt +++ b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/native/libhdfspp/lib/proto/CMakeLists.txt @@ -1,5 +1,5 @@ -set(CLIENT_PROTO_DIR ${CMAKE_SOURCE_DIR}/../proto) -set(COMMON_PROTO_DIR ${CMAKE_SOURCE_DIR}/../../../../../hadoop-common-project/hadoop-common/src/main/proto) +set(CLIENT_PROTO_DIR ${CMAKE_CURRENT_LIST_DIR}/../../../../proto) +set(COMMON_PROTO_DIR ${CMAKE_CURRENT_LIST_DIR}/../../../../../../../../hadoop-common-project/hadoop-common/src/main/proto) set(PROTOBUF_IMPORT_DIRS ${CLIENT_PROTO_DIR} ${COMMON_PROTO_DIR}) protobuf_generate_cpp(PROTO_SRCS PROTO_HDRS http://git-wip-us.apache.org/repos/asf/hadoop/blob/f81439d4/hadoop-hdfs-project/hadoop-hdfs-client/src/main/native/libhdfspp/lib/proto/protoc_gen_hrpc.cc ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/native/libhdfspp/lib/proto/protoc_gen_hrpc.cc b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/native/libhdfspp/lib/proto/protoc_gen_hrpc.cc index e4b5acc..d8e9ab2 100644 --- a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/native/libhdfspp/lib/proto/protoc_gen_hrpc.cc +++ b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/native/libhdfspp/lib/proto/protoc_gen_hrpc.cc @@ -25,6 +25,8 @@ #include <google/protobuf/io/zero_copy_stream.h> #include <google/protobuf/stubs/common.h> +#include <memory> + using ::google::protobuf::FileDescriptor; using ::google::protobuf::MethodDescriptor; using ::google::protobuf::ServiceDescriptor; http://git-wip-us.apache.org/repos/asf/hadoop/blob/f81439d4/hadoop-hdfs-project/hadoop-hdfs-client/src/main/native/libhdfspp/tests/CMakeLists.txt ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/native/libhdfspp/tests/CMakeLists.txt b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/native/libhdfspp/tests/CMakeLists.txt index 4c622f2..df57d04 100644 --- a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/native/libhdfspp/tests/CMakeLists.txt +++ b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/native/libhdfspp/tests/CMakeLists.txt @@ -19,13 +19,13 @@ add_library(test_common OBJECT mock_connection.cc) add_executable(remote_block_reader_test remote_block_reader_test.cc $<TARGET_OBJECTS:test_common>) -target_link_libraries(remote_block_reader_test reader proto common ${PROTOBUF_LIBRARIES} ${OPENSSL_LIBRARIES} gmock_main) +target_link_libraries(remote_block_reader_test reader proto common ${PROTOBUF_LIBRARIES} ${OPENSSL_LIBRARIES} gmock_main ${CMAKE_THREAD_LIBS_INIT}) add_test(remote_block_reader remote_block_reader_test) add_executable(sasl_digest_md5_test sasl_digest_md5_test.cc) -target_link_libraries(sasl_digest_md5_test common ${OPENSSL_LIBRARIES} gmock_main) +target_link_libraries(sasl_digest_md5_test common ${OPENSSL_LIBRARIES} gmock_main ${CMAKE_THREAD_LIBS_INIT}) add_test(sasl_digest_md5 sasl_digest_md5_test) add_executable(inputstream_test inputstream_test.cc) -target_link_libraries(inputstream_test fs rpc reader proto common ${PROTOBUF_LIBRARIES} ${OPENSSL_LIBRARIES} gmock_main) +target_link_libraries(inputstream_test fs rpc reader proto common ${PROTOBUF_LIBRARIES} ${OPENSSL_LIBRARIES} gmock_main ${CMAKE_THREAD_LIBS_INIT}) add_test(inputstream inputstream_test)
