From nobody Fri Aug 16 18:50:37 2024 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 4WlrfP6lRQz5TNKs; Fri, 16 Aug 2024 18:50:37 +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 4WlrfP6K4mz40ZG; Fri, 16 Aug 2024 18:50:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1723834237; 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=KfUkuSAn9RmSSMsdrSreIyWfohgH2da2BHInghrCtt0=; b=evBoVvhSE/EXyFy8Fp7uDbsGxOYw/Okx4yrt/NWwDkQo6VKi7NwOqETTzSHRXGapPfDNm/ 5ZIzap8VHCMOviQNZU5+rqwtgcislwKQUyzXtRcMzsDc42xtKEalBhlOsMQEOqk54kK5nq 7qCQRFDL8zE3AlGGzHfc5UxgfclD6Oud59U8jaDkj4s5rruZzYLKVD7u9X1vQ3ufFrtaJ7 ba/GSOQ3Blbk89RILzzYNucOBTaxO7mYv0aROmHYjqyZArw3Yyj7VxiXRbmlM620+ar/Xn SU/Tt0IFuK9nL2CE/ALiixzzQyzhR3ArDfAT+AY9J7Aiup+viwVEo50JNvUwGA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1723834237; a=rsa-sha256; cv=none; b=eu1zip+eBvZ7N+P12vOiXsjEsB5DagVL/rAqA4e5vDoGTxYznnuGlk61CpWcOysa/pkEXE qn3PO2561jDesFp4bAwmh8oF9fAgfTJbmyrEIJYoGxd5vbMjYwtpz5H9hrr1nffWW3E71i gzcng2h3VzCGQZ4qzAdZ01TZm7U3eLkp5a95NqqdB4kjCGNGvnEGsw/TDP13tohIirtZLL UpU0pHBbcsYog7MKZKSQ4dO/ZD6GI92UwmH82ws4ftq6RueQrGZiFejZ2K8Ss4vfPR9d1p vPb2bupORZoX2iNxUlpN3PherM3ZhuurnAC0d+4mxJndjDlBljDINKwpwF88YQ== 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=1723834237; 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=KfUkuSAn9RmSSMsdrSreIyWfohgH2da2BHInghrCtt0=; b=fqEMLFYkRsxMel0aJHtO7S0KE9MpLvyLNeVKfJxi4N1fEP61GW+RvrxtVUJADJ/FPtazC0 CuXm2T/OKbpMQBPB35JUsu1BwA5BMSJR1I8qi0vwOvlAe1TVWOPvvUO0/gyLVWtaMJQfYW PHBWZgFoKWeh4niuj5b0DHKsRJsmLF+NEybOMw/ocjCdXJIDT+G67sOZZpkkPOPKWSe7mL CeK+hD5kABnfbsUwIs8nyPQ3YV04kSV2pJ5TOLjZOCw36OCHb1PjkIO0ZvOEgvukGVSIAL M+UvjHhZuDoTr84WgsNUIEa+LqR3Lmz40UniPbn0NHCrQ7c2YdGhgNoZftkpYw== 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 4WlrfP5s7TzHxf; Fri, 16 Aug 2024 18:50:37 +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 47GIobVt012257; Fri, 16 Aug 2024 18:50:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 47GIobr2012254; Fri, 16 Aug 2024 18:50:37 GMT (envelope-from git) Date: Fri, 16 Aug 2024 18:50:37 GMT Message-Id: <202408161850.47GIobr2012254@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Vladimir Druzenko Subject: git: 5695d8d0e2aa - 2024Q3 - java/openjdk11: remove custom LLVM - build with LLVM from base 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: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@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/2024Q3 X-Git-Reftype: branch X-Git-Commit: 5695d8d0e2aae63368d435790269d310d93d62a7 Auto-Submitted: auto-generated The branch 2024Q3 has been updated by vvd: URL: https://cgit.FreeBSD.org/ports/commit/?id=5695d8d0e2aae63368d435790269d310d93d62a7 commit 5695d8d0e2aae63368d435790269d310d93d62a7 Author: Vladimir Druzenko AuthorDate: 2024-07-14 13:44:52 +0000 Commit: Vladimir Druzenko CommitDate: 2024-08-16 18:50:04 +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) (cherry picked from commit 08cc50220f1d71f12d13d7e2c957a5679b02914d) --- 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; \