From owner-svn-ports-all@freebsd.org Wed Nov 1 20:49:55 2017 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id B567CE6403C; Wed, 1 Nov 2017 20:49:55 +0000 (UTC) (envelope-from jkim@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 82C1280E17; Wed, 1 Nov 2017 20:49:55 +0000 (UTC) (envelope-from jkim@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vA1KnsA7009878; Wed, 1 Nov 2017 20:49:54 GMT (envelope-from jkim@FreeBSD.org) Received: (from jkim@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id vA1KnsqJ009877; Wed, 1 Nov 2017 20:49:54 GMT (envelope-from jkim@FreeBSD.org) Message-Id: <201711012049.vA1KnsqJ009877@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jkim set sender to jkim@FreeBSD.org using -f From: Jung-uk Kim Date: Wed, 1 Nov 2017 20:49:54 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r453315 - head/java/openjdk8 X-SVN-Group: ports-head X-SVN-Commit-Author: jkim X-SVN-Commit-Paths: head/java/openjdk8 X-SVN-Commit-Revision: 453315 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 01 Nov 2017 20:49:55 -0000 Author: jkim Date: Wed Nov 1 20:49:54 2017 New Revision: 453315 URL: https://svnweb.freebsd.org/changeset/ports/453315 Log: Fix default bootstrap JDK selection. It was accidentally broken by r450869. Modified: head/java/openjdk8/Makefile Modified: head/java/openjdk8/Makefile ============================================================================== --- head/java/openjdk8/Makefile Wed Nov 1 20:23:35 2017 (r453314) +++ head/java/openjdk8/Makefile Wed Nov 1 20:49:54 2017 (r453315) @@ -305,6 +305,8 @@ TOOLS_DIR+= ${${t}:S|/${BUILD_${t}}$||} CONFIGURE_ARGS+= --with-tools-dir="${TOOLS_DIR:u:S/ /:/g}" .endif +.include + BOOTSTRAP_JDKS= ${LOCALBASE}/openjdk8 \ ${LOCALBASE}/openjdk7 \ ${LOCALBASE}/bootstrap-openjdk8 @@ -321,8 +323,6 @@ BOOTSTRAPJDKDIR= ${BJDK} BOOTSTRAPJDKDIR?= ${LOCALBASE}/bootstrap-openjdk8 BUILD_DEPENDS+= ${BOOTSTRAPJDKDIR}/bin/javac:java/bootstrap-openjdk8 .endif - -.include .if ${ARCH} == armv6 || ${ARCH} == armv7 || ${ARCH} == i386 # XXX We must limit max heap size for 32-bit targets.