[gnuradio/f15/master] - Fix compilation with ptrdifft-std patch - Rebuild for new boost
Jaroslav Škarvada
jskarvad at fedoraproject.org
Thu Feb 17 10:43:28 UTC 2011
commit f5237d106e038d9ffdd9fae2619869a4b7f3b8b9
Author: Jaroslav Škarvada <jskarvad at redhat.com>
Date: Thu Feb 17 11:39:28 2011 +0100
- Fix compilation with ptrdifft-std patch
- Rebuild for new boost
gnuradio-3.2.2-ptrdifft-std.patch | 13 +++++++++++++
gnuradio.spec | 3 +++
2 files changed, 16 insertions(+), 0 deletions(-)
---
diff --git a/gnuradio-3.2.2-ptrdifft-std.patch b/gnuradio-3.2.2-ptrdifft-std.patch
new file mode 100644
index 0000000..dc31a5f
--- /dev/null
+++ b/gnuradio-3.2.2-ptrdifft-std.patch
@@ -0,0 +1,13 @@
+--- gnuradio-3.3.0/usrp/host/swig/usrp_prims.i.old 2011-02-16 23:53:52.000639466 +0100
++++ gnuradio-3.3.0/usrp/host/swig/usrp_prims.i 2011-02-16 23:53:11.017005325 +0100
+@@ -32,6 +32,10 @@
+ * Linux, *BSD and Mac OS/X. http://libusb.sourceforge.net
+ */
+
++%{
++typedef std::ptrdiff_t ptrdiff_t;
++%}
++
+ %include <stl.i> // pick up string stuff
+
+
diff --git a/gnuradio.spec b/gnuradio.spec
index fe83063..de1bc8c 100644
--- a/gnuradio.spec
+++ b/gnuradio.spec
@@ -15,6 +15,7 @@ Patch0: gnuradio-3.2-libtool.patch
Patch1: gnuradio-3.2-configure.patch
Patch2: gnuradio-gcc45.patch
Patch3: gnuradio-3.2.2-64bit.patch
+Patch4: gnuradio-3.2.2-ptrdifft-std.patch
Requires(pre): shadow-utils
BuildRequires: sdcc
@@ -101,6 +102,7 @@ GNU Radio USRP headers
%patch1 -p1 -b .configure
%patch2 -p1 -b .gcc45
%patch3 -p1 -b .64bit
+%patch4 -p1 -b .ptrdifft-std
#force regeneration of cached moc output files
find . -name "*_moc.cc" -exec rm {} \;
@@ -208,6 +210,7 @@ getent group usrp >/dev/null || groupadd -r usrp
%changelog
* Tue Feb 15 2011 Jaroslav Škarvada <jskarvad at redhat.com> - 3.2.2-11
+- Fix compilation with ptrdifft-std patch
- Rebuild for new boost
* Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.2.2-10
More information about the scm-commits
mailing list