git: 40478d7acd2a - main - biology/bifrost: Unbreak build on 15-CURRENT

From: Jason W. Bacon <jwb_at_FreeBSD.org>
Date: Thu, 15 May 2025 11:38:52 UTC
The branch main has been updated by jwb:

URL: https://cgit.FreeBSD.org/ports/commit/?id=40478d7acd2afd5a09d9fec5edc9821e548f18e2

commit 40478d7acd2afd5a09d9fec5edc9821e548f18e2
Author:     Jason W. Bacon <jwb@FreeBSD.org>
AuthorDate: 2025-05-15 11:37:10 +0000
Commit:     Jason W. Bacon <jwb@FreeBSD.org>
CommitDate: 2025-05-15 11:37:10 +0000

    biology/bifrost: Unbreak build on 15-CURRENT
    
    Unable to identify the cause, use GCC as a workaround for now
    No change on other FreeBSD versions
---
 biology/bifrost/Makefile                   | 13 ++++++++++++-
 biology/bifrost/files/patch-CMakeLists.txt |  4 ++--
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/biology/bifrost/Makefile b/biology/bifrost/Makefile
index 8820ddfa0631..082d27df32e6 100644
--- a/biology/bifrost/Makefile
+++ b/biology/bifrost/Makefile
@@ -18,6 +18,17 @@ USE_GITHUB=	yes
 
 CMAKE_ARGS=	-DCOMPILATION_ARCH=${CPUTYPE:UOFF}
 
+CXXFLAGS+=	-Wno-unqualified-std-cast-call
+
 GH_ACCOUNT=	pmelsted
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+# Build fails with clang19, but succeeds with gcc13
+# Have not figured out where this sz_link member is even supposed to come from
+# DataStorage.tcc:81:69: error: no member named 'sz_link' in 'DataStorage<Unitig_data_t>'
+.if ${OSVERSION} > 1500000
+USE_GCC=	yes
+.endif
+
+.include <bsd.port.post.mk>
diff --git a/biology/bifrost/files/patch-CMakeLists.txt b/biology/bifrost/files/patch-CMakeLists.txt
index 27893b9ec44d..4d49c5a270cc 100644
--- a/biology/bifrost/files/patch-CMakeLists.txt
+++ b/biology/bifrost/files/patch-CMakeLists.txt
@@ -1,6 +1,6 @@
---- CMakeLists.txt.orig	2023-08-12 14:26:29 UTC
+--- CMakeLists.txt.orig	2024-03-15 15:20:17 UTC
 +++ CMakeLists.txt
-@@ -46,7 +46,6 @@ else(CMAKE_BUILD_TYPE MATCHES Debug)
+@@ -56,7 +56,6 @@ else(CMAKE_BUILD_TYPE MATCHES Debug)
  		set(CMAKE_EXE_LINKER_FLAGS "-pg")
  	else(CMAKE_BUILD_TYPE MATCHES Profile)
  		message("Build type: Release")