Return-Path: X-Original-To: apmail-hadoop-common-commits-archive@www.apache.org Delivered-To: apmail-hadoop-common-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 8BDDF10EFD for ; Thu, 8 Aug 2013 18:44:30 +0000 (UTC) Received: (qmail 19179 invoked by uid 500); 8 Aug 2013 18:44:29 -0000 Delivered-To: apmail-hadoop-common-commits-archive@hadoop.apache.org Received: (qmail 19121 invoked by uid 500); 8 Aug 2013 18:44:29 -0000 Mailing-List: contact common-commits-help@hadoop.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: common-dev@hadoop.apache.org Delivered-To: mailing list common-commits@hadoop.apache.org Received: (qmail 19114 invoked by uid 99); 8 Aug 2013 18:44:28 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 08 Aug 2013 18:44:28 +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; Thu, 08 Aug 2013 18:44:27 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 217F623889FA; Thu, 8 Aug 2013 18:44:07 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1511935 - in /hadoop/common/branches/branch-2.1-beta/hadoop-common-project/hadoop-common: CHANGES.txt src/JNIFlags.cmake Date: Thu, 08 Aug 2013 18:44:07 -0000 To: common-commits@hadoop.apache.org From: cmccabe@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20130808184407.217F623889FA@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: cmccabe Date: Thu Aug 8 18:44:06 2013 New Revision: 1511935 URL: http://svn.apache.org/r1511935 Log: HADOOP-9435. Support building the JNI code against the IBM JVM. (Tian Hong Wang via Colin Patrick McCabe) Modified: hadoop/common/branches/branch-2.1-beta/hadoop-common-project/hadoop-common/CHANGES.txt hadoop/common/branches/branch-2.1-beta/hadoop-common-project/hadoop-common/src/JNIFlags.cmake Modified: hadoop/common/branches/branch-2.1-beta/hadoop-common-project/hadoop-common/CHANGES.txt URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.1-beta/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1511935&r1=1511934&r2=1511935&view=diff ============================================================================== --- hadoop/common/branches/branch-2.1-beta/hadoop-common-project/hadoop-common/CHANGES.txt (original) +++ hadoop/common/branches/branch-2.1-beta/hadoop-common-project/hadoop-common/CHANGES.txt Thu Aug 8 18:44:06 2013 @@ -11,6 +11,9 @@ Release 2.1.1-beta - UNRELEASED HADOOP-9787. ShutdownHelper util to shutdown threads and threadpools. (Karthik Kambatla via Sandy Ryza) + HADOOP-9435. Support building the JNI code against the IBM JVM. + (Tian Hong Wang via Colin Patrick McCabe) + OPTIMIZATIONS BUG FIXES Modified: hadoop/common/branches/branch-2.1-beta/hadoop-common-project/hadoop-common/src/JNIFlags.cmake URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.1-beta/hadoop-common-project/hadoop-common/src/JNIFlags.cmake?rev=1511935&r1=1511934&r2=1511935&view=diff ============================================================================== --- hadoop/common/branches/branch-2.1-beta/hadoop-common-project/hadoop-common/src/JNIFlags.cmake (original) +++ hadoop/common/branches/branch-2.1-beta/hadoop-common-project/hadoop-common/src/JNIFlags.cmake Thu Aug 8 18:44:06 2013 @@ -95,8 +95,9 @@ IF("${CMAKE_SYSTEM}" MATCHES "Linux") NAMES jni.h PATHS ${_JDK_DIRS} NO_DEFAULT_PATH) + #In IBM java, it's jniport.h instead of jni_md.h FIND_PATH(JAVA_INCLUDE_PATH2 - NAMES jni_md.h + NAMES jni_md.h jniport.h PATHS ${_JDK_DIRS} NO_DEFAULT_PATH) SET(JNI_INCLUDE_DIRS ${JAVA_INCLUDE_PATH} ${JAVA_INCLUDE_PATH2})