[octave-signal] fix for gcc 4.7
sailer
sailer at fedoraproject.org
Sat Jan 14 16:43:48 UTC 2012
commit cf273957f7cd7bc70aa7ecd7cce7ca3fe7811c83
Author: Thomas Sailer <t.sailer at alumni.ethz.ch>
Date: Sat Jan 14 17:43:31 2012 +0100
fix for gcc 4.7
octave-signal-gcc47.patch | 10 ++++++++++
octave-signal.spec | 8 +++++++-
2 files changed, 17 insertions(+), 1 deletions(-)
---
diff --git a/octave-signal-gcc47.patch b/octave-signal-gcc47.patch
new file mode 100644
index 0000000..dd2005e
--- /dev/null
+++ b/octave-signal-gcc47.patch
@@ -0,0 +1,10 @@
+--- src/cl2bp_lib.h.orig 2012-01-14 16:36:23.626798539 +0100
++++ src/cl2bp_lib.h 2012-01-14 16:38:13.236809757 +0100
+@@ -33,6 +33,7 @@
+
+ #include <cassert>
+ #include <cstring> //for memset
++#include <cstdlib> //for free, resize
+
+ //-----------------------------------------------------------------------------------------------------------
+ // If you want to debug the cl2bp algorithm, define the CL2BP_LOGGING symbol and provide an
diff --git a/octave-signal.spec b/octave-signal.spec
index cacfa43..2f8cb56 100644
--- a/octave-signal.spec
+++ b/octave-signal.spec
@@ -2,12 +2,14 @@
Name: octave-%{octpkg}
Version: 1.1.1
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Signal processing tools for Octave
Group: Applications/Engineering
License: GPLv3+
URL: http://octave.sourceforge.net/signal/
Source0: http://downloads.sourceforge.net/octave/%{octpkg}-%{version}.tar.gz
+# fix gcc47 build - already in upstream svn
+Patch0: octave-signal-gcc47.patch
# avoid stripping binaries to get useful debuginfo packages
# fedora specific - not upstreamed
Patch1: %{name}-nostrip.patch
@@ -34,6 +36,7 @@ Signal processing tools, including filtering, windowing and display
%prep
%setup -q -n %{octpkg}
+%patch0 -p0 -b .gcc47
%patch1 -p0 -b .nostrip
for i in inst/*.m; do
iconv -f iso8859-1 -t utf-8 $i > $i.conv && mv -f $i.conv $i
@@ -71,6 +74,9 @@ rm -rf %{buildroot}
%changelog
+* Sat Jan 14 2012 Thomas Sailer <t.sailer at alumni.ethz.ch> - 1.1.1-3
+- fix gcc 4.7 compilation
+
* Fri Jan 13 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
More information about the scm-commits
mailing list