diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2016-01-13 17:50:17 +0100 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2016-01-13 18:18:48 +0100 |
| commit | 8c986ab12034d67db836a881f57c69754d8073ae (patch) | |
| tree | bf5183011119695ac549d4cfff4dc2175e659397 /gnu/packages/patches/csound-header-ordering.patch | |
| parent | 203795aceaabec0e0e5818e1650ad407d825d1b3 (diff) | |
| parent | 7a2eed3aac1ecd0bdf293e33a234fad58f2e5f9e (diff) | |
| download | guix-8c986ab12034d67db836a881f57c69754d8073ae.tar.gz | |
Merge branch 'master' into core-updates
Diffstat (limited to 'gnu/packages/patches/csound-header-ordering.patch')
| -rw-r--r-- | gnu/packages/patches/csound-header-ordering.patch | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/gnu/packages/patches/csound-header-ordering.patch b/gnu/packages/patches/csound-header-ordering.patch new file mode 100644 index 0000000000..3640d123dd --- /dev/null +++ b/gnu/packages/patches/csound-header-ordering.patch @@ -0,0 +1,20 @@ +Prevent compilation issues with boost-1.60.0. + +Reported upstream at https://github.com/csound/csound/issues/570 + +--- Csound6.05/Opcodes/chua/ChuaOscillator.cpp 2015-04-25 14:06:22.995646234 -0500 ++++ Csound6.05/Opcodes/chua/ChuaOscillator.cpp 2015-12-21 10:31:58.182362640 -0600 +@@ -117,11 +117,12 @@ + // d = sys_variables(12); + // gnor = a*(x.^3) + b*(x.^2) + c*x + d; + +-#include <OpcodeBase.hpp> + #include <boost/numeric/ublas/vector.hpp> + using namespace boost::numeric; + #include <cmath> + ++#include <OpcodeBase.hpp> ++ + #undef CS_KSMPS + #define CS_KSMPS (opds.insdshead->ksmps) + |