[gnuradio] add missing return value in generated code add BR: orc-devel - needed for secondary arches in volk

Dan Horák sharkcz at fedoraproject.org
Fri Oct 21 10:36:19 UTC 2011


commit 0cc25c12e68ec08d2837db223ff988e74640e6c4
Author: Dan Horák <dan at danny.cz>
Date:   Fri Oct 21 12:36:16 2011 +0200

    add missing return value in generated code
    add BR: orc-devel - needed for secondary arches in volk

 gnuradio-3.4.0-retval.patch |   11 +++++++++++
 gnuradio.spec               |   10 +++++++++-
 2 files changed, 20 insertions(+), 1 deletions(-)
---
diff --git a/gnuradio-3.4.0-retval.patch b/gnuradio-3.4.0-retval.patch
new file mode 100644
index 0000000..2d76d92
--- /dev/null
+++ b/gnuradio-3.4.0-retval.patch
@@ -0,0 +1,11 @@
+diff -up gnuradio-3.4.0/volk/include/volk/make_mktables.py.retval gnuradio-3.4.0/volk/include/volk/make_mktables.py
+--- gnuradio-3.4.0/volk/include/volk/make_mktables.py.retval	2011-10-20 22:20:13.000000000 +0200
++++ gnuradio-3.4.0/volk/include/volk/make_mktables.py	2011-10-20 22:20:26.000000000 +0200
+@@ -21,6 +21,7 @@ def make_mktables(funclist) :
+         tempstring = tempstring + '  fprintf(output, "static const ' + func + '_func_table = %u;\\n", volk_rank_archs(' + func + '_arch_defs, volk_get_lvarch()));\n';
+     tempstring = tempstring + '  fprintf(output, "#endif /*INCLUDED_VOLK_TABLES_H*/\\n");\n';
+     tempstring = tempstring + '  fclose(output);\n'
++    tempstring = tempstring + '  return 0;\n'
+     tempstring = tempstring + '}\n';
+     return tempstring;
+         
diff --git a/gnuradio.spec b/gnuradio.spec
index 7610ee3..9b396d3 100644
--- a/gnuradio.spec
+++ b/gnuradio.spec
@@ -6,7 +6,7 @@
 
 Name:		gnuradio
 Version:	3.4.0
-Release:	4%{?dist}
+Release:	5%{?dist}
 Summary:	Software defined radio framework
 
 Group:		Applications/Engineering
@@ -24,6 +24,8 @@ Source1:	10-usrp.rules
 Patch4:		gnuradio-3.4.0-sdcc3.patch
 # fixed detection of libusb
 Patch5:		gnuradio-3.4.0-libusb-detect-fix.patch
+# add missing return value in generated code
+Patch6:		gnuradio-3.4.0-retval.patch
 
 Requires(pre):	shadow-utils
 BuildRequires:	sdcc
@@ -55,6 +57,7 @@ BuildRequires:	python-cheetah
 BuildRequires:	xdg-utils
 BuildRequires:	python-lxml
 BuildRequires:	pygtk2-devel
+BuildRequires:	orc-devel
 Requires:	numpy
 Requires:	wxPython
 Requires:	scipy
@@ -102,6 +105,7 @@ GNU Radio examples
 %setup -q
 %patch4 -p1 -b .sdcc3
 %patch5 -p1 -b .libusb-detect-fix
+%patch6 -p1 -b .retval
 
 #force regeneration of cached moc output files
 find . -name "*_moc.cc" -exec rm {} \;
@@ -171,6 +175,10 @@ getent group usrp >/dev/null || groupadd -r usrp
 %{_datadir}/gnuradio/examples
 
 %changelog
+* Fri Oct 21 2011 Dan Horák <dan[at]danny.cz> - 3.4.0-5
+- add missing return value in generated code
+- add BR: orc-devel - needed for secondary arches in volk
+
 * Thu Oct 20 2011 Dan Horák <dan[at]danny.cz> - 3.4.0-4
 - explicitly set boost libdir to workaround build failures on non-x86 64-bit arches
 


More information about the scm-commits mailing list