accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ctubb...@apache.org
Subject git commit: ACCUMULO-1852 Fix native maps on OS X 10.9
Date Thu, 21 Nov 2013 22:26:36 GMT
Updated Branches:
  refs/heads/1.6.0-SNAPSHOT de8ecd4a7 -> 2aad7fe0a


ACCUMULO-1852 Fix native maps on OS X 10.9


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/2aad7fe0
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/2aad7fe0
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/2aad7fe0

Branch: refs/heads/1.6.0-SNAPSHOT
Commit: 2aad7fe0af7701609df67dea3daf872a526761be
Parents: de8ecd4
Author: Christopher Tubbs <ctubbsii@apache.org>
Authored: Thu Nov 21 17:08:23 2013 -0500
Committer: Christopher Tubbs <ctubbsii@apache.org>
Committed: Thu Nov 21 17:26:03 2013 -0500

----------------------------------------------------------------------
 server/native/src/main/c++/nativeMap/BlockAllocator.h |  1 -
 server/native/src/main/resources/Makefile             | 11 ++++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/2aad7fe0/server/native/src/main/c++/nativeMap/BlockAllocator.h
----------------------------------------------------------------------
diff --git a/server/native/src/main/c++/nativeMap/BlockAllocator.h b/server/native/src/main/c++/nativeMap/BlockAllocator.h
index d62ffd5..81c14d8 100644
--- a/server/native/src/main/c++/nativeMap/BlockAllocator.h
+++ b/server/native/src/main/c++/nativeMap/BlockAllocator.h
@@ -20,7 +20,6 @@
 #define _BLOCK_ALLOCATOR_H_ 1
 
 #include <new>
-#include <bits/functexcept.h>
 #include <iostream>
 #include <string>
 #include <vector>

http://git-wip-us.apache.org/repos/asf/accumulo/blob/2aad7fe0/server/native/src/main/resources/Makefile
----------------------------------------------------------------------
diff --git a/server/native/src/main/resources/Makefile b/server/native/src/main/resources/Makefile
index 9f0ecde..c9bdc91 100644
--- a/server/native/src/main/resources/Makefile
+++ b/server/native/src/main/resources/Makefile
@@ -17,6 +17,7 @@ SRCS=$(wildcard nativeMap/*.cc)
 HDRS=$(wildcard nativeMap/*.h) $(wildcard javah/*.h)
 TESTSRCS=$(wildcard testNativeMap/*.cc)
 CXX=g++
+MAVERICKFLAGS=
 
 ifeq ($(shell uname),Linux)
 	JAVA_HOME=$(shell dirname $$(dirname $$(readlink -ef $$(which javah))))
@@ -27,10 +28,10 @@ endif
 ifeq ($(shell uname),Darwin)
 	JAVA_HOME=$(shell /usr/libexec/java_home)
 	NATIVE_LIB:= libaccumulo.dylib
-	# Update flags for OSX-10.9 and Xcode 5.0.1
-	# I think that we should be able to remove the `-undefined dynamic_lookup` option,
-	# but I don't know exactly how to go about this.
-	CXXFLAGS=-m64 -dynamiclib -undefined dynamic_lookup -O3 -I/System/Library/Frameworks/JavaVM.framework/Headers
-I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/darwin -I/usr/include/c++/4.2.1 -Ijavah 
+ifneq (,$(findstring 10.9,$(shell sw_vers -productVersion)))
+	MAVERICKFLAGS=-stdlib=libstdc++
+endif
+	CXXFLAGS=-m64 -dynamiclib -undefined dynamic_lookup -O3 -I/System/Library/Frameworks/JavaVM.framework/Headers
-I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/darwin -Ijavah $(MAVERICK_FLAGS)
 endif
 
 all : $(NATIVE_LIB)
@@ -44,7 +45,7 @@ testJavaHome :
 	@echo JAVA_HOME is $(JAVA_HOME)
 
 runTests : $(NATIVE_LIB) $(TESTSRCS)
-	$(CXX) -g -Wall -I/System/Library/Frameworks/JavaVM.framework/Headers -I$(JAVA_HOME)/include
-I$(JAVA_HOME)/include/linux -InativeMap -o $@ $(TESTSRCS) $(NATIVE_LIB)
+	$(CXX) -g -Wall -I/System/Library/Frameworks/JavaVM.framework/Headers -I$(JAVA_HOME)/include
-I$(JAVA_HOME)/include/linux -InativeMap -o $@ $(TESTSRCS) $(NATIVE_LIB) $(MAVERICK_FLAGS)
 	LD_LIBRARY_PATH=./ ./$@ 20 20 20 20 20 20 20 20 true
 
 clean :


Mime
View raw message