From nobody Wed Jan 22 18:42:34 2025 X-Original-To: dev-commits-ports-branches@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 4YdXxk4CLyz5ksS8; Wed, 22 Jan 2025 18:42:34 +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 4YdXxk36y2z43SH; Wed, 22 Jan 2025 18:42:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1737571354; 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=1lDcNbhRZR3pzuBJNL0jlGOJNusKcgWP/6kKikrmM2c=; b=G62YnBhMux+ILI2e/lP49XqZrgEVgUHWLyrZJ3RAeGdp1vAZDrtGxyX5MsUssfhxrtnAZz GjLttznvSlHARAa0hcR2kXjwqGan1MfkjcVk1f8fJva+S0dPh5A3yMaXp5tAPV3FQ6ZYlO fyGRX14S1YBdHlzl1WM12WCOFdj7EADGZdNGoYiH8QyUPm35RZ6mqegQpyJYw/7dr1ian2 MAXMjZ/gp5Lrs0uCUhP5NGkIPeQydT6L5n24DDCj5wlnpAtQ8vGxIRYvXgEmPoWfxnzFqO MnfwHprIfggf8fErgM4ICpZ+Qc9UgseYGYW9t923ZI1cLgjoOzAiEnBs/PA4oQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1737571354; 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=1lDcNbhRZR3pzuBJNL0jlGOJNusKcgWP/6kKikrmM2c=; b=f+F7T/szLgOgxdf3z48RC0spOh5aIN3VtqhPQfuaKcOMTB3ymkNegyKj68/MQmWmeGsNIP ZWNS4vrE2d3HTbTEOn2ioR+Y9apsv/ZE6rpHPq+WzcBDmVGJtB33LMDVeBPqIOyDQZUfCd gDCvVqdZ1tdplBwKRfoc4+JYObfexI7RE36f81htB9f2XdyDejh+P5ZKuQEK2yKC/Zj0e2 sLyayp7NQEy6r+6h0KAW72US+WR6U95JOwijyD0r7OKnlwAyATFXxBHgduUXSb3PET8Bwn rO0ryA+QPH+o2jy4B4TMtz52iEJ54dz1lj5bnXR2giV7KjcknDn5tDfuZ9bWug== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1737571354; a=rsa-sha256; cv=none; b=mMc6ecxpiudCwSp7WsNcOkQCTZe4JjbPPQffrC7ipKMEOVeiNPcmAO7c2U9BxGxcVwxRqs 66DEmQoR84Gmooxv3LMf9EBlDaVJR5hfj5Cp28M9cyWBKjGkgrMYcWWnuZYHGjLhaIyeU8 jm65kn/cn6j9qobQD0IcOmm7PsW5cvPS11/o0PGBb5wwEGbmVwfU0UIIsSThgkyW/fUDVQ 3fx3i7SUR+xSrCaMGapwFBV64MA4l20fvXrx71aCtippwjVova02J3bTQDgT1O0FfWBx4y 3ELLqEbzsGmq+JT6iR0PZtxsGZJVK+HzAL3AP0mbLePt4Qo/VEevM7mkZbX16Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4YdXxk2Z8Bz14ST; Wed, 22 Jan 2025 18:42:34 +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 50MIgY26069612; Wed, 22 Jan 2025 18:42:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 50MIgY1q069609; Wed, 22 Jan 2025 18:42:34 GMT (envelope-from git) Date: Wed, 22 Jan 2025 18:42:34 GMT Message-Id: <202501221842.50MIgY1q069609@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Dimitry Andric Subject: git: 52a1f9bc0f19 - 2025Q1 - math/heyoka: fix build against devel/llvm18 and higher List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-branches@freebsd.org Sender: owner-dev-commits-ports-branches@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/2025Q1 X-Git-Reftype: branch X-Git-Commit: 52a1f9bc0f19f2a8eb8741d09a138981dbc0a92f Auto-Submitted: auto-generated The branch 2025Q1 has been updated by dim: URL: https://cgit.FreeBSD.org/ports/commit/?id=52a1f9bc0f19f2a8eb8741d09a138981dbc0a92f commit 52a1f9bc0f19f2a8eb8741d09a138981dbc0a92f Author: Dimitry Andric AuthorDate: 2025-01-22 17:10:37 +0000 Commit: Dimitry Andric CommitDate: 2025-01-22 18:42:12 +0000 math/heyoka: fix build against devel/llvm18 and higher When building with DEFAULT_VERSIONS+=llvm=18 or higher, math/heyoke fails to configure, with the following error: CMake Error at CMakeLists.txt:159 (find_package): Could not find a configuration file for package "LLVM" that is compatible with requested version "18". The following configuration files were considered but not accepted: /usr/local/llvm15/lib/cmake/llvm/LLVMConfig.cmake, version: 15.0.7 /usr/local/llvm17/lib/cmake/llvm/LLVMConfig.cmake, version: 17.0.6 /usr/local/llvm16/lib/cmake/llvm/LLVMConfig.cmake, version: 16.0.6 /usr/local/llvm18/lib/cmake/llvm/LLVMConfig.cmake, version: 18.1.8 This is because llvm18 and higher use 1 for their minor version numbers, while llvm17 and earlier use 0. CMake's find_package() needs the minor version number set correctly, otherwise it will not be able to find the LLVM package. PR: 284266 Approved by: yuri (maintainer) MFH: 2025Q1 (cherry picked from commit 12bf8b3dabdeb7a9b9c9a2665938b3f518ebb3f8) --- math/heyoka/Makefile | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/math/heyoka/Makefile b/math/heyoka/Makefile index b18004faa20d..2193737b957d 100644 --- a/math/heyoka/Makefile +++ b/math/heyoka/Makefile @@ -32,11 +32,23 @@ USE_GITHUB= yes GH_ACCOUNT= bluescarni CMAKE_ON= HEYOKA_WITH_MPPP HEYOKA_WITH_SLEEF -CMAKE_ARGS= -DFREEBSD_LLVM_VERSION=${LLVM_VERSION} CMAKE_TESTING_ON= HEYOKA_BUILD_TESTS # 1 test fails, see https://github.com/bluescarni/heyoka/issues/338 # 2 tests fail: # * https://github.com/bluescarni/heyoka/issues/429 # * https://github.com/bluescarni/heyoka/issues/430 -.include +.include + +# LLVM 18 and later use 1 for their minor version, while 17 and earlier use 0. +# CMake's find_package() needs the minor version set correctly, otherwise it +# will not be able to find the LLVM package. +.if ${LLVM_VERSION} >= 18 +LLVM_VERSION_MINOR= 1 +.else +LLVM_VERSION_MINOR= 0 +.endif + +CMAKE_ARGS+= -DFREEBSD_LLVM_VERSION=${LLVM_VERSION}.${LLVM_VERSION_MINOR} + +.include