From nobody Sat Aug 06 10:56:18 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 4M0KC66HQrz4YhTr; Sat, 6 Aug 2022 10:56:18 +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 4M0KC65p99z4G1p; Sat, 6 Aug 2022 10:56:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1659783378; 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=BdrBDCUwgAaiCOkP9l2F9PJTp6MEf/XdmDaSBuOsrS4=; b=YLGaaQBaokvpxR0lGnF5aqAUTAvql/H9brJYfGHzMMy+6Zksh7yG/rdXN1ld91eSqBIVrG BfDg0afZj3Z/wSuu1i46JRSoSSI4p7vB2ereDNnVUOoK4O63IWM2myEhCZHXwrbJr5GIMc j9BLeS5WSiNKpq5GaYyEtUuFb/oF9xns4JOk/IbjLTarblZwudrCioDiHc59pfYeUFqvgJ 1pLXuxorqaZbmgORO0M4J6agvGQFJm+Uq5ZVhPjEB+/CSB7rH45yCpeWXSxX5TJ8G/Z6E+ s7+z0PVKDdujpf1jYZ5NW2rmuH2jj9LrqafRCKoXTftV/Eww2bfcT+03XlriRw== 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 4M0KC64sNzzWTd; Sat, 6 Aug 2022 10:56:18 +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 276AuItv022946; Sat, 6 Aug 2022 10:56:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 276AuIUj022945; Sat, 6 Aug 2022 10:56:18 GMT (envelope-from git) Date: Sat, 6 Aug 2022 10:56:18 GMT Message-Id: <202208061056.276AuIUj022945@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Dimitry Andric Subject: git: 591a784f324b - main - java/openjdk{8,11}: Remove dependency on devel/llvm12 which is no longer necessary 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: dim X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 591a784f324b7d8c45596d758b4c0893626bdbef Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1659783378; 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=BdrBDCUwgAaiCOkP9l2F9PJTp6MEf/XdmDaSBuOsrS4=; b=RpxRgqStC4cAj0Md8lRA7/SNojkUulI7gHA/nwW2MK553pSqeXc5Xn5JRWm0IMZwRfqdJR VINkm6xJTJHN+HlFmF6AM3dkOAth+xNJMU7vGGcwrqqhcux8PPGpMgOanBzcmVUvvUifw7 ghCl9FIx1xrNjM5WWV1ddpjHCLvVhB3NbOFGyTM4hX36eLoU3dYmzdJytVX7JbOvEMOTgu RWLb2o7Q4fmupKyw7XZyOxZ8a4PL7H3wMTrA5qvxPSJ36XtuUA22cZ6Vvv2bqRPXjptfcW i2W1YA2WEeuo5K8q7V1GQjd/Js8RXEyPO0e1rAF2WUXoQrpr2l9ocf7FNOEqmQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1659783378; a=rsa-sha256; cv=none; b=BWHDTMFMf7XFdaKfclcEERR1LMaMeAlJPcNtmN8kxkvO2lbgVwO76v+Frn89DngT0FsZAX 96GFgt4691ilUd5l2SfrYU6UFi2hBwNNq1Tm+5ZcyRLaxay87aMYJIFkgBaFyffZ7m7qRY aWj05okULkXf0D/xm9NflDiE64wlAlOL41ejL+CNcCHemdwZt+5D0ni+leEEfVAs5ulggT 5NOqLFKT8+ggu+Q2Q+HZAidMgZ1A7umPVKt7hyT7qnlysdD6ndZpNC0DZsSHIVHPABR24q 1eQoYSXCDxsVGBqDuyQL497KVD39VI84+gLibDxyTnZHF5C7JH7KWlSBwyB00A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by dim (src committer): URL: https://cgit.FreeBSD.org/ports/commit/?id=591a784f324b7d8c45596d758b4c0893626bdbef commit 591a784f324b7d8c45596d758b4c0893626bdbef Author: Dimitry Andric AuthorDate: 2022-08-06 10:54:52 +0000 Commit: Dimitry Andric CommitDate: 2022-08-06 10:55:32 +0000 java/openjdk{8,11}: Remove dependency on devel/llvm12 which is no longer necessary The workarounds committed in aa1ca89826b5 and 846ff4e95291 are no longer necessary, as both the upstream commits for PR258954 (https://github.com/battleblow/jdk11u/commit/305a68a90c722aa7a7b75589e24d5b5d554c96c1) and PR264065 (https://hg.openjdk.java.net/jdk/jdk/rev/40c07de877ab) are now merged into the distribution tarballs. PR: 258954, 264065 Approved by: maintainer timeout (1 month) MFH: 2022Q3 --- java/openjdk11/Makefile | 8 -------- java/openjdk8/Makefile | 8 -------- 2 files changed, 16 deletions(-) diff --git a/java/openjdk11/Makefile b/java/openjdk11/Makefile index 770f6037e871..3c8b088098d6 100644 --- a/java/openjdk11/Makefile +++ b/java/openjdk11/Makefile @@ -141,14 +141,6 @@ 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 -.if ${COMPILER_VERSION} >= 130 -# PR258954: OpenJDK <= 13 crash due to undefined behavior with clang >= 13 -# See also https://bugs.openjdk.java.net/browse/JDK-8229258 -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 .endif .if ${ARCH} == aarch64 || ${ARCH:Marmv*} || ${ARCH:Mpowerpc64*} diff --git a/java/openjdk8/Makefile b/java/openjdk8/Makefile index e259fa17033b..25d66b274fae 100644 --- a/java/openjdk8/Makefile +++ b/java/openjdk8/Makefile @@ -203,14 +203,6 @@ LIB_DEPENDS+= libffi.so:devel/libffi .if ${COMPILER_TYPE} == clang MAKE_ENV+= COMPILER_WARNINGS_FATAL=false USE_CLANG=true CONFIGURE_ENV+= LIBCXX="-lc++" -.if ${COMPILER_VERSION} >= 130 -# PR258954: OpenJDK <= 13 crash due to undefined behavior with clang >= 13 -# See also https://bugs.openjdk.java.net/browse/JDK-8229258 -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 .endif # GCC is broken with PCH: https://lists.freebsd.org/pipermail/svn-src-all/2015-March/101722.html