Skip to content

Commit b15df32

Browse files
Jason W. BaconJason W. Bacon
authored andcommitted
biology/kallisto: Remove USE_GCC, fix build with clang19
Fix apparent typo in seldom-used code (hayzam@alchemilla.io) Reported by: gerald Tested by: jwb
1 parent 5f85f6b commit b15df32

File tree

3 files changed

+17
-11
lines changed

3 files changed

+17
-11
lines changed

‎biology/kallisto/Makefile‎

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
PORTNAME= kallisto
22
DISTVERSIONPREFIX= v
33
DISTVERSION= 0.51.1
4+
PORTREVISION= 1
45
PORTEPOCH= 1
56
CATEGORIES= biology
67

@@ -42,17 +43,8 @@ LDFLAGS+= -lhts -lz
4243

4344
OPTIONS_DEFINE= EXAMPLES
4445

45-
.include <bsd.port.pre.mk>
46-
47-
# Build fails with clang19, but succeeds with gcc13
48-
# Have not figured out where this sz_link member is even supposed to come from
49-
# DataStorage.tcc:81:69: error: no member named 'sz_link' in 'DataStorage<Unitig_data_t>'
50-
.if ${OSVERSION} > 1500000
51-
USE_GCC= yes
52-
.endif
53-
5446
post-install-EXAMPLES-on:
5547
${INSTALL_SCRIPT} ${WRKDIR}/kallisto-test ${STAGEDIR}${PREFIX}/bin
5648
cd ${WRKSRC}/test && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR}
5749

58-
.include <bsd.port.post.mk>
50+
.include <bsd.port.mk>

‎biology/kallisto/distinfo‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
TIMESTAMP = 1726658334
1+
TIMESTAMP = 1748283025
22
SHA256 (pachterlab-kallisto-v0.51.1_GH0.tar.gz) = a8bcc23bca6ac758f15e30bb77e9e169e628beff2da3be2e34a53e1d42253516
33
SIZE (pachterlab-kallisto-v0.51.1_GH0.tar.gz) = 5954250
Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
--- ext/bifrost/src/DataStorage.tcc.orig 2024-09-17 05:40:08 UTC
2+
+++ ext/bifrost/src/DataStorage.tcc
3+
@@ -78,7 +78,10 @@ DataStorage<U>::DataStorage(const DataStorage& o) : co
4+
5+
unitig_cs_link = new atomic<uint64_t>[sz_link];
6+
7+
- for (size_t i = 0; i != sz_link; ++i) unitig_cs_link[i] = o.sz_link[i].load();
8+
+ // Hayzam Sherif: o.sz_link -> o.unitig_cs_link
9+
+ // Independently proposed by Lucas van Dijk:
10+
+ // https://github.com/pmelsted/bifrost/pull/18/files
11+
+ for (size_t i = 0; i != sz_link; ++i) unitig_cs_link[i] = o.unitig_cs_link[i].load();
12+
}
13+
14+
if ((o.data != nullptr) && (o.sz_cs != 0)){

0 commit comments

Comments
 (0)