rpms
/
mmseq
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Patch to add compatibility with C++11 static data member initialization changes

This commit is contained in:
Adam Huffman 2016-02-12 10:03:42 +00:00
parent a13ef4b4e9
commit 69535b8b57
2 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
mmseq-static-data-members-initialization-c++11.patch Normal file
View File

@ -0,0 +1,12 @@
diff -ur mmseq-1.0.8a/src/bms.hpp mmseq-1.0.8a.new/src/bms.hpp
--- mmseq-1.0.8a/src/bms.hpp 2014-01-09 22:45:54.000000000 +0000
+++ mmseq-1.0.8a.new/src/bms.hpp 2016-02-12 10:00:33.330772798 +0000
@@ -135,7 +135,7 @@
vector<bool> Pnil;
bool fixalpha;
- static const double g=2.0;
+ static constexpr double g=2.0;
gsl_rng ** rg;
int max_threads;

4
mmseq.spec
View File

@ -11,6 +11,7 @@ Patch0: mmseq-sam-header.patch
#Patch1: mmseq-flags.patch
Patch2: mmseq-zlib.patch
Patch3: mmseq-iostream-c++11.patch
Patch4: mmseq-static-data-members-initialization-c++11.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: boost-devel
@ -37,6 +38,8 @@ estimation using multi-mapping RNA-seq reads. Example scripts are included.
%patch2 -p1 -b .mmseq-zlib.patch
#Fix for C++11 iostream changes
%patch3 -p1 -b .mmseq-iostream-c++11.patch
#Fix for C++11 static data member initialization changes
%patch4 -p1 -b .mmseq-static-data-members-initialization-c++11.patch
#Remove bundled binaries
rm bin/*-linux
@ -91,6 +94,7 @@ rm -rf %{buildroot}
%changelog
* Fri Feb 12 2016 Adam Huffman <bloch@verdurin.com> - 1.0.8a-10
- patch to add compatibility with C++11 iostream
- patch to add compatibility with C++11 static data member initialization
* Wed Feb 10 2016 Adam Huffman <bloch@verdurin.com> - 1.0.8a-9
- rebuilt to pick up new armadillo