From patchwork Wed Aug 7 14:28:30 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: enevill2 X-Patchwork-Id: 18833 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ye0-f200.google.com (mail-ye0-f200.google.com [209.85.213.200]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 81E19246B3 for ; Wed, 7 Aug 2013 14:28:37 +0000 (UTC) Received: by mail-ye0-f200.google.com with SMTP id r13sf2021018yen.11 for ; Wed, 07 Aug 2013 07:28:37 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-gm-message-state:delivered-to:message-id:subject:from:reply-to:to :cc:date:mime-version:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :list-post:list-help:list-archive:list-unsubscribe:content-type :content-transfer-encoding; bh=rgO9mS1bT7ZrWnladJPSoVCFiUjPGiwTWXVU63RYG6M=; b=bJcGHDGS8lUOgZlRWzMfQXA4qGZHqqE+qOHEd0JKKdbqpCD5CwTHbFtyEbVIoELzG+ 9Z495oOBvEWwlcVypxhWa66oP77dRwdIjUyC4GNUQTOzl/K1A5tjYiRDfSUarr9mLhug cc+AxP57ccUshWXUtr/ijA/iDA2B+IrSt8c7MpouFhwFZe1zCIyi2RB4pf6ompSNtIx/ ck5VnhXjRZXnzBkqrRfZG17VE7McJWwqYbt7uMX+oxbgUWf116ZRl0GPEJIQ1dSjRJtf AnvWlINIMf8UGNph1gq4Tos6qb6XlqWkOAU1DvqX4L0H3zgO4fFO2RD/uc87EaP9gpw/ iF4A== X-Received: by 10.236.111.40 with SMTP id v28mr1451563yhg.27.1375885716965; Wed, 07 Aug 2013 07:28:36 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.29.167 with SMTP id l7ls714536qeh.47.gmail; Wed, 07 Aug 2013 07:28:36 -0700 (PDT) X-Received: by 10.58.236.70 with SMTP id us6mr464010vec.89.1375885716843; Wed, 07 Aug 2013 07:28:36 -0700 (PDT) Received: from mail-ve0-f175.google.com (mail-ve0-f175.google.com [209.85.128.175]) by mx.google.com with ESMTPS id sy7si1655588vdc.105.2013.08.07.07.28.36 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 07 Aug 2013 07:28:36 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.128.175 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.128.175; Received: by mail-ve0-f175.google.com with SMTP id oy10so1838222veb.20 for ; Wed, 07 Aug 2013 07:28:36 -0700 (PDT) X-Gm-Message-State: ALoCoQmJ9q/HNabw2B1chW0LJ8U8g8/+9UsOGGARhywrILPVSlzC/npZnDqpAPrQLsQDi49wT+SG X-Received: by 10.52.164.16 with SMTP id ym16mr450518vdb.32.1375885716517; Wed, 07 Aug 2013 07:28:36 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patches@linaro.org Received: by 10.221.11.8 with SMTP id pc8csp203980vcb; Wed, 7 Aug 2013 07:28:35 -0700 (PDT) X-Received: by 10.14.111.198 with SMTP id w46mr3351157eeg.66.1375885714608; Wed, 07 Aug 2013 07:28:34 -0700 (PDT) Received: from avasout07.plus.net (avasout07.plus.net. [84.93.230.235]) by mx.google.com with ESMTP id 41si6220964eee.287.2013.08.07.07.28.33 for ; Wed, 07 Aug 2013 07:28:34 -0700 (PDT) Received-SPF: neutral (google.com: 84.93.230.235 is neither permitted nor denied by best guess record for domain of ed@camswl.com) client-ip=84.93.230.235; Received: from [192.168.1.77] ([213.122.173.130]) by avasout07 with smtp id 9qUW1m0072pA20t01qUZrm; Wed, 07 Aug 2013 15:28:33 +0100 X-CM-Score: 0.00 X-CNFS-Analysis: v=2.1 cv=bbFSDo/B c=1 sm=1 tr=0 a=akoSf+JUz62J0Hgnf26c+A==:117 a=akoSf+JUz62J0Hgnf26c+A==:17 a=0Bzu9jTXAAAA:8 a=Q-xmfQLerwoA:10 a=yHkIrnhuIFAA:10 a=yj2z6k84kjkA:10 a=IkcTkHD0fZMA:10 a=EO40a-L4AAAA:8 a=1z79ScGU1dwA:10 a=6DqKefdiU8IxvntiOPQA:9 a=QEXdDO2ut3YA:10 a=PuS23pD7xT0A:10 X-AUTH: ednevill:2500 Message-ID: <1375885710.3993.55.camel@fleetfoot.lan> Subject: Add missing --with-override-nashorn From: Edward Nevill Reply-To: ed@camswl.com To: aarch64-port-dev@openjdk.java.net Cc: patches@linaro.org, Andrew McDermott Date: Wed, 07 Aug 2013 15:28:30 +0100 X-Mailer: Evolution 3.6.4 (3.6.4-3.fc18) Mime-Version: 1.0 X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: ed@camswl.com X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.128.175 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Precedence: list Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org List-ID: X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , Hi, The following patch adds the missing --with-override-nashorn to configure. All the other options are there (--with-override-hotspot, --with-override-jdk etc), just this one is missing. This is causing problems for our CI loop. Regards, Ed. --- CUT HERE --- exporting patch: # HG changeset patch # User Edward Nevill ed@camswl.com # Date 1375885009 -3600 # Node ID 276f43662fe277205c2497391247110796a3956d # Parent 85dd3c10d826e89f2e67234bd99f87101d6eec64 Add missing --with-overide-nashorn diff -r 85dd3c10d826 -r 276f43662fe2 common/autoconf/generated-configure.sh --- a/common/autoconf/generated-configure.sh Fri Jul 26 15:49:11 2013 +0100 +++ b/common/autoconf/generated-configure.sh Wed Aug 07 15:16:49 2013 +0100 @@ -1006,6 +1006,7 @@ with_override_jaxws with_override_hotspot with_override_jdk +with_override_nashorn with_import_hotspot with_msvcr_dll with_dxsdk @@ -1760,6 +1761,7 @@ --with-override-jaxws use this jaxws dir for the build --with-override-hotspot use this hotspot dir for the build --with-override-jdk use this jdk dir for the build + --with-override-nashorn use this nashorn dir for the build --with-import-hotspot import hotspot binaries from this jdk image or hotspot build dist dir instead of building from source @@ -15991,6 +15993,11 @@ withval=$with_override_jdk; fi +# Check whether --with-override-nashorn was given. +if test "${with_override_nashorn+set}" = set; then : + withval=$with_override_nashorn; +fi + if test "x$with_override_langtools" != x; then CURDIR="$PWD" diff -r 85dd3c10d826 -r 276f43662fe2 common/autoconf/source-dirs.m4 --- a/common/autoconf/source-dirs.m4 Fri Jul 26 15:49:11 2013 +0100 +++ b/common/autoconf/source-dirs.m4 Wed Aug 07 15:16:49 2013 +0100 @@ -180,6 +180,9 @@ AC_ARG_WITH(override-jdk, [AS_HELP_STRING([--with-override-jdk], [use this jdk dir for the build])]) +AC_ARG_WITH(override-nashorn, [AS_HELP_STRING([--with-override-nashorn], + [use this nashorn dir for the build])]) + if test "x$with_override_langtools" != x; then CURDIR="$PWD" cd "$with_override_langtools" --- CUT HERE ---