From nobody Sun Jul 14 14:00:38 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 4WMRn257ylz5Qggy; Sun, 14 Jul 2024 14:00:38 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4WMRn24cCPz42yt; Sun, 14 Jul 2024 14:00:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1720965638; 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=KS0y9nt7nza+e1Bsc4NkWUhorevwzVVfauQIL8nssHU=; b=MLQUxcu/i4FlqxfQXxEWKXBz8IFntOkPv2URxMtV2uHpO6RipEDMTMVjxFH0OSKgatBn5a ImkxpGaRS6Qn5HG7KLWamsHk5de12KJ4PDXQ/cR09keWzSxcQDGqEOXKXelNf7THUwECme mzAEdCVrcCOLPY5UJdMc5RgrFUy4ls1Tl1olUmoLRR4k+YykxfvYfbBI04UKEvWGblpkwJ K0Y71mjAtdsFnNsax5ou9mG3JIpxYLQC9sI6rv1MBaQYqm1olPdM2uahLqPzSVgnUGzmv1 GHA031O3AeO3c/c2x0iqnFc/9H50KGxfv/mqbMjyV7ufgnMo1m0IFZ9XRygHNA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1720965638; a=rsa-sha256; cv=none; b=nQrIDUHcHQAFiQVuiuK6+SpZEQFe/Usk32ExQBQ/kzUAyBGBR+APiw9xYXQCL5vJg+9cIP 1vhC8FZThgh//1HdlLzkaTeR7/WDhKIfuKdZwleBX/U8lJcKwLPffZE9x+Vwq+vFzeVEiv Ho5ChfiYQe7y6KjW+2sFr7TE9JZeksOAFC8kf3NsqHZHZ86fDU0XThemdrZSFKyFUiYQkB YMRb/qUtwAnYK4ok7vqsn7Z2Waf2W/zzCv8/gbnwGfWHAtdRZodBw993kr0OvgKCMei+vi wFe4Y7hfXapz2JDjXVO7DdsQOXoM4w1wEIbFHVW8gm3p6b7HCTeZYTl3DkG+jg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1720965638; 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=KS0y9nt7nza+e1Bsc4NkWUhorevwzVVfauQIL8nssHU=; b=PQoJUiSVta5jZ2k0JaiVaJuThMoZD7hfufUBYTc2aYlPhrWE807NAT5CFzj5dQeS6HfcGo 0CgIMBSmqKigzhqJtC0LymEdAY4Eb1wZ61UoLaeCcTv1/SM7KDk/qkxhPTcyoJsTYPC+3+ oaiCK00TBhLV2X5tIjAQeuT1AqlMxW5ehIqzDfwCmT6ntdQe1wRoN015J2ZakUrlnwK7Tc 4joQiR6MiimvCRRf18nxi8Deb5GLfETwBVQubSmztyBRBMIDaiGc0vIHf1sF9nau1ysimo Zmqs1+wyZ93Xp2YNbagJiElmI5FXe06BAgP689bj7APbJ2tGIAuyUVYFOIsiBw== 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 4WMRn23wDtz1BSL; Sun, 14 Jul 2024 14:00:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 46EE0cnC061361; Sun, 14 Jul 2024 14:00:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 46EE0cFo061358; Sun, 14 Jul 2024 14:00:38 GMT (envelope-from git) Date: Sun, 14 Jul 2024 14:00:38 GMT Message-Id: <202407141400.46EE0cFo061358@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Vladimir Druzenko Subject: git: 08cc50220f1d - main - java/openjdk11: remove custom LLVM - build with LLVM from base 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: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: vvd X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 08cc50220f1d71f12d13d7e2c957a5679b02914d Auto-Submitted: auto-generated The branch main has been updated by vvd: URL: https://cgit.FreeBSD.org/ports/commit/?id=08cc50220f1d71f12d13d7e2c957a5679b02914d commit 08cc50220f1d71f12d13d7e2c957a5679b02914d Author: Vladimir Druzenko AuthorDate: 2024-07-14 13:44:52 +0000 Commit: Vladimir Druzenko CommitDate: 2024-07-14 13:44:52 +0000 java/openjdk11: remove custom LLVM - build with LLVM from base Segfaults are no longer observed with current versions of LLVM 17 and 18 in base 13.3 and 14.1, so there is no need to pull such an old version from ports to build. For example build java/openjdk11 with LLVM from base and then build java/eclipse and java/openjfx14 using java/openjdk11: build and run without errors. PR: 280056 260319 Approved by: java (maintainer, timeout 14 days) --- java/openjdk11/Makefile | 6 +----- .../files/patch-make_hotspot_lib_JvmMapfile.gmk | 20 ++++++++++++++++++++ 2 files changed, 21 insertions(+), 5 deletions(-) diff --git a/java/openjdk11/Makefile b/java/openjdk11/Makefile index a891d0f62d90..06cc294c82c6 100644 --- a/java/openjdk11/Makefile +++ b/java/openjdk11/Makefile @@ -152,13 +152,9 @@ CONFIGURE_ARGS+= --with-extra-ldflags="-Wl,-rpath=${LOCALBASE}/lib/gcc${GCC_DEFA --with-extra-cxxflags="-Wl,-rpath=${LOCALBASE}/lib/gcc${GCC_DEFAULT}" .else MAKE_ENV+= USE_CLANG=true -LLVM_VER= 12 -BUILD_DEPENDS+= clang${LLVM_VER}:devel/llvm${LLVM_VER} -CC= ${LOCALBASE}/bin/clang${LLVM_VER} -CXX= ${LOCALBASE}/bin/clang++${LLVM_VER} .endif -.if ${ARCH} == aarch64 || ${ARCH:Marmv*} || ${ARCH:Mpowerpc64*} +.if ${ARCH} == aarch64 || ${ARCH} == amd64 || ${ARCH:Marmv*} || ${ARCH:Mpowerpc64*} CONFIGURE_ARGS+= --disable-warnings-as-errors .endif .if ${ARCH} == aarch64 || ${ARCH:Marmv*} diff --git a/java/openjdk11/files/patch-make_hotspot_lib_JvmMapfile.gmk b/java/openjdk11/files/patch-make_hotspot_lib_JvmMapfile.gmk new file mode 100644 index 000000000000..b7380c2a0b76 --- /dev/null +++ b/java/openjdk11/files/patch-make_hotspot_lib_JvmMapfile.gmk @@ -0,0 +1,20 @@ +--- make/hotspot/lib/JvmMapfile.gmk.orig 2024-04-18 01:56:50 UTC ++++ make/hotspot/lib/JvmMapfile.gmk +@@ -65,7 +65,7 @@ ifeq ($(call isTargetOs, linux), true) + # platform dependent. + + ifeq ($(call isTargetOs, linux), true) +- DUMP_SYMBOLS_CMD := $(NM) --defined-only *.o ++ DUMP_SYMBOLS_CMD := $(NM) --extern-only --defined-only *.o + ifneq ($(FILTER_SYMBOLS_PATTERN), ) + FILTER_SYMBOLS_PATTERN := $(FILTER_SYMBOLS_PATTERN)| + endif +@@ -143,7 +143,7 @@ else ifeq ($(OPENJDK_TARGET_OS), bsd) + if ($$3 ~ /$(FILTER_SYMBOLS_PATTERN)/) print $$3; \ + }' + else +- DUMP_SYMBOLS_CMD := $(NM) --defined-only *.o ++ DUMP_SYMBOLS_CMD := $(NM) --extern-only --defined-only *.o + FILTER_SYMBOLS_AWK_SCRIPT := \ + '{ \ + if ($$3 ~ /$(FILTER_SYMBOLS_PATTERN)/) print $$3; \