From nobody Sat Jan 01 07:58:50 2022 X-Original-To: dev-commits-ports-main@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 411611927138; Sat, 1 Jan 2022 07:58:51 +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 4JQvXV6xtmz4mHG; Sat, 1 Jan 2022 07:58:50 +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 C05291B33B; Sat, 1 Jan 2022 07:58:50 +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 2017wo35042185; Sat, 1 Jan 2022 07:58:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2017wo23042184; Sat, 1 Jan 2022 07:58:50 GMT (envelope-from git) Date: Sat, 1 Jan 2022 07:58:50 GMT Message-Id: <202201010758.2017wo23042184@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: a21ee2af5439 - main - java/bootstrap-openjdk17: Add i386 support List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@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: a21ee2af54397fc181083a5bb4ab479a5d49f84d Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1641023931; 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=gjHFZP76wtH1jn0sHPN1e5QhKYMneSdqJAiBPyVoqzU=; b=gg5roXyT1nAStSzDIcl2DGT0WBa/JW8ufcaPJw/du8B5agf+bnCPkMxP6lXt1c/CrGceFC 9jfXnPtR18jMRLM7YDC/cviI12ELREJsaatrnTx0LFU89bAtc1pO5QQgAuoNvDb0I0iiBd FD6gLX62ISZUjta9Edms8bj3bR7CZ3zmuXfK4FoGaKndEJt/hDMKwdPMcZ8eOwQN5+fBsV GyZcDacpAirf2/SoiXi3kEUkV/D6OJLy3Ov2rBi/XkGPZOXxleMMfe4y1ABzSwT4ZTP4t0 BXg+7+owy0GKDFczKfgrgGVZg8mwuk5ij3yAMlO8m191Blnm+xPJ1WxJhJbNtQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1641023931; a=rsa-sha256; cv=none; b=fS7Em/q1aIuV64MXnCH++ZezDSywd+w+pMoLZk4HL6cnrkXFOI7lKCh75+/x9TZcZG1yYk A51JDTaskN5LjKnDU31WsPBR7/UItZoufLHqJ3+CRyTLMPVjcJwIHchgwh8P+blIo+CWkM A7Z//B5mnoyX01JJ5nyobNrrfoHOmpbfeYmM1kSi7HVcI5KJ4EwOmlz+AvuI25AT4xg/wk aELD3QSQuyZ12B385cZMmN8arZd6L9gbcoWoGSr4z5Bq0aJduAG3YY3RbuTz+aVx2+MNIl cHSkrd2HmurKp4eB4eFVcogqtoYD2sChBpqBSm6ZVAPpH+1aO4+QQICzCQgdbw== 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=a21ee2af54397fc181083a5bb4ab479a5d49f84d commit a21ee2af54397fc181083a5bb4ab479a5d49f84d Author: Greg Lewis AuthorDate: 2022-01-01 07:58:27 +0000 Commit: Greg Lewis CommitDate: 2022-01-01 07:58:27 +0000 java/bootstrap-openjdk17: Add i386 support --- java/bootstrap-openjdk17/Makefile | 8 +++++++- java/bootstrap-openjdk17/distinfo | 4 +++- java/bootstrap-openjdk17/pkg-plist | 26 +++++++++++++------------- 3 files changed, 23 insertions(+), 15 deletions(-) diff --git a/java/bootstrap-openjdk17/Makefile b/java/bootstrap-openjdk17/Makefile index c131f8c13acf..9cb49ca170af 100644 --- a/java/bootstrap-openjdk17/Makefile +++ b/java/bootstrap-openjdk17/Makefile @@ -11,7 +11,7 @@ COMMENT= Java Development Kit 17 LICENSE= GPLv2 -ONLY_FOR_ARCHS= aarch64 amd64 powerpc64 powerpc64le +ONLY_FOR_ARCHS= aarch64 amd64 i386 powerpc64 powerpc64le USES= tar:xz @@ -34,6 +34,12 @@ PLIST_SUB+= NOT_PPC64="@comment " PLIST_SUB+= NOT_PPC64="" .endif +.if ${ARCH} == i386 +PLIST_SUB+= NOT_I386="@comment " +.else +PLIST_SUB+= NOT_I386="" +.endif + do-install: @cd ${WRKSRC} && ${COPYTREE_SHARE} . ${INSTALLDIR} @cd ${WRKSRC} && ${COPYTREE_BIN} bin ${INSTALLDIR} diff --git a/java/bootstrap-openjdk17/distinfo b/java/bootstrap-openjdk17/distinfo index 378d0bd3d5fa..8a7464323e7c 100644 --- a/java/bootstrap-openjdk17/distinfo +++ b/java/bootstrap-openjdk17/distinfo @@ -1,8 +1,10 @@ -TIMESTAMP = 1640000063 +TIMESTAMP = 1641023254 SHA256 (bootstrap-openjdk17-aarch64-17.0.1.12.1.tar.xz) = a1bf65078fbd9bc0826df4e3979ebd4d882b52fc04303b460a9d0d090f68e7a3 SIZE (bootstrap-openjdk17-aarch64-17.0.1.12.1.tar.xz) = 108306712 SHA256 (bootstrap-openjdk17-amd64-17.0.1.12.1.tar.xz) = 1c8469678ab77e61d78f05ff1e317a46a3208af086eb6dff822d487513adcaea SIZE (bootstrap-openjdk17-amd64-17.0.1.12.1.tar.xz) = 109958368 +SHA256 (bootstrap-openjdk17-i386-17.0.1.12.1.tar.xz) = dd9843939bcccb5772f4485a4553264e81dfb39a42f794de50200bd352f773c3 +SIZE (bootstrap-openjdk17-i386-17.0.1.12.1.tar.xz) = 104910036 SHA256 (bootstrap-openjdk17-powerpc64-elfv2-17.0.1.12.1.tar.xz) = 083e22f78add71a6f6c96a8aa87aa147e790f56a39beba8b33f70166256e920f SIZE (bootstrap-openjdk17-powerpc64-elfv2-17.0.1.12.1.tar.xz) = 104895520 SHA256 (bootstrap-openjdk17-powerpc64le-17.0.1.12.1.tar.xz) = f9677056f6b2fc2c0f1a33a1b75b4cbc592eb8d3b39ab9fed4b22e5f7b468e1f diff --git a/java/bootstrap-openjdk17/pkg-plist b/java/bootstrap-openjdk17/pkg-plist index 81e17de84512..1bc00082b797 100644 --- a/java/bootstrap-openjdk17/pkg-plist +++ b/java/bootstrap-openjdk17/pkg-plist @@ -45,7 +45,7 @@ %%JDK_ROOT%%/lib/libzip.so %%JDK_ROOT%%/lib/modules %%JDK_ROOT%%/lib/classlist -%%JDK_ROOT%%/lib/server/classes_nocoops.jsa +%%NOT_I386%%%%JDK_ROOT%%/lib/server/classes_nocoops.jsa %%JDK_ROOT%%/lib/server/libjsig.so %%JDK_ROOT%%/lib/server/libjvm.so %%JDK_ROOT%%/lib/server/classes.jsa @@ -140,18 +140,18 @@ %%JDK_ROOT%%/legal/jdk.javadoc/jquery.md %%JDK_ROOT%%/legal/jdk.javadoc/jqueryUI.md %%JDK_ROOT%%/legal/jdk.javadoc/ADDITIONAL_LICENSE_INFO -%%NOT_PPC64%%%%JDK_ROOT%%/legal/jdk.internal.vm.compiler/ASSEMBLY_EXCEPTION -%%NOT_PPC64%%%%JDK_ROOT%%/legal/jdk.internal.vm.compiler/LICENSE -%%NOT_PPC64%%%%JDK_ROOT%%/legal/jdk.internal.vm.compiler/ADDITIONAL_LICENSE_INFO -%%NOT_PPC64%%%%JDK_ROOT%%/legal/jdk.internal.vm.compiler.management/ASSEMBLY_EXCEPTION -%%NOT_PPC64%%%%JDK_ROOT%%/legal/jdk.internal.vm.compiler.management/LICENSE -%%NOT_PPC64%%%%JDK_ROOT%%/legal/jdk.internal.vm.compiler.management/ADDITIONAL_LICENSE_INFO +%%NOT_I386%%%%NOT_PPC64%%%%JDK_ROOT%%/legal/jdk.internal.vm.compiler/ASSEMBLY_EXCEPTION +%%NOT_I386%%%%NOT_PPC64%%%%JDK_ROOT%%/legal/jdk.internal.vm.compiler/LICENSE +%%NOT_I386%%%%NOT_PPC64%%%%JDK_ROOT%%/legal/jdk.internal.vm.compiler/ADDITIONAL_LICENSE_INFO +%%NOT_I386%%%%NOT_PPC64%%%%JDK_ROOT%%/legal/jdk.internal.vm.compiler.management/ASSEMBLY_EXCEPTION +%%NOT_I386%%%%NOT_PPC64%%%%JDK_ROOT%%/legal/jdk.internal.vm.compiler.management/LICENSE +%%NOT_I386%%%%NOT_PPC64%%%%JDK_ROOT%%/legal/jdk.internal.vm.compiler.management/ADDITIONAL_LICENSE_INFO %%JDK_ROOT%%/legal/jdk.jartool/ASSEMBLY_EXCEPTION %%JDK_ROOT%%/legal/jdk.jartool/LICENSE %%JDK_ROOT%%/legal/jdk.jartool/ADDITIONAL_LICENSE_INFO -%%NOT_PPC64%%%%JDK_ROOT%%/legal/jdk.internal.vm.ci/ASSEMBLY_EXCEPTION -%%NOT_PPC64%%%%JDK_ROOT%%/legal/jdk.internal.vm.ci/LICENSE -%%NOT_PPC64%%%%JDK_ROOT%%/legal/jdk.internal.vm.ci/ADDITIONAL_LICENSE_INFO +%%NOT_I386%%%%NOT_PPC64%%%%JDK_ROOT%%/legal/jdk.internal.vm.ci/ASSEMBLY_EXCEPTION +%%NOT_I386%%%%NOT_PPC64%%%%JDK_ROOT%%/legal/jdk.internal.vm.ci/LICENSE +%%NOT_I386%%%%NOT_PPC64%%%%JDK_ROOT%%/legal/jdk.internal.vm.ci/ADDITIONAL_LICENSE_INFO %%JDK_ROOT%%/legal/jdk.internal.opt/ASSEMBLY_EXCEPTION %%JDK_ROOT%%/legal/jdk.internal.opt/LICENSE %%JDK_ROOT%%/legal/jdk.internal.opt/jopt-simple.md @@ -327,7 +327,7 @@ %%JDK_ROOT%%/jmods/jdk.internal.jvmstat.jmod %%JDK_ROOT%%/jmods/jdk.internal.le.jmod %%JDK_ROOT%%/jmods/jdk.internal.opt.jmod -%%NOT_PPC64%%%%JDK_ROOT%%/jmods/jdk.internal.vm.ci.jmod +%%NOT_I386%%%%NOT_PPC64%%%%JDK_ROOT%%/jmods/jdk.internal.vm.ci.jmod %%JDK_ROOT%%/jmods/jdk.jdi.jmod %%JDK_ROOT%%/jmods/jdk.jdwp.agent.jmod %%JDK_ROOT%%/jmods/jdk.management.agent.jmod @@ -335,8 +335,8 @@ %%JDK_ROOT%%/jmods/jdk.management.jmod %%JDK_ROOT%%/jmods/jdk.naming.dns.jmod %%JDK_ROOT%%/jmods/java.compiler.jmod -%%NOT_PPC64%%%%JDK_ROOT%%/jmods/jdk.internal.vm.compiler.jmod -%%NOT_PPC64%%%%JDK_ROOT%%/jmods/jdk.internal.vm.compiler.management.jmod +%%NOT_I386%%%%NOT_PPC64%%%%JDK_ROOT%%/jmods/jdk.internal.vm.compiler.jmod +%%NOT_I386%%%%NOT_PPC64%%%%JDK_ROOT%%/jmods/jdk.internal.vm.compiler.management.jmod %%JDK_ROOT%%/jmods/jdk.jartool.jmod %%JDK_ROOT%%/jmods/jdk.javadoc.jmod %%JDK_ROOT%%/jmods/jdk.jcmd.jmod