From commits-return-4692-archive-asf-public=cust-asf.ponee.io@hawq.apache.org Wed Aug 14 14:19:30 2019 Return-Path: X-Original-To: archive-asf-public@cust-asf.ponee.io Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [207.244.88.153]) by mx-eu-01.ponee.io (Postfix) with SMTP id 10CFC1802C7 for ; Wed, 14 Aug 2019 16:19:29 +0200 (CEST) Received: (qmail 36747 invoked by uid 500); 14 Aug 2019 14:19:29 -0000 Mailing-List: contact commits-help@hawq.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@hawq.apache.org Delivered-To: mailing list commits@hawq.apache.org Received: (qmail 36734 invoked by uid 99); 14 Aug 2019 14:19:29 -0000 Received: from ec2-52-202-80-70.compute-1.amazonaws.com (HELO gitbox.apache.org) (52.202.80.70) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 14 Aug 2019 14:19:29 +0000 Received: by gitbox.apache.org (ASF Mail Server at gitbox.apache.org, from userid 33) id 033C385F3A; Wed, 14 Aug 2019 14:19:28 +0000 (UTC) Date: Wed, 14 Aug 2019 14:19:28 +0000 To: "commits@hawq.apache.org" Subject: [hawq] branch master updated: HAWQ-1744. fix lib jvm not found in docker bug MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Message-ID: <156579236868.30675.2594548492145354545@gitbox.apache.org> From: huor@apache.org X-Git-Host: gitbox.apache.org X-Git-Repo: hawq X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Oldrev: 90901851c1e10ce729d1010a289e7fac95981654 X-Git-Newrev: 3ab78a814ca6ec037e19bef88c64100435c84835 X-Git-Rev: 3ab78a814ca6ec037e19bef88c64100435c84835 X-Git-NotificationType: ref_changed_plus_diff X-Git-Multimail-Version: 1.5.dev Auto-Submitted: auto-generated This is an automated email from the ASF dual-hosted git repository. huor pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/hawq.git The following commit(s) were added to refs/heads/master by this push: new 3ab78a8 HAWQ-1744. fix lib jvm not found in docker bug 3ab78a8 is described below commit 3ab78a814ca6ec037e19bef88c64100435c84835 Author: oushu1tuyu1 AuthorDate: Wed Aug 14 19:22:21 2019 +0800 HAWQ-1744. fix lib jvm not found in docker bug --- src/pl/pljava/src/C/pljava/Makefile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/pl/pljava/src/C/pljava/Makefile b/src/pl/pljava/src/C/pljava/Makefile index fe94b30..5b36a25 100644 --- a/src/pl/pljava/src/C/pljava/Makefile +++ b/src/pl/pljava/src/C/pljava/Makefile @@ -118,13 +118,12 @@ else $(JRE_LIB)/jrockit \ 2> /dev/null)) endif - PLJAVA_CPPFLAGS += -I"$(JDK_HOME)/include" -I"$(JDK_HOME)/include/$(JRE_INCL)" + SHLIB_LINK += -L"$(JDK_HOME)/jre/lib/$(JRE_CPU)/server" SHLIB_LINK += -L. -L"$(JVM_LIB)" -ljvm endif endif - override CPPFLAGS += $(PLJAVA_CPPFLAGS) override CFLAGS += $(PLJAVA_CFLAGS)