diff options
| author | Ben Woodcroft <donttrustben@gmail.com> | 2017-07-23 22:35:52 +1000 |
|---|---|---|
| committer | Ben Woodcroft <donttrustben@gmail.com> | 2017-07-23 22:35:52 +1000 |
| commit | d3dce32216905a3beab6cdc6ba444d92f934ea29 (patch) | |
| tree | b91e6210e2e30b051cdf955d691f913748c7ef17 /gnu | |
| parent | 6c1a317e29c45e85e3a0e050612cdefe470b100c (diff) | |
| download | guix-d3dce32216905a3beab6cdc6ba444d92f934ea29.tar.gz | |
gnu: metabat: Fix boost-related compilation issue.
Reported by Leo Famulari. * gnu/packages/patches/metabat-fix-boost-issue.patch: New file. * gnu/packages/bioinformatics.scm (metabat): Use it. * gnu/local.mk (dist_patch_DATA): Add it.
Diffstat (limited to 'gnu')
| -rw-r--r-- | gnu/local.mk | 1 | ||||
| -rw-r--r-- | gnu/packages/bioinformatics.scm | 3 | ||||
| -rw-r--r-- | gnu/packages/patches/metabat-fix-boost-issue.patch | 27 |
3 files changed, 30 insertions, 1 deletions
diff --git a/gnu/local.mk b/gnu/local.mk index f01ed62ff9..acfd2af36f 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -822,6 +822,7 @@ dist_patch_DATA = \ %D%/packages/patches/mesa-wayland-egl-symbols-check-mips.patch \ %D%/packages/patches/metabat-remove-compilation-date.patch \ %D%/packages/patches/metabat-fix-compilation.patch \ + %D%/packages/patches/metabat-fix-boost-issue.patch \ %D%/packages/patches/mhash-keygen-test-segfault.patch \ %D%/packages/patches/mingw-w64-5.0rc2-gcc-4.9.3.patch \ %D%/packages/patches/mpc123-initialize-ao.patch \ diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 3b4cc359ee..60beed8fb3 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -3480,7 +3480,8 @@ form of assemblies or reads.") (base32 "0ll00l81aflscgggs5nfhj12cbvdiz3gg7f7n5f537a3xhx60vn9")) (patches (search-patches "metabat-remove-compilation-date.patch" - "metabat-fix-compilation.patch")))) + "metabat-fix-compilation.patch" + "metabat-fix-boost-issue.patch")))) (build-system gnu-build-system) (arguments `(#:phases diff --git a/gnu/packages/patches/metabat-fix-boost-issue.patch b/gnu/packages/patches/metabat-fix-boost-issue.patch new file mode 100644 index 0000000000..3382d84d66 --- /dev/null +++ b/gnu/packages/patches/metabat-fix-boost-issue.patch @@ -0,0 +1,27 @@ +This patch fixes the issue described at +https://bitbucket.org/berkeleylab/metabat/issues/28/compilation-fail-with-boost-164 + +diff --git a/src/metabat.h b/src/metabat.h +index 32ae94c..2292c04 100644 +--- a/src/metabat.h ++++ b/src/metabat.h +@@ -35,6 +35,7 @@ KSEQ_INIT(gzFile, gzread) + + #include <boost/program_options.hpp> + #include <boost/algorithm/string.hpp> ++#include <boost/serialization/array_wrapper.hpp> + #include <boost/numeric/ublas/matrix.hpp> + #include <boost/math/distributions.hpp> + #include <boost/serialization/serialization.hpp> +diff --git a/src/metabat2.h b/src/metabat2.h +index 60a9998..19fa815 100644 +--- a/src/metabat2.h ++++ b/src/metabat2.h +@@ -41,6 +41,7 @@ KSEQ_INIT(gzFile, gzread) + + #include <boost/program_options.hpp> + #include <boost/algorithm/string.hpp> ++#include <boost/serialization/array_wrapper.hpp> + #include <boost/numeric/ublas/matrix.hpp> + #include <boost/numeric/ublas/matrix_sparse.hpp> + #include <boost/numeric/ublas/matrix_proxy.hpp> |