From 0d44a94755041b5532366403d1fc78ee2dc203e9 Mon Sep 17 00:00:00 2001 From: Lubomir Rintel Date: Mar 05 2009 06:28:18 +0000 Subject: - Fix build with GCC 4.4 Not building yet, pending wxPython rebuild --- diff --git a/gnuradio-3.1.3-gcc44.patch b/gnuradio-3.1.3-gcc44.patch new file mode 100644 index 0000000..a32706a --- /dev/null +++ b/gnuradio-3.1.3-gcc44.patch @@ -0,0 +1,324 @@ +Fix build with GCC 4.4 + +Lubomir Rintel + +diff -urp gnuradio-3.1.3/gnuradio-core/src/lib/filter/gr_fft_filter_ccc.cc gnuradio-3.1.3.gcc44/gnuradio-core/src/lib/filter/gr_fft_filter_ccc.cc +--- gnuradio-3.1.3/gnuradio-core/src/lib/filter/gr_fft_filter_ccc.cc 2008-05-09 08:35:18.000000000 +0200 ++++ gnuradio-3.1.3.gcc44/gnuradio-core/src/lib/filter/gr_fft_filter_ccc.cc 2009-03-04 20:48:25.000000000 +0100 +@@ -39,6 +39,7 @@ + + #include + #include ++#include + + gr_fft_filter_ccc_sptr gr_make_fft_filter_ccc (int decimation, const std::vector &taps) + { +diff -urp gnuradio-3.1.3/gnuradio-core/src/lib/filter/gr_fft_filter_fff.cc gnuradio-3.1.3.gcc44/gnuradio-core/src/lib/filter/gr_fft_filter_fff.cc +--- gnuradio-3.1.3/gnuradio-core/src/lib/filter/gr_fft_filter_fff.cc 2008-05-09 08:35:16.000000000 +0200 ++++ gnuradio-3.1.3.gcc44/gnuradio-core/src/lib/filter/gr_fft_filter_fff.cc 2009-03-04 20:49:07.000000000 +0100 +@@ -34,6 +34,7 @@ + + #include + #include ++#include + + gr_fft_filter_fff_sptr gr_make_fft_filter_fff (int decimation, const std::vector &taps) + { +diff -urp gnuradio-3.1.3/gnuradio-core/src/lib/general/gr_align_on_samplenumbers_ss.cc gnuradio-3.1.3.gcc44/gnuradio-core/src/lib/general/gr_align_on_samplenumbers_ss.cc +--- gnuradio-3.1.3/gnuradio-core/src/lib/general/gr_align_on_samplenumbers_ss.cc 2008-05-09 08:35:40.000000000 +0200 ++++ gnuradio-3.1.3.gcc44/gnuradio-core/src/lib/general/gr_align_on_samplenumbers_ss.cc 2009-03-04 20:49:45.000000000 +0100 +@@ -29,6 +29,7 @@ + #include + #include + #include ++#include + + //define ALIGN_ADVANCED_IMPLEMENTATION to have an alternative implementation of the align algoritm which exactly follows the align_interval spec. + //It is more resource intensive, less tested and probably not needed +diff -urp gnuradio-3.1.3/gnuradio-core/src/lib/general/gr_clock_recovery_mm_cc.cc gnuradio-3.1.3.gcc44/gnuradio-core/src/lib/general/gr_clock_recovery_mm_cc.cc +--- gnuradio-3.1.3/gnuradio-core/src/lib/general/gr_clock_recovery_mm_cc.cc 2008-03-05 22:13:04.000000000 +0100 ++++ gnuradio-3.1.3.gcc44/gnuradio-core/src/lib/general/gr_clock_recovery_mm_cc.cc 2009-03-04 21:01:08.000000000 +0100 +@@ -29,6 +29,7 @@ + #include + #include + #include ++#include + + // Public constructor + +diff -urp gnuradio-3.1.3/gnuradio-core/src/lib/general/gr_constellation_decoder_cb.cc gnuradio-3.1.3.gcc44/gnuradio-core/src/lib/general/gr_constellation_decoder_cb.cc +--- gnuradio-3.1.3/gnuradio-core/src/lib/general/gr_constellation_decoder_cb.cc 2008-03-05 22:13:04.000000000 +0100 ++++ gnuradio-3.1.3.gcc44/gnuradio-core/src/lib/general/gr_constellation_decoder_cb.cc 2009-03-04 20:55:42.000000000 +0100 +@@ -28,6 +28,7 @@ + #include + #include + ++#include + #include + using std::cout; + using std::endl; +diff -urp gnuradio-3.1.3/gnuradio-core/src/lib/general/gr_correlate_access_code_bb.cc gnuradio-3.1.3.gcc44/gnuradio-core/src/lib/general/gr_correlate_access_code_bb.cc +--- gnuradio-3.1.3/gnuradio-core/src/lib/general/gr_correlate_access_code_bb.cc 2008-03-05 22:13:04.000000000 +0100 ++++ gnuradio-3.1.3.gcc44/gnuradio-core/src/lib/general/gr_correlate_access_code_bb.cc 2009-03-04 20:56:30.000000000 +0100 +@@ -27,6 +27,7 @@ + #include + #include + #include ++#include + #include + + #define VERBOSE 0 +diff -urp gnuradio-3.1.3/gnuradio-core/src/lib/general/gr_dd_mpsk_sync_cc.cc gnuradio-3.1.3.gcc44/gnuradio-core/src/lib/general/gr_dd_mpsk_sync_cc.cc +--- gnuradio-3.1.3/gnuradio-core/src/lib/general/gr_dd_mpsk_sync_cc.cc 2008-03-05 22:13:04.000000000 +0100 ++++ gnuradio-3.1.3.gcc44/gnuradio-core/src/lib/general/gr_dd_mpsk_sync_cc.cc 2009-03-04 20:57:47.000000000 +0100 +@@ -30,6 +30,7 @@ + #include + #include + #include ++#include + + #include + +diff -urp gnuradio-3.1.3/gnuradio-core/src/lib/general/gr_decode_ccsds_27_fb.cc gnuradio-3.1.3.gcc44/gnuradio-core/src/lib/general/gr_decode_ccsds_27_fb.cc +--- gnuradio-3.1.3/gnuradio-core/src/lib/general/gr_decode_ccsds_27_fb.cc 2008-06-25 20:57:48.000000000 +0200 ++++ gnuradio-3.1.3.gcc44/gnuradio-core/src/lib/general/gr_decode_ccsds_27_fb.cc 2009-03-04 21:00:57.000000000 +0100 +@@ -24,6 +24,7 @@ + + #include + #include ++#include + + gr_decode_ccsds_27_fb_sptr + gr_make_decode_ccsds_27_fb() +diff -urp gnuradio-3.1.3/gnuradio-core/src/lib/general/gr_dpll_bb.cc gnuradio-3.1.3.gcc44/gnuradio-core/src/lib/general/gr_dpll_bb.cc +--- gnuradio-3.1.3/gnuradio-core/src/lib/general/gr_dpll_bb.cc 2008-03-05 22:13:04.000000000 +0100 ++++ gnuradio-3.1.3.gcc44/gnuradio-core/src/lib/general/gr_dpll_bb.cc 2009-03-04 20:58:56.000000000 +0100 +@@ -26,6 +26,7 @@ + + #include + #include ++#include + + gr_dpll_bb_sptr + gr_make_dpll_bb (float period, float gain) +diff -urp gnuradio-3.1.3/gnuradio-core/src/lib/general/gr_fft_vfc.cc gnuradio-3.1.3.gcc44/gnuradio-core/src/lib/general/gr_fft_vfc.cc +--- gnuradio-3.1.3/gnuradio-core/src/lib/general/gr_fft_vfc.cc 2008-05-09 08:35:29.000000000 +0200 ++++ gnuradio-3.1.3.gcc44/gnuradio-core/src/lib/general/gr_fft_vfc.cc 2009-03-04 22:35:36.000000000 +0100 +@@ -29,6 +29,7 @@ + #include + #include + #include ++#include + #include + + +diff -urp gnuradio-3.1.3/gnuradio-core/src/lib/general/gr_mpsk_receiver_cc.cc gnuradio-3.1.3.gcc44/gnuradio-core/src/lib/general/gr_mpsk_receiver_cc.cc +--- gnuradio-3.1.3/gnuradio-core/src/lib/general/gr_mpsk_receiver_cc.cc 2008-03-05 22:13:04.000000000 +0100 ++++ gnuradio-3.1.3.gcc44/gnuradio-core/src/lib/general/gr_mpsk_receiver_cc.cc 2009-03-04 21:00:40.000000000 +0100 +@@ -28,6 +28,7 @@ + #include + #include + #include ++#include + #include + #include + #include +diff -urp gnuradio-3.1.3/gnuradio-core/src/lib/general/gr_simple_correlator.cc gnuradio-3.1.3.gcc44/gnuradio-core/src/lib/general/gr_simple_correlator.cc +--- gnuradio-3.1.3/gnuradio-core/src/lib/general/gr_simple_correlator.cc 2008-05-09 08:35:37.000000000 +0200 ++++ gnuradio-3.1.3.gcc44/gnuradio-core/src/lib/general/gr_simple_correlator.cc 2009-03-04 21:00:35.000000000 +0100 +@@ -29,6 +29,7 @@ + #include + #include + #include ++#include + #include + #include + +diff -urp gnuradio-3.1.3/gnuradio-core/src/lib/general/gr_stream_mux.cc gnuradio-3.1.3.gcc44/gnuradio-core/src/lib/general/gr_stream_mux.cc +--- gnuradio-3.1.3/gnuradio-core/src/lib/general/gr_stream_mux.cc 2008-05-09 08:35:36.000000000 +0200 ++++ gnuradio-3.1.3.gcc44/gnuradio-core/src/lib/general/gr_stream_mux.cc 2009-03-04 21:01:02.000000000 +0100 +@@ -27,6 +27,7 @@ + #include + #include + #include ++#include + + #define VERBOSE 0 + +diff -urp gnuradio-3.1.3/gnuradio-core/src/lib/io/gr_wavfile_sink.cc gnuradio-3.1.3.gcc44/gnuradio-core/src/lib/io/gr_wavfile_sink.cc +--- gnuradio-3.1.3/gnuradio-core/src/lib/io/gr_wavfile_sink.cc 2008-03-05 22:12:53.000000000 +0100 ++++ gnuradio-3.1.3.gcc44/gnuradio-core/src/lib/io/gr_wavfile_sink.cc 2009-03-04 22:41:30.000000000 +0100 +@@ -30,6 +30,7 @@ + #include + #include + #include ++#include + #include + #include + +diff -urp gnuradio-3.1.3/gr-atsc/src/lib/atsc_bit_timing_loop.cc gnuradio-3.1.3.gcc44/gr-atsc/src/lib/atsc_bit_timing_loop.cc +--- gnuradio-3.1.3/gr-atsc/src/lib/atsc_bit_timing_loop.cc 2008-05-09 08:36:02.000000000 +0200 ++++ gnuradio-3.1.3.gcc44/gr-atsc/src/lib/atsc_bit_timing_loop.cc 2009-03-04 22:41:18.000000000 +0100 +@@ -28,6 +28,7 @@ + #include + #include + #include ++#include + + // Input rate changed from 20MHz to 19.2 to support usrp at 3 * 6.4MHz + float input_rate = 19.2e6; +diff -urp gnuradio-3.1.3/gr-atsc/src/lib/atsc_fpll.cc gnuradio-3.1.3.gcc44/gr-atsc/src/lib/atsc_fpll.cc +--- gnuradio-3.1.3/gr-atsc/src/lib/atsc_fpll.cc 2008-03-05 22:13:10.000000000 +0100 ++++ gnuradio-3.1.3.gcc44/gr-atsc/src/lib/atsc_fpll.cc 2009-03-04 21:00:28.000000000 +0100 +@@ -28,6 +28,7 @@ + #include + #include + #include ++#include + #include "fpll_btloop_coupling.h" + + +diff -urp gnuradio-3.1.3/gr-atsc/src/lib/qa_atsci_data_interleaver.cc gnuradio-3.1.3.gcc44/gr-atsc/src/lib/qa_atsci_data_interleaver.cc +--- gnuradio-3.1.3/gr-atsc/src/lib/qa_atsci_data_interleaver.cc 2008-05-09 08:35:59.000000000 +0200 ++++ gnuradio-3.1.3.gcc44/gr-atsc/src/lib/qa_atsci_data_interleaver.cc 2009-03-04 22:41:12.000000000 +0100 +@@ -23,7 +23,7 @@ + #include + #include + #include +- ++#include + + /*! + * write an easy to identify pattern into the packet +diff -urp gnuradio-3.1.3/gr-audio-alsa/src/gri_alsa.cc gnuradio-3.1.3.gcc44/gr-audio-alsa/src/gri_alsa.cc +--- gnuradio-3.1.3/gr-audio-alsa/src/gri_alsa.cc 2008-03-05 22:12:16.000000000 +0100 ++++ gnuradio-3.1.3.gcc44/gr-audio-alsa/src/gri_alsa.cc 2009-03-04 22:41:36.000000000 +0100 +@@ -26,6 +26,7 @@ + + #include + #include ++#include + + static snd_pcm_access_t access_types[] = { + SND_PCM_ACCESS_MMAP_INTERLEAVED, +diff -urp gnuradio-3.1.3/gr-audio-osx/src/audio_osx_sink.cc gnuradio-3.1.3.gcc44/gr-audio-osx/src/audio_osx_sink.cc +--- gnuradio-3.1.3/gr-audio-osx/src/audio_osx_sink.cc 2008-03-05 22:12:12.000000000 +0100 ++++ gnuradio-3.1.3.gcc44/gr-audio-osx/src/audio_osx_sink.cc 2009-03-04 22:41:26.000000000 +0100 +@@ -29,6 +29,7 @@ + #include + #include + #include ++#include + #include + + #define _OSX_AU_DEBUG_ 0 +diff -urp gnuradio-3.1.3/gr-audio-osx/src/audio_osx_source.cc gnuradio-3.1.3.gcc44/gr-audio-osx/src/audio_osx_source.cc +--- gnuradio-3.1.3/gr-audio-osx/src/audio_osx_source.cc 2008-03-05 22:12:12.000000000 +0100 ++++ gnuradio-3.1.3.gcc44/gr-audio-osx/src/audio_osx_source.cc 2009-03-04 22:41:22.000000000 +0100 +@@ -30,6 +30,7 @@ + #include + #include + #include ++#include + + #define _OSX_AU_DEBUG_ 0 + #define _OSX_DO_LISTENERS_ 0 +diff -urp gnuradio-3.1.3/gr-audio-portaudio/src/gri_portaudio.cc gnuradio-3.1.3.gcc44/gr-audio-portaudio/src/gri_portaudio.cc +--- gnuradio-3.1.3/gr-audio-portaudio/src/gri_portaudio.cc 2008-03-05 22:12:12.000000000 +0100 ++++ gnuradio-3.1.3.gcc44/gr-audio-portaudio/src/gri_portaudio.cc 2009-03-04 21:01:15.000000000 +0100 +@@ -27,6 +27,7 @@ + #include + #include + #include ++#include + + + PaDeviceIndex +diff -urp gnuradio-3.1.3/gr-pager/src/pager_flex_sync.cc gnuradio-3.1.3.gcc44/gr-pager/src/pager_flex_sync.cc +--- gnuradio-3.1.3/gr-pager/src/pager_flex_sync.cc 2008-03-05 22:12:08.000000000 +0100 ++++ gnuradio-3.1.3.gcc44/gr-pager/src/pager_flex_sync.cc 2009-03-04 22:40:40.000000000 +0100 +@@ -23,6 +23,7 @@ + #include "config.h" + #endif + ++#include + #include + #include + #include +diff -urp gnuradio-3.1.3/gr-usrp/src/usrp1_sink_base.cc gnuradio-3.1.3.gcc44/gr-usrp/src/usrp1_sink_base.cc +--- gnuradio-3.1.3/gr-usrp/src/usrp1_sink_base.cc 2008-03-05 22:13:05.000000000 +0100 ++++ gnuradio-3.1.3.gcc44/gr-usrp/src/usrp1_sink_base.cc 2009-03-04 22:40:50.000000000 +0100 +@@ -24,6 +24,7 @@ + #include "config.h" + #endif + ++#include + #include + #include + #include +diff -urp gnuradio-3.1.3/gr-usrp/src/usrp1_source_base.cc gnuradio-3.1.3.gcc44/gr-usrp/src/usrp1_source_base.cc +--- gnuradio-3.1.3/gr-usrp/src/usrp1_source_base.cc 2008-03-05 22:13:05.000000000 +0100 ++++ gnuradio-3.1.3.gcc44/gr-usrp/src/usrp1_source_base.cc 2009-03-04 22:40:45.000000000 +0100 +@@ -24,6 +24,7 @@ + #include "config.h" + #endif + ++#include + #include + #include + #include +diff -urp gnuradio-3.1.3/usrp/host/lib/legacy/fusb_darwin.cc gnuradio-3.1.3.gcc44/usrp/host/lib/legacy/fusb_darwin.cc +--- gnuradio-3.1.3/usrp/host/lib/legacy/fusb_darwin.cc 2008-03-05 22:12:38.000000000 +0100 ++++ gnuradio-3.1.3.gcc44/usrp/host/lib/legacy/fusb_darwin.cc 2009-03-04 22:41:08.000000000 +0100 +@@ -29,6 +29,7 @@ + #define _USE_OMNI_THREADS_ + #define DO_DEBUG 0 + ++#include + #include + #include "fusb.h" + #include "fusb_darwin.h" +diff -urp gnuradio-3.1.3/usrp/host/lib/legacy/fusb_linux.cc gnuradio-3.1.3.gcc44/usrp/host/lib/legacy/fusb_linux.cc +--- gnuradio-3.1.3/usrp/host/lib/legacy/fusb_linux.cc 2008-05-09 08:53:09.000000000 +0200 ++++ gnuradio-3.1.3.gcc44/usrp/host/lib/legacy/fusb_linux.cc 2009-03-04 22:36:59.000000000 +0100 +@@ -35,6 +35,7 @@ + #include + #include + #include ++#include + #include + #include + +diff -urp gnuradio-3.1.3/usrp/host/lib/legacy/fusb_win32.cc gnuradio-3.1.3.gcc44/usrp/host/lib/legacy/fusb_win32.cc +--- gnuradio-3.1.3/usrp/host/lib/legacy/fusb_win32.cc 2008-05-09 08:34:46.000000000 +0200 ++++ gnuradio-3.1.3.gcc44/usrp/host/lib/legacy/fusb_win32.cc 2009-03-04 22:40:59.000000000 +0100 +@@ -24,6 +24,7 @@ + #include "config.h" + #endif + ++#include + #include + #include + #include +diff -urp gnuradio-3.1.3/usrp/host/lib/legacy/usrp_basic.cc gnuradio-3.1.3.gcc44/usrp/host/lib/legacy/usrp_basic.cc +--- gnuradio-3.1.3/usrp/host/lib/legacy/usrp_basic.cc 2008-05-09 08:34:47.000000000 +0200 ++++ gnuradio-3.1.3.gcc44/usrp/host/lib/legacy/usrp_basic.cc 2009-03-04 22:36:12.000000000 +0100 +@@ -31,6 +31,7 @@ + #include "fusb.h" + #include + #include ++#include + #include + #include + #include +diff -urp gnuradio-3.1.3/usrp/host/lib/legacy/usrp_standard.cc gnuradio-3.1.3.gcc44/usrp/host/lib/legacy/usrp_standard.cc +--- gnuradio-3.1.3/usrp/host/lib/legacy/usrp_standard.cc 2008-08-01 21:45:09.000000000 +0200 ++++ gnuradio-3.1.3.gcc44/usrp/host/lib/legacy/usrp_standard.cc 2009-03-04 22:40:54.000000000 +0100 +@@ -22,6 +22,7 @@ + + #include + ++#include + #include "usrp_prims.h" + #include "fpga_regs_common.h" + #include "fpga_regs_standard.h" diff --git a/gnuradio.spec b/gnuradio.spec index c21e5a1..965ab7b 100644 --- a/gnuradio.spec +++ b/gnuradio.spec @@ -2,7 +2,7 @@ Name: gnuradio Version: 3.1.3 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Software defined radio framework Group: Applications/Engineering @@ -14,6 +14,7 @@ Source1: 10-usrp.rules Patch0: gnuradio-3.1.3-libtool.bug.patch Patch1: gnuradio-3.1.3-werror.patch Patch2: gnuradio-3.1.3-comedilib0.8.patch +Patch3: gnuradio-3.1.3-gcc44.patch Requires(pre): shadow-utils BuildRequires: sdcc @@ -91,6 +92,7 @@ GNU Radio USRP headers %patch0 -p1 -b .libtool %patch1 -p1 -b .werror %patch2 -p1 -b .comedilib +%patch3 -p1 -b .gcc44 %build export PATH=%{_libexecdir}/sdcc:$PATH @@ -198,6 +200,9 @@ getent group usrp >/dev/null || groupadd -r usrp %{_includedir}/usrp_* %changelog +* Thu Mar 4 2009 Lubomir Rintel - 3.1.3-5 +- Fix build with GCC 4.4 + * Tue Feb 24 2009 Fedora Release Engineering - 3.1.3-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild