Sat Nov 4 14:35:07 2023 UTC ()
biology/kallisto: Update to 0.50.1
Update kallisto index version to 13
A few other new features
Changes: https://github.com/pachterlab/kallisto/releases
(bacon)
diff -r1.5 -r1.6 pkgsrc/biology/kallisto/Makefile
diff -r1.5 -r1.6 pkgsrc/biology/kallisto/distinfo
diff -r1.3 -r1.4 pkgsrc/biology/kallisto/PLIST
diff -r1.3 -r1.4 pkgsrc/biology/kallisto/patches/patch-CMakeLists.txt
diff -r1.3 -r1.4 pkgsrc/biology/kallisto/patches/patch-src_CMakeLists.txt
diff -r0 -r1.1 pkgsrc/biology/kallisto/patches/patch-ext_bifrost_CMakeLists.txt
diff -r0 -r1.1 pkgsrc/biology/kallisto/patches/patch-ext_bifrost_src_BitContainer.cpp
diff -r0 -r1.1 pkgsrc/biology/kallisto/patches/patch-ext_bifrost_src_ColorSet.cpp
diff -r0 -r1.1 pkgsrc/biology/kallisto/patches/patch-ext_bifrost_src_libpopcnt.h
diff -r0 -r1.1 pkgsrc/biology/kallisto/patches/patch-ext_bifrost_src_strict__fstream.hpp
diff -r0 -r1.1 pkgsrc/biology/kallisto/patches/patch-src_Bootstrap.h
diff -r0 -r1.1 pkgsrc/biology/kallisto/patches/patch-src_main.cpp
diff -r1.1 -r1.2 pkgsrc/biology/kallisto/patches/patch-src_kseq.h
--- pkgsrc/biology/kallisto/Makefile 2022/12/28 15:27:17 1.5
+++ pkgsrc/biology/kallisto/Makefile 2023/11/04 14:35:07 1.6
| @@ -1,35 +1,37 @@ | | | @@ -1,35 +1,37 @@ |
1 | # $NetBSD: Makefile,v 1.5 2022/12/28 15:27:17 bacon Exp $ | | 1 | # $NetBSD: Makefile,v 1.6 2023/11/04 14:35:07 bacon Exp $ |
2 | | | 2 | |
3 | DISTNAME= kallisto-0.48.0 | | 3 | DISTNAME= kallisto-0.50.1 |
4 | CATEGORIES= biology | | 4 | CATEGORIES= biology |
5 | MASTER_SITES= ${MASTER_SITE_GITHUB:=pachterlab/} | | 5 | MASTER_SITES= ${MASTER_SITE_GITHUB:=pachterlab/} |
6 | GITHUB_TAG= v${PKGVERSION_NOREV} | | 6 | GITHUB_TAG= v${PKGVERSION_NOREV} |
7 | | | 7 | |
8 | OWNER= bacon@NetBSD.org | | 8 | OWNER= bacon@NetBSD.org |
9 | HOMEPAGE= https://pachterlab.github.io/kallisto/ | | 9 | HOMEPAGE= https://pachterlab.github.io/kallisto/ |
10 | COMMENT= Quantify abundances of transcripts from RNA-Seq data | | 10 | COMMENT= Quantify abundances of transcripts from RNA-Seq data |
11 | LICENSE= 2-clause-bsd | | 11 | LICENSE= 2-clause-bsd |
12 | | | 12 | |
13 | USE_TOOLS+= autoconf gmake pax | | 13 | USE_TOOLS+= autoconf gmake pax |
14 | USE_LANGUAGES= c c++ | | 14 | USE_LANGUAGES= c c++ |
15 | USE_CMAKE= yes | | 15 | USE_CMAKE= yes |
16 | | | 16 | |
17 | SUBST_CLASSES+= test | | 17 | SUBST_CLASSES+= test |
18 | SUBST_STAGE.test= pre-configure | | 18 | SUBST_STAGE.test= pre-configure |
19 | SUBST_FILES.test= kallisto-test | | 19 | SUBST_FILES.test= kallisto-test |
20 | SUBST_SED.test= -e 's|/usr/local/share/kallisto|${DATADIR}|g' | | 20 | SUBST_SED.test= -e 's|/usr/local/share/kallisto|${DATADIR}|g' |
21 | | | 21 | |
22 | CMAKE_ARGS+= -DUSE_HDF5:BOOL=ON | | 22 | CMAKE_ARGS+= -DUSE_HDF5:BOOL=ON -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON |
| | | 23 | # Build fails on 8-core Mac M1 |
| | | 24 | MAKE_JOBS_SAFE= no |
23 | INSTALLATION_DIRS+= ${DATADIR} | | 25 | INSTALLATION_DIRS+= ${DATADIR} |
24 | | | 26 | |
25 | DATADIR= ${PREFIX}/share/kallisto | | 27 | DATADIR= ${PREFIX}/share/kallisto |
26 | | | 28 | |
27 | post-extract: | | 29 | post-extract: |
28 | ${CP} ${FILESDIR}/kallisto-test ${WRKSRC} | | 30 | ${CP} ${FILESDIR}/kallisto-test ${WRKSRC} |
29 | ${RM} -rf ${WRKSRC}/ext/htslib | | 31 | ${RM} -rf ${WRKSRC}/ext/htslib |
30 | | | 32 | |
31 | post-install: | | 33 | post-install: |
32 | ${INSTALL_SCRIPT} ${WRKSRC}/kallisto-test ${DESTDIR}${PREFIX}/bin | | 34 | ${INSTALL_SCRIPT} ${WRKSRC}/kallisto-test ${DESTDIR}${PREFIX}/bin |
33 | cd ${WRKSRC} && pax -rw test ${DESTDIR}${DATADIR} | | 35 | cd ${WRKSRC} && pax -rw test ${DESTDIR}${DATADIR} |
34 | | | 36 | |
35 | .include "../../devel/hdf5/buildlink3.mk" | | 37 | .include "../../devel/hdf5/buildlink3.mk" |
--- pkgsrc/biology/kallisto/distinfo 2022/02/27 01:57:27 1.5
+++ pkgsrc/biology/kallisto/distinfo 2023/11/04 14:35:07 1.6
| @@ -1,8 +1,15 @@ | | | @@ -1,8 +1,15 @@ |
1 | $NetBSD: distinfo,v 1.5 2022/02/27 01:57:27 bacon Exp $ | | 1 | $NetBSD: distinfo,v 1.6 2023/11/04 14:35:07 bacon Exp $ |
2 | | | 2 | |
3 | BLAKE2s (kallisto-0.48.0.tar.gz) = c31cdd71591d4784e5b48560dd2c8ed19f8baa77317f0c05441a75f7deb39d64 | | 3 | BLAKE2s (kallisto-0.50.1.tar.gz) = 2fcdb884dd3f8c381b16648862551c1632780b5f942c4c1296b7581a48092054 |
4 | SHA512 (kallisto-0.48.0.tar.gz) = 6325660c18c98b591bfa0f293f55f13fa45b58acf86dead3b0c9cd88942c9d3dfa548cf0b8f05fb89697845b7047627b8fcdfba4237a5876463311a6f7127feb | | 4 | SHA512 (kallisto-0.50.1.tar.gz) = 767319f1b96d29c10dba9a66410764978eb8dcf36186d247821458e977a76adab7c871675e10e56d7e85ac312cd0c75c7651008f612db998699a95e0c63cb8e9 |
5 | Size (kallisto-0.48.0.tar.gz) = 2706838 bytes | | 5 | Size (kallisto-0.50.1.tar.gz) = 5947303 bytes |
6 | SHA1 (patch-CMakeLists.txt) = 9c96f53ec2e280b7f778ae04b002783559730df7 | | 6 | SHA1 (patch-CMakeLists.txt) = 2672475d3fd0f3b837cafc9faa62cdc094f6fd4b |
7 | SHA1 (patch-src_CMakeLists.txt) = dde489a9299207d189d3f94b875bb1929c958897 | | 7 | SHA1 (patch-ext_bifrost_CMakeLists.txt) = ff5cebb2f38c4fa90bd651690ef58e588396c2ac |
8 | SHA1 (patch-src_kseq.h) = c35bca57fb85367e8646a4b771449da7dbfbb439 | | 8 | SHA1 (patch-ext_bifrost_src_BitContainer.cpp) = 88a3b8b0d53bc4e96ec02f38f3f6e6bbd1e80dd7 |
| | | 9 | SHA1 (patch-ext_bifrost_src_ColorSet.cpp) = 55bb84a31ca97d21e6eefd44e2d3d6391f1e9304 |
| | | 10 | SHA1 (patch-ext_bifrost_src_libpopcnt.h) = 3f31a47f40f341b1f6f72552b06990a81946e425 |
| | | 11 | SHA1 (patch-ext_bifrost_src_strict__fstream.hpp) = a4eab7784c3502fcc79ba0c87d31ac7275e5043c |
| | | 12 | SHA1 (patch-src_Bootstrap.h) = 29a07a6fbaedf4387b70afb3b2caeb1a9b17f8e8 |
| | | 13 | SHA1 (patch-src_CMakeLists.txt) = 33d0e3cf985d2e400315788d3ee1c74987a6ebee |
| | | 14 | SHA1 (patch-src_kseq.h) = 034e65bdcf5d3851b4e3d65afd06843bdff0d8a9 |
| | | 15 | SHA1 (patch-src_main.cpp) = 65c9af813f558cebd6086a95b56a499aab02e566 |
--- pkgsrc/biology/kallisto/PLIST 2022/02/27 01:57:27 1.3
+++ pkgsrc/biology/kallisto/PLIST 2023/11/04 14:35:07 1.4
| @@ -1,12 +1,12 @@ | | | @@ -1,12 +1,12 @@ |
1 | @comment $NetBSD: PLIST,v 1.3 2022/02/27 01:57:27 bacon Exp $ | | 1 | @comment $NetBSD: PLIST,v 1.4 2023/11/04 14:35:07 bacon Exp $ |
2 | bin/kallisto | | 2 | bin/kallisto |
3 | bin/kallisto-test | | 3 | bin/kallisto-test |
4 | share/kallisto/test/README.md | | 4 | share/kallisto/test/README.md |
5 | share/kallisto/test/Snakefile | | 5 | share/kallisto/test/Snakefile |
6 | share/kallisto/test/chrom.txt | | 6 | share/kallisto/test/chrom.txt |
7 | share/kallisto/test/reads_1.fastq.gz | | 7 | share/kallisto/test/reads_1.fastq.gz |
8 | share/kallisto/test/reads_2.fastq.gz | | 8 | share/kallisto/test/reads_2.fastq.gz |
9 | share/kallisto/test/sc_reads_1.fastq.gz | | 9 | share/kallisto/test/sc_reads_1.fastq.gz |
10 | share/kallisto/test/sc_reads_2.fastq.gz | | 10 | share/kallisto/test/sc_reads_2.fastq.gz |
11 | share/kallisto/test/transcripts.fasta.gz | | 11 | share/kallisto/test/transcripts.fasta.gz |
12 | share/kallisto/test/transcripts.gtf.gz | | 12 | share/kallisto/test/transcripts.gtf.gz |
--- pkgsrc/biology/kallisto/patches/patch-CMakeLists.txt 2022/02/27 01:57:27 1.3
+++ pkgsrc/biology/kallisto/patches/patch-CMakeLists.txt 2023/11/04 14:35:07 1.4
| @@ -1,22 +1,50 @@ | | | @@ -1,22 +1,50 @@ |
1 | $NetBSD: patch-CMakeLists.txt,v 1.3 2022/02/27 01:57:27 bacon Exp $ | | 1 | $NetBSD: patch-CMakeLists.txt,v 1.4 2023/11/04 14:35:07 bacon Exp $ |
2 | | | 2 | |
3 | # Unbundle htslib | | 3 | # Unbundle htslib and zlib, use gmake |
4 | | | 4 | |
5 | --- CMakeLists.txt.orig 2022-02-26 16:36:13.527572702 +0000 | | 5 | --- CMakeLists.txt.orig 2023-06-27 10:45:00.000000000 +0000 |
6 | +++ CMakeLists.txt | | 6 | +++ CMakeLists.txt |
7 | @@ -43,15 +43,6 @@ ENDIF(LINK MATCHES static) | | 7 | @@ -56,42 +56,16 @@ ENDIF(LINK MATCHES static) |
8 | | | 8 | |
9 | | | 9 | |
10 | include(ExternalProject) | | 10 | include(ExternalProject) |
| | | 11 | -if (USE_BAM) |
11 | -ExternalProject_Add(htslib | | 12 | -ExternalProject_Add(htslib |
12 | - PREFIX ${PROJECT_SOURCE_DIR}/ext/htslib | | 13 | - PREFIX ${PROJECT_SOURCE_DIR}/ext/htslib |
13 | - SOURCE_DIR ${PROJECT_SOURCE_DIR}/ext/htslib | | 14 | - SOURCE_DIR ${PROJECT_SOURCE_DIR}/ext/htslib |
14 | - BUILD_IN_SOURCE 1 | | 15 | - BUILD_IN_SOURCE 1 |
15 | - CONFIGURE_COMMAND autoheader && autoconf && ${PROJECT_SOURCE_DIR}/ext/htslib/configure | | 16 | - CONFIGURE_COMMAND autoreconf -i && autoheader && autoconf && ${PROJECT_SOURCE_DIR}/ext/htslib/configure |
16 | - --prefix=${PREFIX} --disable-bz2 --disable-lzma --disable-libcurl | | 17 | - --prefix=${PREFIX} --disable-bz2 --disable-lzma --disable-libcurl |
17 | - BUILD_COMMAND make lib-static | | 18 | - BUILD_COMMAND make lib-static |
18 | - INSTALL_COMMAND "" | | 19 | - INSTALL_COMMAND "" |
19 | -) | | 20 | -) |
| | | 21 | -endif(USE_BAM) |
20 | | | 22 | |
21 | include_directories(${htslib_PREFIX}/src/htslib) | | 23 | ExternalProject_Add(bifrost |
| | | 24 | PREFIX ${PROJECT_SOURCE_DIR}/ext/bifrost |
| | | 25 | SOURCE_DIR ${PROJECT_SOURCE_DIR}/ext/bifrost |
| | | 26 | BUILD_IN_SOURCE 1 |
| | | 27 | CONFIGURE_COMMAND mkdir -p build && cd build && cmake .. -DCMAKE_INSTALL_PREFIX=${PREFIX} -DCMAKE_CXX_FLAGS=${PROJECT_BIFROST_CMAKE_CXX_FLAGS} |
| | | 28 | - BUILD_COMMAND cd build && make |
| | | 29 | + BUILD_COMMAND cd build && gmake |
| | | 30 | INSTALL_COMMAND "" |
| | | 31 | ) |
22 | | | 32 | |
| | | 33 | -if (ZLIBNG) |
| | | 34 | - message("zlib-ng enabled.") |
| | | 35 | - ExternalProject_Add(zlib-ng |
| | | 36 | - PREFIX ${PROJECT_SOURCE_DIR}/ext/zlib-ng |
| | | 37 | - SOURCE_DIR ${PROJECT_SOURCE_DIR}/ext/zlib-ng |
| | | 38 | - BUILD_IN_SOURCE 1 |
| | | 39 | - CONFIGURE_COMMAND mkdir -p zlib-ng && cd zlib-ng && cmake .. -DZLIB_COMPAT=ON -DZLIB_ENABLE_TESTS=OFF -DCMAKE_INSTALL_PREFIX=${PREFIX} |
| | | 40 | - BUILD_COMMAND cd zlib-ng && make |
| | | 41 | - INSTALL_COMMAND "" |
| | | 42 | - ) |
| | | 43 | -endif(ZLIBNG) |
| | | 44 | - |
| | | 45 | -if (USE_BAM) |
| | | 46 | -include_directories(${htslib_PREFIX}/src/htslib) |
| | | 47 | -endif(USE_BAM) |
| | | 48 | include_directories(${EXT_PROJECTS_DIR}/bifrost/build/src) |
| | | 49 | |
| | | 50 | ExternalProject_Get_Property(bifrost install_dir) |
--- pkgsrc/biology/kallisto/patches/patch-src_CMakeLists.txt 2022/02/27 01:57:27 1.3
+++ pkgsrc/biology/kallisto/patches/patch-src_CMakeLists.txt 2023/11/04 14:35:07 1.4
| @@ -1,30 +1,26 @@ | | | @@ -1,30 +1,26 @@ |
1 | $NetBSD: patch-src_CMakeLists.txt,v 1.3 2022/02/27 01:57:27 bacon Exp $ | | 1 | $NetBSD: patch-src_CMakeLists.txt,v 1.4 2023/11/04 14:35:07 bacon Exp $ |
2 | | | 2 | |
3 | # Unbundle htslib | | 3 | # Unbundle htslib |
4 | | | 4 | |
5 | --- src/CMakeLists.txt.orig 2022-02-26 16:35:26.912550601 +0000 | | 5 | --- src/CMakeLists.txt.orig 2023-07-06 14:07:38 UTC |
6 | +++ src/CMakeLists.txt | | 6 | +++ src/CMakeLists.txt |
7 | @@ -3,15 +3,13 @@ file(GLOB headers *.h *.hpp) | | 7 | @@ -3,10 +3,6 @@ file(GLOB headers *.h *.hpp) |
8 | | | 8 | |
9 | list(REMOVE_ITEM sources main.cpp) | | 9 | list(REMOVE_ITEM sources main.cpp) |
10 | | | 10 | |
| | | 11 | -if (USE_BAM) |
11 | -include_directories(../ext/htslib) | | 12 | -include_directories(../ext/htslib) |
| | | 13 | -endif(USE_BAM) |
12 | - | | 14 | - |
13 | add_library(kallisto_core ${sources} ${headers}) | | 15 | add_compile_options(-Wno-subobject-linkage) # Suppress bifrost warning |
14 | target_include_directories(kallisto_core PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}) | | | |
15 | | | | |
16 | add_executable(kallisto main.cpp) | | | |
17 | | | 16 | |
| | | 17 | add_library(kallisto_core ${sources} ${headers}) |
| | | 18 | @@ -17,7 +13,7 @@ add_executable(kallisto main.cpp) |
18 | find_package( Threads REQUIRED ) | | 19 | find_package( Threads REQUIRED ) |
19 | -target_link_libraries(kallisto kallisto_core pthread ${CMAKE_CURRENT_SOURCE_DIR}/../ext/htslib/libhts.a) | | 20 | ExternalProject_Get_Property(bifrost install_dir) |
20 | +target_link_libraries(kallisto kallisto_core pthread hts) | | 21 | if (USE_BAM) |
21 | | | 22 | -target_link_libraries(kallisto kallisto_core pthread ${CMAKE_CURRENT_SOURCE_DIR}/../ext/htslib/libhts.a ${install_dir}/build/src/libbifrost.a) |
22 | if(LINK MATCHES static) | | 23 | +target_link_libraries(kallisto kallisto_core pthread hts ${install_dir}/build/src/libbifrost.a) |
23 | set(BUILD_SHARED_LIBS OFF) | | 24 | else() |
24 | @@ -62,4 +60,4 @@ else() | | 25 | target_link_libraries(kallisto kallisto_core pthread ${install_dir}/build/src/libbifrost.a) |
25 | endif(LINK MATCHES static) | | 26 | endif(USE_BAM) |
26 | | | | |
27 | | | | |
28 | -install(TARGETS kallisto DESTINATION "${CMAKE_INSTALL_BINDIR}") | | | |
29 | \ No newline at end of file | | | |
30 | +install(TARGETS kallisto DESTINATION "${CMAKE_INSTALL_BINDIR}") | | | |
$NetBSD: patch-ext_bifrost_CMakeLists.txt,v 1.1 2023/11/04 14:35:07 bacon Exp $
# Portability
--- ext/bifrost/CMakeLists.txt.orig 2023-06-27 10:45:00.000000000 +0000
+++ ext/bifrost/CMakeLists.txt
@@ -7,18 +7,12 @@ find_package(Threads REQUIRED)
# To enable a larger default k-mer size, replace MAX_KMER_SIZE with a larger multiple of 32: actual maximum k-mer size will be MAX_KMER_SIZE-1.
SET(MAX_KMER_SIZE "32" CACHE STRING "MAX_KMER_SIZE")
SET(MAX_GMER_SIZE "${MAX_KMER_SIZE}" CACHE STRING "MAX_GMER_SIZE")
-# Enable architecture optimizations
-SET(COMPILATION_ARCH "native" CACHE STRING "COMPILATION_ARCH")
-# Enable AVX2 instructions
-SET(ENABLE_AVX2 "ON" CACHE STRING "ENABLE_AVX2")
+SET(CMAKE_VERBOSE_MAKEFILE "ON")
# Set some default compile flags
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c11")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
-set_property(SOURCE BlockedBloomFilter.cpp APPEND_STRING PROPERTY COMPILE_FLAGS " -funroll-loops")
-
-
#check if we are on arm64 and apple, if so, disable AVX2
if(APPLE AND CMAKE_SYSTEM_PROCESSOR MATCHES "arm")
message("Disabling AVX2 instructions on arm64")
@@ -30,8 +24,6 @@ if(COMPILATION_ARCH MATCHES "OFF")
message("Disabling native architecture compilation (including AVX2)")
else(COMPILATION_ARCH MATCHES "OFF")
message("Compilation architecture: ${COMPILATION_ARCH}")
- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -march=${COMPILATION_ARCH}")
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=${COMPILATION_ARCH}")
endif(COMPILATION_ARCH MATCHES "OFF")
if(ENABLE_AVX2 MATCHES "OFF")
@@ -56,7 +48,7 @@ else(CMAKE_BUILD_TYPE MATCHES Debug)
set(CMAKE_EXE_LINKER_FLAGS "-pg")
else(CMAKE_BUILD_TYPE MATCHES Profile)
message("Build type: Release")
- add_compile_options(-O3)
+ add_compile_options(-O2)
endif(CMAKE_BUILD_TYPE MATCHES Profile)
endif(CMAKE_BUILD_TYPE MATCHES Debug)
$NetBSD: patch-ext_bifrost_src_BitContainer.cpp,v 1.1 2023/11/04 14:35:07 bacon Exp $
# vfscanf() not found on NetBSD 9
--- ext/bifrost/src/BitContainer.cpp.orig 2023-11-01 12:46:19.000000000 +0000
+++ ext/bifrost/src/BitContainer.cpp
@@ -1,3 +1,4 @@
+#include <cstdio>
#include "BitContainer.hpp"
BitContainer::BitContainer() : setBits(localBitVector) {}
$NetBSD: patch-ext_bifrost_src_ColorSet.cpp,v 1.1 2023/11/04 14:35:07 bacon Exp $
# vfscanf() not found on NetBSD 9
--- ext/bifrost/src/ColorSet.cpp.orig 2023-11-03 12:48:11.435933052 +0000
+++ ext/bifrost/src/ColorSet.cpp
@@ -1,3 +1,4 @@
+#include <cstdio>
#include "ColorSet.hpp"
UnitigColors::UnitigColors() : setBits(localBitVector) {}
$NetBSD: patch-ext_bifrost_src_libpopcnt.h,v 1.1 2023/11/04 14:35:07 bacon Exp $
# Use native popcnt
--- ext/bifrost/src/libpopcnt.h.orig 2023-07-24 12:34:08.037669065 +0000
+++ ext/bifrost/src/libpopcnt.h
@@ -32,6 +32,8 @@
#ifndef LIBPOPCNT_H
#define LIBPOPCNT_H
+#ifndef __NetBSD__
+
#include <stdint.h>
#ifndef __has_builtin
@@ -584,4 +586,6 @@ static inline uint64_t popcnt(const void
#endif
+#endif /* NetBSD */
+
#endif /* LIBPOPCNT_H */
$NetBSD: patch-ext_bifrost_src_strict__fstream.hpp,v 1.1 2023/11/04 14:35:07 bacon Exp $
# Portability
--- ext/bifrost/src/strict_fstream.hpp.orig 2023-06-27 10:45:00.000000000 +0000
+++ ext/bifrost/src/strict_fstream.hpp
@@ -64,7 +64,7 @@ static std::string strerror()
} else {
return "Unknown error (" + std::to_string(err_num) + ")";
}
-#elif ((_POSIX_C_SOURCE >= 200112L || _XOPEN_SOURCE >= 600) && ! _GNU_SOURCE) || defined(__APPLE__) || defined(__MUSL__)
+#elif ((_POSIX_C_SOURCE >= 200112L || _XOPEN_SOURCE >= 600) && ! _GNU_SOURCE) || defined(__APPLE__) || defined(__MUSL__) || defined(__FreeBSD__) || defined(__NetBSD__)
// XSI-compliant strerror_r()
const int err_num = errno; // See above
if (strerror_r(err_num, buff.data(), buff.size()) == 0) {
$NetBSD: patch-src_Bootstrap.h,v 1.1 2023/11/04 14:35:07 bacon Exp $
# Portability
--- src/Bootstrap.h.orig 2020-04-01 16:56:42 UTC
+++ src/Bootstrap.h
@@ -1,6 +1,7 @@
#ifndef KALLISTO_BOOTSTRAP_H
#define KALLISTO_BOOTSTRAP_H
+#include <sys/types.h>
#include <mutex>
#include <thread>
$NetBSD: patch-src_main.cpp,v 1.1 2023/11/04 14:35:07 bacon Exp $
# Portability
--- src/main.cpp.orig 2023-11-01 12:46:19.000000000 +0000
+++ src/main.cpp
@@ -11,6 +11,7 @@
#include <limits>
#include <cstdio>
+#include <unistd.h> // rmdir()
#include "common.h"
#include "ProcessReads.h"
--- pkgsrc/biology/kallisto/patches/patch-src_kseq.h 2022/02/27 01:57:27 1.1
+++ pkgsrc/biology/kallisto/patches/patch-src_kseq.h 2023/11/04 14:35:07 1.2
| @@ -1,15 +1,16 @@ | | | @@ -1,15 +1,16 @@ |
1 | $NetBSD: patch-src_kseq.h,v 1.1 2022/02/27 01:57:27 bacon Exp $ | | 1 | $NetBSD: patch-src_kseq.h,v 1.2 2023/11/04 14:35:07 bacon Exp $ |
2 | | | 2 | |
3 | # Unbundle htslib | | 3 | # Portability |
4 | | | 4 | |
5 | --- src/kseq.h.orig 2022-02-26 16:37:08.929391121 +0000 | | 5 | --- src/kseq.h.orig 2019-11-04 16:28:52 UTC |
6 | +++ src/kseq.h | | 6 | +++ src/kseq.h |
7 | @@ -27,6 +27,8 @@ SOFTWARE. | | 7 | @@ -32,6 +32,9 @@ |
8 | #include <ctype.h> | | | |
9 | #include <string.h> | | 8 | #include <string.h> |
10 | #include <stdlib.h> | | 9 | #include <stdlib.h> |
| | | 10 | |
11 | +// Prevent redefinition of kstring_t below | | 11 | +// Prevent redefinition of kstring_t below |
12 | +#include <htslib/kstring.h> | | 12 | +#include <htslib/kstring.h> |
13 | | | 13 | + |
14 | #define KS_SEP_SPACE 0 // isspace(): \t, \n, \v, \f, \r | | 14 | #define KS_SEP_SPACE 0 // isspace(): \t, \n, \v, \f, \r |
15 | #define KS_SEP_TAB 1 // isspace() && !' ' | | 15 | #define KS_SEP_TAB 1 // isspace() && !' ' |
| | | 16 | #define KS_SEP_LINE 2 // line separator: "\n" (Unix) or "\r\n" (Windows) |