git: bba37490f132 - main - biology/bifrost: Remove USE_GCC, fix build with clang19
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Tue, 27 May 2025 14:08:28 UTC
The branch main has been updated by jwb:
URL: https://cgit.FreeBSD.org/ports/commit/?id=bba37490f1326822c46451866430c78075a48028
commit bba37490f1326822c46451866430c78075a48028
Author: Jason W. Bacon <jwb@FreeBSD.org>
AuthorDate: 2025-05-27 14:06:00 +0000
Commit: Jason W. Bacon <jwb@FreeBSD.org>
CommitDate: 2025-05-27 14:08:27 +0000
biology/bifrost: Remove USE_GCC, fix build with clang19
Fix apparent typo in seldom-used code (hayzam@alchemilla.io)
Reported by: gerald
Tested by: jwb
---
biology/bifrost/Makefile | 12 ++----------
biology/bifrost/distinfo | 2 +-
biology/bifrost/files/patch-src_DataStorage.tcc | 14 ++++++++++++++
3 files changed, 17 insertions(+), 11 deletions(-)
diff --git a/biology/bifrost/Makefile b/biology/bifrost/Makefile
index 082d27df32e6..e1873b430549 100644
--- a/biology/bifrost/Makefile
+++ b/biology/bifrost/Makefile
@@ -1,6 +1,7 @@
PORTNAME= bifrost
DISTVERSIONPREFIX= v
DISTVERSION= 1.3.5
+PORTREVISION= 1
CATEGORIES= biology
MAINTAINER= jwb@FreeBSD.org
@@ -22,13 +23,4 @@ CXXFLAGS+= -Wno-unqualified-std-cast-call
GH_ACCOUNT= pmelsted
-.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>
+.include <bsd.port.mk>
diff --git a/biology/bifrost/distinfo b/biology/bifrost/distinfo
index 49f7e2d919bb..43195678b9c9 100644
--- a/biology/bifrost/distinfo
+++ b/biology/bifrost/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1710590640
+TIMESTAMP = 1748282354
SHA256 (pmelsted-bifrost-v1.3.5_GH0.tar.gz) = e1b2491328b0cc1a32e433a8a9780f05547fa4b8d674b58abdda9ac8809f5341
SIZE (pmelsted-bifrost-v1.3.5_GH0.tar.gz) = 356701
diff --git a/biology/bifrost/files/patch-src_DataStorage.tcc b/biology/bifrost/files/patch-src_DataStorage.tcc
new file mode 100644
index 000000000000..22196bb8e11c
--- /dev/null
+++ b/biology/bifrost/files/patch-src_DataStorage.tcc
@@ -0,0 +1,14 @@
+--- src/DataStorage.tcc.orig 2024-03-15 15:20:17 UTC
++++ src/DataStorage.tcc
+@@ -78,7 +78,10 @@ DataStorage<U>::DataStorage(const DataStorage& o) : co
+
+ unitig_cs_link = new atomic<uint64_t>[sz_link];
+
+- for (size_t i = 0; i != sz_link; ++i) unitig_cs_link[i] = o.sz_link[i].load();
++ // Hayzam Sherif: o.sz_link -> o.unitig_cs_link
++ // Independently proposed by Lucas van Dijk:
++ // https://github.com/pmelsted/bifrost/pull/18/files
++ for (size_t i = 0; i != sz_link; ++i) unitig_cs_link[i] = o.unitig_cs_link[i].load();
+ }
+
+ if ((o.data != nullptr) && (o.sz_cs != 0)){