From nobody Tue Aug 30 23:02:16 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 4MHN9j240Yz4bWSp; Tue, 30 Aug 2022 23:02:17 +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 4MHN9j1gg0z3l0l; Tue, 30 Aug 2022 23:02:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1661900537; 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=LbHQJetmmukUk0VDDVP4BTc/wjrn3svXeCHMo5WVwrg=; b=uCcDUlniGK+B9klXMlLhWxuAN6mIErNqDnUyRuhHNzK1PRgdc004598JPIJJIn6ZXDsXde ngDLwkwf2N3RbtG2RsKJFikmQKbaxGi4WO/690ml0u41+i1cRcuTvfYL+cXREGkeV3m+Yy 9PUe5302TPHPGp17b6g1htqb5G401DjsMAoFxDut2SbxJ5GRI19ymASENv5vixBUpTiCzk XFk947c0NdC2iJhrnLdqK7YU0z7WxZNOxVOGhFWijCtNjmbbLd+/uBxA7PiuX3dJig2mgi YmvAMpeh2haUolc/LXwLbqeZFcm8vRvJSYbdBzwfw+klxYlTTzV7b8ndbA5UkQ== 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 4MHN9j0WsPzwND; Tue, 30 Aug 2022 23:02:17 +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 27UN2GrN047580; Tue, 30 Aug 2022 23:02:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 27UN2Gne047579; Tue, 30 Aug 2022 23:02:16 GMT (envelope-from git) Date: Tue, 30 Aug 2022 23:02:16 GMT Message-Id: <202208302302.27UN2Gne047579@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: e3f56d3c663d - main - java/openjdk11: use LLVM 12 to build if the system compiler is LLVM 13 or newer 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: e3f56d3c663dd21857843e187524d601b7dca29b Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1661900537; 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=LbHQJetmmukUk0VDDVP4BTc/wjrn3svXeCHMo5WVwrg=; b=J2X+xnh26W6BN2r+6r7bcbM0rnfmvJTIicP6JCiFrUAx4wHW4preEPzGzHN9OsHl7Nsr/u fZXWRZT336iTuz0cKY5gLnEzDWPVQbjsY7UIKEHm+hP1U46pbQcsQec+3nAEmwmPieS7Vc x1vP5W6rzb8XzSXfWX6XpEGFtDq+3rLXMqPoYET8sFBC7FNYF/Z1IMHhWU71qH/8brwiIU 9Lt79kX1ZiamvoJQYAw5N0qZj3XtEYuQ/pRzF7sdtwAWGU4uTnbUrDijn1xNlF2/hNq1O5 wpwNczMtOyBpbdanv4ch8ty21JzUnIr9IWFocOz2Fg1yeAxp2NhJHBsEBF3axQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1661900537; a=rsa-sha256; cv=none; b=QjG+M5cyPmF6Nx20q4WuV0RSZz1UiOkky8ETsfQBM1pM3xFtKJtSZDVuxLPtplc6e1hQUx +/8Ft/G/t0FAbkvVMCBKt1W2zJ2KdV+TULLWh7/tk8HI9q+HUG/FUea6HW/oajoP5RqqBv qnXq81Fz9s8iMJEbTQ3cY0AhofrY3A+nE3bD4kPVHMMwPjHVwtV2wguH+mE8j130zxX6O+ GknyIVqNczZwYpa0LQ+XMN5yLo1z0y7EIJFyB+vCXcmrGIpdgWaW9Xm20hEeRMaVnbnl4v kgyAi7ZXQXr9yy96hyfMZc3MajM4c75NOXfp01AiDoyXVMMUjP75QjJaA/sXNg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by pkubaj: URL: https://cgit.FreeBSD.org/ports/commit/?id=e3f56d3c663dd21857843e187524d601b7dca29b commit e3f56d3c663dd21857843e187524d601b7dca29b Author: Piotr Kubaj AuthorDate: 2022-08-30 23:00:18 +0000 Commit: Piotr Kubaj CommitDate: 2022-08-30 23:02:10 +0000 java/openjdk11: use LLVM 12 to build if the system compiler is LLVM 13 or newer PR: 260319 Reported by: jonc@chen.org.nz Approved by: java (maintainer timeout) --- java/openjdk11/Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/java/openjdk11/Makefile b/java/openjdk11/Makefile index 4ca7c9933447..d16225d9eeb2 100644 --- a/java/openjdk11/Makefile +++ b/java/openjdk11/Makefile @@ -1,6 +1,7 @@ PORTNAME= openjdk DISTVERSIONPREFIX= jdk- DISTVERSION= ${JDK_MAJOR_VERSION}.${JDK_MINOR_VERSION}.${JDK_PATCH_VERSION}+${JDK_BUILD_NUMBER}-${BSD_JDK_VERSION} +PORTREVISION= 1 CATEGORIES= java devel PKGNAMESUFFIX?= ${JDK_MAJOR_VERSION} @@ -141,7 +142,7 @@ 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 && ${ARCH:Mpowerpc64*} +.if ${COMPILER_VERSION} >= 130 LLVM_VER= 12 BUILD_DEPENDS+= clang${LLVM_VER}:devel/llvm${LLVM_VER} CC= ${LOCALBASE}/bin/clang${LLVM_VER}