From nobody Sat Nov 27 16:52:43 2021 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id A075F18C7C84; Sat, 27 Nov 2021 16:52:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4J1d2g2ck4z3M74; Sat, 27 Nov 2021 16:52:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 39C691F2CE; Sat, 27 Nov 2021 16:52:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 1ARGqhEu021250; Sat, 27 Nov 2021 16:52:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1ARGqhxF021249; Sat, 27 Nov 2021 16:52:43 GMT (envelope-from git) Date: Sat, 27 Nov 2021 16:52:43 GMT Message-Id: <202111271652.1ARGqhxF021249@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Greg Lewis Subject: git: 11b6514a0129 - main - java/openjdk17: Use the bootstrap port on supported ARCHs List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: glewis X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 11b6514a0129daac85f9600d49d6420844cf96d1 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1638031963; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=df/U6VLsMgijc0v1ndpbfwUGlRmijwPRSmIPZ2Wz79A=; b=rlNnU33FBxvkQhkNHgF9Q8hIq2m2irRX8QTN3L79JNg/g/qrSjtSimHMkEgZSf46ybylGG kA6bs7kLWwHIkw9sxTD7ezq1r2FdwK8mnjOxfSufwePzSEdCrLDgENqejNAhp3CoqwVYUU FJmLeNTL+Y5KriVdMc9FlvZ6gTRKomWp4Go/lJvjKjYDPa5yxK2HYXGIUwTS+ds16V3G8O zlYTTsM9tP91eOY+GoTARbFuH/jH9rkzdrThZSWPClg7VA3TWCZaSfJZITuDeeOdUvbR18 5ujkswSNoqSJ4V4KX/sK8Vwd1zs4CIqRQXKfhkU6vDUcS5/n31qNF2yY/qQ1Vg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1638031963; a=rsa-sha256; cv=none; b=Gxk6QRZFp/+b/Jfl+jfu8Ku+rsNEaeFXIt88CbK12P5xSovjugJ/N8LbwtcQzhCJBdZEvE WynxqWvp+m26meKgvZ3EsHRewfGDuS1dcP/nenmvK0fylEeJUuQ3FVGH5wPsAreTjwaROT IXLSRAZp3rU6G13urLNPpVev5MyovL/XKLej1w5XK/SuxgLH/gQ6mtT7p1wCFAMjxP1A99 wLIeQf/1nKr+0zGFh77J3Js4v7JdPcO2hCP6oyTv8NAc2UP2e+ANvEKaVMlP7MjJjKUjJj 149QfSYaFGjthgECndrZ6W8D8Fz7TIn/OnHG2k3G9kVn6YmWXl4ryS7tBRaLMg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by glewis: URL: https://cgit.FreeBSD.org/ports/commit/?id=11b6514a0129daac85f9600d49d6420844cf96d1 commit 11b6514a0129daac85f9600d49d6420844cf96d1 Author: Greg Lewis AuthorDate: 2021-11-27 16:50:26 +0000 Commit: Greg Lewis CommitDate: 2021-11-27 16:50:26 +0000 java/openjdk17: Use the bootstrap port on supported ARCHs --- java/openjdk17/Makefile | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/java/openjdk17/Makefile b/java/openjdk17/Makefile index 1072d7492c32..078431d0c568 100644 --- a/java/openjdk17/Makefile +++ b/java/openjdk17/Makefile @@ -104,8 +104,11 @@ JDK_BUILD_TYPE= release .include -BOOTSTRAP_JDKS= ${LOCALBASE}/openjdk17 \ - ${LOCALBASE}/openjdk16 +BOOTSTRAP_JDKS= ${LOCALBASE}/openjdk17 +.if ${ARCH} == aarch64 || ${ARCH} == amd64 +BOOTSTRAP_JDKS+= ${LOCALBASE}/bootstrap-openjdk17 +.endif +BOOTSTRAP_JDKS+= ${LOCALBASE}/openjdk16 # do we have valid native jdk installed? .for BJDK in ${BOOTSTRAP_JDKS} @@ -116,8 +119,13 @@ BOOTSTRAPJDKDIR= ${BJDK} # if no valid jdk found, set dependency .if !defined(BOOTSTRAPJDKDIR) +. if ${ARCH} == aarch64 || ${ARCH} == amd64 +BOOTSTRAPJDKDIR?= ${LOCALBASE}/bootstrap-openjdk17 +BUILD_DEPENDS+= ${BOOTSTRAPJDKDIR}/bin/javac:java/bootstrap-openjdk17 +. else BOOTSTRAPJDKDIR?= ${LOCALBASE}/openjdk16 BUILD_DEPENDS+= ${BOOTSTRAPJDKDIR}/bin/javac:java/openjdk16 +. endif .endif JDK_BUILD_JVM= server