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 174DD9DCF for ; Sun, 14 Oct 2012 00:47:09 +0000 (UTC) Received: (qmail 11837 invoked by uid 500); 14 Oct 2012 00:47:09 -0000 Delivered-To: apmail-accumulo-commits-archive@accumulo.apache.org Received: (qmail 11813 invoked by uid 500); 14 Oct 2012 00:47:09 -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 11803 invoked by uid 99); 14 Oct 2012 00:47:08 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 14 Oct 2012 00:47:08 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 14 Oct 2012 00:47:06 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 813CF23889D5 for ; Sun, 14 Oct 2012 00:46:22 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1397981 - /accumulo/trunk/server/src/main/c++/nativeMap/Makefile Date: Sun, 14 Oct 2012 00:46:22 -0000 To: commits@accumulo.apache.org From: elserj@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20121014004622.813CF23889D5@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: elserj Date: Sun Oct 14 00:46:22 2012 New Revision: 1397981 URL: http://svn.apache.org/viewvc?rev=1397981&view=rev Log: ACCUMULO-160 Applied a slightly modified version of the provided patch. Modified: accumulo/trunk/server/src/main/c++/nativeMap/Makefile Modified: accumulo/trunk/server/src/main/c++/nativeMap/Makefile URL: http://svn.apache.org/viewvc/accumulo/trunk/server/src/main/c%2B%2B/nativeMap/Makefile?rev=1397981&r1=1397980&r2=1397981&view=diff ============================================================================== --- accumulo/trunk/server/src/main/c++/nativeMap/Makefile (original) +++ accumulo/trunk/server/src/main/c++/nativeMap/Makefile Sun Oct 14 00:46:22 2012 @@ -18,13 +18,33 @@ HDRS=$(wildcard *.h) org_apache_accumulo CXX=g++ ifeq ($(shell uname),Linux) -LIBS:= libNativeMap-Linux-amd64-64.so libNativeMap-Linux-i386-32.so -CXXFLAGS=-g -fPIC -shared -O2 -fno-omit-frame-pointer -fno-strict-aliasing -Wall -I$(JAVA_HOME)/include/linux -I$(JAVA_HOME)/include + LIBS_32 := libNativeMap-Linux-i386-32.so + LIBS_64 := libNativeMap-Linux-amd64-64.so + + ifneq ($(DARCH),) + ifeq ($(DARCH),64) + LIBS := $(LIBS_64) + endif + ifeq ($(DARCH),32) + LIBS := $(LIBS_32) + endif + ifeq ($(DARCH),both) + LIBS := $(LIBS_64)$(LIBS_32) + endif + ifeq ($(LIBS),) + LIBS := $(LIBS_64)$(LIBS_32) + endif + else + DARCH := $(shell getconf LONG_BIT) + LIBS := $(LIBS_$(DARCH)) + endif + + CXXFLAGS=-g -fPIC -shared -O2 -fno-omit-frame-pointer -fno-strict-aliasing -Wall -I$(JAVA_HOME)/include/linux -I$(JAVA_HOME)/include 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 + LIBS:= libNativeMap-Mac_OS_X-x86_64-64.jnilib + CXXFLAGS=-m64 -dynamiclib -O3 -I/System/Library/Frameworks/JavaVM.framework/Headers endif INSTALL_DIR=../../../../../lib/native/map