From nobody Fri Jan 05 21:04:47 2024 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 4T6GDc2J9cz55wwV; Fri, 5 Jan 2024 21:04:48 +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 4T6GDc1C67z4H40; Fri, 5 Jan 2024 21:04:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1704488688; 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=YWaWr+pRFq78C8KRlvoQZ26gQK7W3mouCmFqriMrR10=; b=rvMfwyf7N/ngbQj3526E2gx1ZdkJz9NBxMUX7aDqBITsyn+Ud/TwcLyadz9DjZOIxlT1d+ VZjmlakb9U+ESBGpfKmjP4Ed38S/8bZtp2qI7SjLzErVRT3TcUbEh90O8me00HQOqPiIf/ I/YtSmjbofFBCe6vUrRkQrit+XTEwJCfTncWrVm6mDk0BCJ9FNcYk22DK9CTTfMR5G6jpS jKJy5ncJe6EJo/Ky1INUdoKSRrnrj+RF4GboCfJC880Khw09r6VSbQfniytFJ+ZiMhdzyi fmoIlceN6HHHAGdCUibq3irau/loWP0shiGmnIYFgH7xVR+xLdMesVpeZ3vd+g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1704488688; 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=YWaWr+pRFq78C8KRlvoQZ26gQK7W3mouCmFqriMrR10=; b=MIfbL4u0UhtpDSyu75jwI/tD8x4uMQnvgTp54zaB3GiX1nJSkSJSRV4BNl9vzP6sh1cu/Y WdtfZ2mf9c8hKXIdxDcvUE9B3OXYcblLHUODVeMkyY6Jjq8qsj/C1SXe2Cwj4Q3y1w3laO 5eG2aqTrMsa6uOV1LS+L5d7gs083KCFdKigxktAJ+qk3iRJR8uZa/1w9oIGVbjyLz0htqG AGE1dRRd0f/4BJy2v8wPmCgsf7k2aJSlCcuWRQRCe0DWCfiLKUpbn8aZ9UIKBCfOu7A7Lh v2H38PjOHrdbIYbkD8fxjPjEw7hhh1atsQ57yrx6wygO8ux2sJ0G4br6F1fw3A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1704488688; a=rsa-sha256; cv=none; b=nHkbZxJODsksY7QoGbfjtTXF2k4w6ezZkPlPvC9BvzAQN14Hw2gMBucUfazfsPmaj8+YBM uAJA2G29iv6a9rp5LG2PiHJ9UPx25mtrnmZWQ6ziQ35gX54hjsN+8b1Ca3FNA6hRenF9cw QkiypFuoi7iEFtrFfoDuglMCZ6TwZzX8DsWnS7VjyLpExXWib88cwr4DmGOwfjPPtof8O5 jJdmUZbTUOLtm6Em3aYJ51+XwEcUxPqZt8mzJr8tchgibaEJ0H+XUS1wvwzIwBlz6mp7Jw O3/dnizGr2p9lq8oVwOIsmH35/yIw7eEdF6TahGezURax3u2aKTV1GyiR1hh+A== 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 4T6GDb6GlHz1CXP; Fri, 5 Jan 2024 21:04:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 405L4lQx012291; Fri, 5 Jan 2024 21:04:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 405L4lcp012288; Fri, 5 Jan 2024 21:04:47 GMT (envelope-from git) Date: Fri, 5 Jan 2024 21:04:47 GMT Message-Id: <202401052104.405L4lcp012288@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Piotr Kubaj Subject: git: 85165d2aeb3d - main - java/openjdk18: drop ELFv1 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: pkubaj X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 85165d2aeb3d82141bef5d1bb09dc261e70845bb Auto-Submitted: auto-generated The branch main has been updated by pkubaj: URL: https://cgit.FreeBSD.org/ports/commit/?id=85165d2aeb3d82141bef5d1bb09dc261e70845bb commit 85165d2aeb3d82141bef5d1bb09dc261e70845bb Author: Piotr Kubaj AuthorDate: 2024-01-04 23:03:28 +0000 Commit: Piotr Kubaj CommitDate: 2024-01-05 21:01:09 +0000 java/openjdk18: drop ELFv1 support --- java/openjdk18/Makefile | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/java/openjdk18/Makefile b/java/openjdk18/Makefile index c5fb53256fc3..ce47e54f0dc2 100644 --- a/java/openjdk18/Makefile +++ b/java/openjdk18/Makefile @@ -114,7 +114,7 @@ JDK_BUILD_TYPE= release .include BOOTSTRAP_JDKS= ${LOCALBASE}/openjdk18 -.if ${ARCH} == aarch64 || ${ARCH} == amd64 || ${ARCH} == i386 || (defined(PPC_ABI) && ${PPC_ABI} == ELFv2) || ${ARCH} == powerpc64le +.if ${ARCH} == aarch64 || ${ARCH} == amd64 || ${ARCH} == i386 || ${ARCH:Mpowerpc64*} BOOTSTRAP_JDKS+= ${LOCALBASE}/bootstrap-openjdk17 .endif BOOTSTRAP_JDKS+= ${LOCALBASE}/openjdk17 @@ -128,7 +128,7 @@ BOOTSTRAPJDKDIR= ${BJDK} # if no valid jdk found, set dependency .if !defined(BOOTSTRAPJDKDIR) -. if ${ARCH} == aarch64 || ${ARCH} == amd64 || ${ARCH} == i386 || (defined(PPC_ABI) && ${PPC_ABI} == ELFv2) || ${ARCH} == powerpc64le +. if ${ARCH} == aarch64 || ${ARCH} == amd64 || ${ARCH} == i386 || ${ARCH:Mpowerpc64*} BOOTSTRAPJDKDIR?= ${LOCALBASE}/bootstrap-openjdk17 BUILD_DEPENDS+= ${BOOTSTRAPJDKDIR}/bin/javac:java/bootstrap-openjdk17 . else @@ -165,11 +165,8 @@ CONFIGURE_ARGS+= --with-extra-cxxflags="${EXTRA_CFLAGS}" .if ${ARCH} == aarch64 || ${ARCH:Mpowerpc64*} CONFIGURE_ARGS+= --disable-warnings-as-errors .endif -.if ${ARCH} == aarch64 || (defined(PPC_ABI) && ${PPC_ABI} == ELFv1) -CONFIGURE_ARGS+= --disable-dtrace -.endif .if ${ARCH} == aarch64 -CONFIGURE_ARGS+= --with-boot-jdk-jvmargs=-XX:-UseCompressedClassPointers +CONFIGURE_ARGS+= --with-boot-jdk-jvmargs=-XX:-UseCompressedClassPointers --disable-dtrace MAKE_ENV+= JAVA_TOOL_OPTIONS="-XX:-UseCompressedClassPointers" EXTRA_PATCHES= ${PATCHDIR}/extra-patch-src_hotspot_share_runtime_arguments.cpp .endif