Return-Path: X-Original-To: apmail-hama-commits-archive@www.apache.org Delivered-To: apmail-hama-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 5D6B2109AE for ; Wed, 2 Oct 2013 10:42:05 +0000 (UTC) Received: (qmail 2874 invoked by uid 500); 2 Oct 2013 10:41:54 -0000 Delivered-To: apmail-hama-commits-archive@hama.apache.org Received: (qmail 2818 invoked by uid 500); 2 Oct 2013 10:41:41 -0000 Mailing-List: contact commits-help@hama.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@hama.apache.org Delivered-To: mailing list commits@hama.apache.org Received: (qmail 2803 invoked by uid 99); 2 Oct 2013 10:41:37 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 02 Oct 2013 10:41:37 +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; Wed, 02 Oct 2013 10:41:35 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 7ED41238889B; Wed, 2 Oct 2013 10:41:15 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1528416 - in /hama/trunk: c++/src/CMakeLists.txt c++/src/main/native/pipes/impl/HamaPipes.cc core/src/main/java/org/apache/hama/pipes/PipesApplication.java Date: Wed, 02 Oct 2013 10:41:15 -0000 To: commits@hama.apache.org From: millecker@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20131002104115.7ED41238889B@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: millecker Date: Wed Oct 2 10:41:15 2013 New Revision: 1528416 URL: http://svn.apache.org/r1528416 Log: Hama Pipes - Remove OpenSSL dependency (jenkins build failure) Modified: hama/trunk/c++/src/CMakeLists.txt hama/trunk/c++/src/main/native/pipes/impl/HamaPipes.cc hama/trunk/core/src/main/java/org/apache/hama/pipes/PipesApplication.java Modified: hama/trunk/c++/src/CMakeLists.txt URL: http://svn.apache.org/viewvc/hama/trunk/c%2B%2B/src/CMakeLists.txt?rev=1528416&r1=1528415&r2=1528416&view=diff ============================================================================== --- hama/trunk/c++/src/CMakeLists.txt (original) +++ hama/trunk/c++/src/CMakeLists.txt Wed Oct 2 10:41:15 2013 @@ -17,10 +17,10 @@ # cmake_minimum_required(VERSION 2.6 FATAL_ERROR) -find_package(OpenSSL REQUIRED) +#find_package(OpenSSL REQUIRED) -message(">>>>> OpenSSL include dir: ${OPENSSL_INCLUDE_DIR}") -message(">>>>> OpenSSL libraries: ${OPENSSL_LIBRARIES}") +#message(">>>>> OpenSSL include dir: ${OPENSSL_INCLUDE_DIR}") +#message(">>>>> OpenSSL libraries: ${OPENSSL_LIBRARIES}") set(CMAKE_BUILD_TYPE, Release) @@ -44,7 +44,7 @@ include_directories( main/native/utils/api main/native/pipes/api ${CMAKE_CURRENT_SOURCE_DIR} - ${OPENSSL_INCLUDE_DIR} +# ${OPENSSL_INCLUDE_DIR} ) # Example programs @@ -75,6 +75,6 @@ add_library(hamapipes STATIC ) target_link_libraries(hamapipes - #${OPENSSL_LIBRARIES} - #pthread +# ${OPENSSL_LIBRARIES} + pthread ) Modified: hama/trunk/c++/src/main/native/pipes/impl/HamaPipes.cc URL: http://svn.apache.org/viewvc/hama/trunk/c%2B%2B/src/main/native/pipes/impl/HamaPipes.cc?rev=1528416&r1=1528415&r2=1528416&view=diff ============================================================================== --- hama/trunk/c++/src/main/native/pipes/impl/HamaPipes.cc (original) +++ hama/trunk/c++/src/main/native/pipes/impl/HamaPipes.cc Wed Oct 2 10:41:15 2013 @@ -36,9 +36,6 @@ #include #include -#include -#include - #define stringify( name ) # name using std::map; Modified: hama/trunk/core/src/main/java/org/apache/hama/pipes/PipesApplication.java URL: http://svn.apache.org/viewvc/hama/trunk/core/src/main/java/org/apache/hama/pipes/PipesApplication.java?rev=1528416&r1=1528415&r2=1528416&view=diff ============================================================================== --- hama/trunk/core/src/main/java/org/apache/hama/pipes/PipesApplication.java (original) +++ hama/trunk/core/src/main/java/org/apache/hama/pipes/PipesApplication.java Wed Oct 2 10:41:15 2013 @@ -15,7 +15,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -/** MODIFIED FOR GPGPU Usage! **/ package org.apache.hama.pipes;