From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id CC105158093 for ; Mon, 4 Jul 2022 10:44:59 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 802D3E08F0; Mon, 4 Jul 2022 10:44:58 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 62F8BE08F0 for ; Mon, 4 Jul 2022 10:44:58 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 6DEF534199E for ; Mon, 4 Jul 2022 10:44:57 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D70A8522 for ; Mon, 4 Jul 2022 10:44:55 +0000 (UTC) From: "Georgy Yakovlev" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Georgy Yakovlev" Message-ID: <1656931471.ffdb83c648b4e646d9b59ed4001d9133d2a5c491.gyakovlev@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-java/openjdk/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-java/openjdk/openjdk-11.0.15_p10.ebuild dev-java/openjdk/openjdk-17.0.3_p7.ebuild dev-java/openjdk/openjdk-8.332_p09.ebuild X-VCS-Directories: dev-java/openjdk/ X-VCS-Committer: gyakovlev X-VCS-Committer-Name: Georgy Yakovlev X-VCS-Revision: ffdb83c648b4e646d9b59ed4001d9133d2a5c491 X-VCS-Branch: master Date: Mon, 4 Jul 2022 10:44:55 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 051a0c76-483c-41ea-a881-4cd2d607fb12 X-Archives-Hash: a61f958c5aa2052b688355ab288aab7d commit: ffdb83c648b4e646d9b59ed4001d9133d2a5c491 Author: Mike Gilbert gentoo org> AuthorDate: Sun Jun 26 17:18:47 2022 +0000 Commit: Georgy Yakovlev gentoo org> CommitDate: Mon Jul 4 10:44:31 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ffdb83c6 dev-java/openjdk: use BROOT instead of EPREFIX where appropriate Signed-off-by: Mike Gilbert gentoo.org> Signed-off-by: Georgy Yakovlev gentoo.org> dev-java/openjdk/openjdk-11.0.15_p10.ebuild | 2 +- dev-java/openjdk/openjdk-17.0.3_p7.ebuild | 8 ++++---- dev-java/openjdk/openjdk-8.332_p09.ebuild | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dev-java/openjdk/openjdk-11.0.15_p10.ebuild b/dev-java/openjdk/openjdk-11.0.15_p10.ebuild index 6ead86475351..13011a1a1744 100644 --- a/dev-java/openjdk/openjdk-11.0.15_p10.ebuild +++ b/dev-java/openjdk/openjdk-11.0.15_p10.ebuild @@ -138,7 +138,7 @@ pkg_setup() { if use system-bootstrap; then for vm in ${JAVA_PKG_WANT_BUILD_VM}; do - if [[ -d ${EPREFIX}/usr/lib/jvm/${vm} ]]; then + if [[ -d ${BROOT}/usr/lib/jvm/${vm} ]]; then java-pkg-2_pkg_setup return fi diff --git a/dev-java/openjdk/openjdk-17.0.3_p7.ebuild b/dev-java/openjdk/openjdk-17.0.3_p7.ebuild index d420e8418f31..801109e4f4f2 100644 --- a/dev-java/openjdk/openjdk-17.0.3_p7.ebuild +++ b/dev-java/openjdk/openjdk-17.0.3_p7.ebuild @@ -147,7 +147,7 @@ pkg_setup() { local vm for vm in ${JAVA_PKG_WANT_BUILD_VM}; do - if [[ -d ${EPREFIX}/usr/lib/jvm/${vm} ]]; then + if [[ -d ${BROOT}/usr/lib/jvm/${vm} ]]; then java-pkg-2_pkg_setup return fi @@ -162,15 +162,15 @@ src_prepare() { src_configure() { if has_version dev-java/openjdk:${SLOT}; then - export JDK_HOME=${EPREFIX}/usr/$(get_libdir)/openjdk-${SLOT} + export JDK_HOME=${BROOT}/usr/$(get_libdir)/openjdk-${SLOT} elif use !system-bootstrap ; then local xpakvar="${ARCH^^}_XPAK" export JDK_HOME="${WORKDIR}/openjdk-bootstrap-${!xpakvar}" else - JDK_HOME=$(best_version dev-java/openjdk-bin:${SLOT}) + JDK_HOME=$(best_version -b dev-java/openjdk-bin:${SLOT}) [[ -n ${JDK_HOME} ]] || die "Build VM not found!" JDK_HOME=${JDK_HOME#*/} - JDK_HOME=${EPREFIX}/opt/${JDK_HOME%-r*} + JDK_HOME=${BROOT}/opt/${JDK_HOME%-r*} export JDK_HOME fi diff --git a/dev-java/openjdk/openjdk-8.332_p09.ebuild b/dev-java/openjdk/openjdk-8.332_p09.ebuild index 56ae18e26e00..a375e49ff167 100644 --- a/dev-java/openjdk/openjdk-8.332_p09.ebuild +++ b/dev-java/openjdk/openjdk-8.332_p09.ebuild @@ -161,7 +161,7 @@ src_configure() { unset _JAVA_OPTIONS JAVA JAVA_TOOL_OPTIONS JAVAC MAKE XARGS CFLAGS= CXXFLAGS= LDFLAGS= \ CONFIG_SITE=/dev/null \ - CONFIG_SHELL="${EPREFIX}/bin/bash" + CONFIG_SHELL="${BROOT}/bin/bash" econf "${myconf[@]}" ) }