Return-Path: X-Original-To: apmail-accumulo-commits-archive@www.apache.org Delivered-To: apmail-accumulo-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 8D9EB10674 for ; Mon, 28 Oct 2013 04:00:25 +0000 (UTC) Received: (qmail 2148 invoked by uid 500); 28 Oct 2013 04:00:24 -0000 Delivered-To: apmail-accumulo-commits-archive@accumulo.apache.org Received: (qmail 2067 invoked by uid 500); 28 Oct 2013 04:00:21 -0000 Mailing-List: contact commits-help@accumulo.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@accumulo.apache.org Delivered-To: mailing list commits@accumulo.apache.org Received: (qmail 2048 invoked by uid 99); 28 Oct 2013 04:00:18 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 28 Oct 2013 04:00:18 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 4B55E8828F1; Mon, 28 Oct 2013 04:00:18 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: elserj@apache.org To: commits@accumulo.apache.org Date: Mon, 28 Oct 2013 04:00:17 -0000 Message-Id: <758b76157a184f7391ee32aa102cee9b@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [1/2] git commit: ACCUMULO-1819 Update Makefile for native map to build on new OSX version Updated Branches: refs/heads/1.5.1-SNAPSHOT 9f8632099 -> 60609f341 ACCUMULO-1819 Update Makefile for native map to build on new OSX version Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/0e882211 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/0e882211 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/0e882211 Branch: refs/heads/1.5.1-SNAPSHOT Commit: 0e882211f2bda4bfb544463e076eea0fdd7dd3e9 Parents: 7bf6148 Author: Josh Elser Authored: Sun Oct 27 23:54:57 2013 -0400 Committer: Josh Elser Committed: Sun Oct 27 23:54:57 2013 -0400 ---------------------------------------------------------------------- src/server/src/main/c++/nativeMap/Makefile | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/0e882211/src/server/src/main/c++/nativeMap/Makefile ---------------------------------------------------------------------- diff --git a/src/server/src/main/c++/nativeMap/Makefile b/src/server/src/main/c++/nativeMap/Makefile index 56fe773..e3c67db 100644 --- a/src/server/src/main/c++/nativeMap/Makefile +++ b/src/server/src/main/c++/nativeMap/Makefile @@ -24,7 +24,11 @@ endif ifeq ($(shell uname),Darwin) LIBS:= libNativeMap-Mac_OS_X-x86_64-64.jnilib -CXXFLAGS=-m64 -dynamiclib -O3 -I/System/Library/Frameworks/JavaVM.framework/Headers +# 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 endif INSTALL_DIR=../../../../../../lib/native/map