hadoop-common-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a.@apache.org
Subject [4/4] git commit: MAPREDUCE-6078. native-task: fix gtest build on macosx (Binglin Chang)
Date Thu, 25 Sep 2014 14:57:12 GMT
MAPREDUCE-6078. native-task: fix gtest build on macosx (Binglin Chang)


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/6c3cebda
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/6c3cebda
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/6c3cebda

Branch: refs/heads/trunk
Commit: 6c3cebda3f3662af9db46c1bbfe22543ac18ed57
Parents: dff95f7
Author: Allen Wittenauer <aw@apache.org>
Authored: Thu Sep 25 07:57:01 2014 -0700
Committer: Allen Wittenauer <aw@apache.org>
Committed: Thu Sep 25 07:57:01 2014 -0700

----------------------------------------------------------------------
 hadoop-mapreduce-project/CHANGES.txt            |    2 +
 .../src/CMakeLists.txt                          |    5 -
 .../src/main/native/gtest/gtest-all.cc          | 2030 ++++++++------
 .../src/main/native/gtest/gtest_main.cc         |   39 -
 .../src/main/native/gtest/include/gtest/gtest.h | 2642 +++++++++++-------
 5 files changed, 2834 insertions(+), 1884 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hadoop/blob/6c3cebda/hadoop-mapreduce-project/CHANGES.txt
----------------------------------------------------------------------
diff --git a/hadoop-mapreduce-project/CHANGES.txt b/hadoop-mapreduce-project/CHANGES.txt
index a71e3ef..5176304 100644
--- a/hadoop-mapreduce-project/CHANGES.txt
+++ b/hadoop-mapreduce-project/CHANGES.txt
@@ -222,6 +222,8 @@ Trunk (Unreleased)
 
     MAPREDUCE-6077. native-task: Remove CustomModule examples in nativetask (seanzhong)
 
+    MAPREDUCE-6078. native-task: fix gtest build on macosx (Binglin Chang)
+
 Release 2.6.0 - UNRELEASED
 
   INCOMPATIBLE CHANGES

http://git-wip-us.apache.org/repos/asf/hadoop/blob/6c3cebda/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-nativetask/src/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-nativetask/src/CMakeLists.txt
b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-nativetask/src/CMakeLists.txt
index 7eed176..80036e8 100644
--- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-nativetask/src/CMakeLists.txt
+++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-nativetask/src/CMakeLists.txt
@@ -249,11 +249,6 @@ add_executable(nttest
     ${D}/test/test_commons.cc)
 
 
-IF (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
-    # macos clang with libc++ does not have tr1/tuple, just tuple
-    SET_TARGET_PROPERTIES(nttest PROPERTIES COMPILE_FLAGS "-DGTEST_USE_OWN_TR1_TUPLE=1")
-ENDIF()
-
 target_link_libraries(nttest
      nativetask_static
      gtest


Mime
View raw message