[packages/gnuradio] - up to 3.7.9.2 - sed hack are bad practice, moved to patch - point cmake libexec to libdir - fix gs
baggins
baggins at pld-linux.org
Tue May 24 21:18:07 CEST 2016
commit d6476722d6b8662a30334b350fe8611cadc0a217
Author: Jan Rękorajski <baggins at pld-linux.org>
Date: Tue May 24 19:16:24 2016 +0000
- up to 3.7.9.2
- sed hack are bad practice, moved to patch
- point cmake libexec to libdir
- fix gsl detection
gnuradio.spec | 33 +++++++++++++++++----------------
gsl.patch | 21 +++++++++++++++++++++
libexec.patch | 11 +++++++++++
link.patch | 57 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
4 files changed, 106 insertions(+), 16 deletions(-)
---
diff --git a/gnuradio.spec b/gnuradio.spec
index 87f14d4..69f77dd 100644
--- a/gnuradio.spec
+++ b/gnuradio.spec
@@ -5,12 +5,15 @@
Summary: Software defined radio framework
Name: gnuradio
-Version: 3.7.7.1
-Release: 6
+Version: 3.7.9.2
+Release: 1
License: GPL v3
Group: Applications/Engineering
Source0: http://gnuradio.org/releases/gnuradio/%{name}-%{version}.tar.gz
-# Source0-md5: ca8e47abcb01edc72014ccabe38123a3
+# Source0-md5: ec5532a438ae3169069a9909499fa19b
+Patch0: link.patch
+Patch1: gsl.patch
+Patch2: libexec.patch
URL: http://www.gnuradio.org/
BuildRequires: Qt3Support >= 4.8
BuildRequires: QtCLucene-devel >= 4.8
@@ -33,7 +36,7 @@ BuildRequires: QtXml-devel >= 4.8
BuildRequires: QtXmlPatterns-devel >= 4.8
BuildRequires: SDL-devel >= 1.2.0
BuildRequires: alsa-lib-devel >= 0.9
-BuildRequires: boost-devel >= 1.35
+BuildRequires: boost-devel >= 1.53
BuildRequires: cmake >= 2.6
BuildRequires: cppunit-devel >= 1.9.14
BuildRequires: doxygen >= 1.5
@@ -69,10 +72,6 @@ BuildRequires: texlive-latex
%{?with_uhd:BuildRequires: uhd-devel >= 3.0.0}
BuildRequires: xdg-utils
BuildRequires: xmlto
-BuildConflicts: boost-devel = 1.46.0
-BuildConflicts: boost-devel = 1.46.1
-BuildConflicts: boost-devel = 1.47.0
-BuildConflicts: boost-devel = 1.52.0
Requires: portaudio
Requires: python-PyQt4
Requires: python-cheetah
@@ -128,18 +127,14 @@ GNU Radio examples.
%prep
%setup -q
-sed -e '/Prevented in-tree build. This is bad practice./d' -i CMakeLists.txt
-sed -e 's/list(APPEND gnuradio_runtime_libs rt)/list(APPEND gnuradio_runtime_libs rt pthread)/' -i gnuradio-runtime/lib/CMakeLists.txt
-sed -e 's/list(APPEND gr_audio_libs ${JACK_LIBRARIES})/list(APPEND gr_audio_libs ${JACK_LIBRARIES} pthread)/' -i gr-audio/lib/CMakeLists.txt
-sed -e 's/list(APPEND fcd_libs rt)/list(APPEND fcd_libs rt pthread)/' -i gr-fcd/lib/CMakeLists.txt
-sed -e 's/target_link_libraries(volk ${volk_libraries})/target_link_libraries(volk ${volk_libraries} m)/' -i volk/lib/CMakeLists.txt
-
-sed -i -e 's#libexec#%{_lib}#g' CMakeLists.txt
+%patch0 -p1
+%patch1 -p1
+%patch2 -p1
%build
%{__mkdir_p} build
cd build
-%cmake \
+%cmake -Wno-dev \
-DCMAKE_BUILD_TYPE=None \
-DENABLE_DOXYGEN=FORCE \
-DENABLE_GR_ATSC=FORCE \
@@ -198,8 +193,10 @@ rm -rf $RPM_BUILD_ROOT
%defattr(644,root,root,755)
%doc README.hacking
%attr(755,root,root) %{_bindir}/gnuradio-*
+%attr(755,root,root) %{_bindir}/gr-*
%attr(755,root,root) %{_bindir}/gr_*
%attr(755,root,root) %{_bindir}/grcc
+%attr(755,root,root) %{_bindir}/polar_channel_construction
%attr(755,root,root) %{_bindir}/usrp_flex
%attr(755,root,root) %{_bindir}/usrp_flex_all
%attr(755,root,root) %{_bindir}/usrp_flex_band
@@ -253,6 +250,10 @@ rm -rf $RPM_BUILD_ROOT
%dir %{py_sitedir}/gnuradio/fec
%attr(755,root,root) %{py_sitedir}/gnuradio/fec/*.so
%{py_sitedir}/gnuradio/fec/*.py*
+%dir %{py_sitedir}/gnuradio/fec/LDPC
+%{py_sitedir}/gnuradio/fec/LDPC/*.py*
+%dir %{py_sitedir}/gnuradio/fec/polar
+%{py_sitedir}/gnuradio/fec/polar/*.py*
%dir %{py_sitedir}/gnuradio/fft
%attr(755,root,root) %{py_sitedir}/gnuradio/fft/*.so
diff --git a/gsl.patch b/gsl.patch
new file mode 100644
index 0000000..166ac0e
--- /dev/null
+++ b/gsl.patch
@@ -0,0 +1,21 @@
+--- gnuradio-3.7.9.2/cmake/Modules/FindGSL.cmake~ 2015-07-24 14:19:36.000000000 +0000
++++ gnuradio-3.7.9.2/cmake/Modules/FindGSL.cmake 2016-05-23 05:35:06.595603834 +0000
+@@ -18,10 +18,6 @@
+
+ INCLUDE(FindPkgConfig)
+ PKG_CHECK_MODULES(GSL "gsl >= 1.10")
+-IF(GSL_FOUND)
+- set(GSL_LIBRARY_DIRS ${GSL_LIBDIR})
+- set(GSL_INCLUDE_DIRS ${GSL_INCLUDEDIR})
+-ELSE(GSL_FOUND)
+ set( GSL_FOUND OFF )
+ set( GSL_CBLAS_FOUND OFF )
+
+@@ -143,7 +139,5 @@
+ #needed for gsl windows port but safe to always define
+ LIST(APPEND GSL_DEFINITIONS "-DGSL_DLL")
+
+-ENDIF(GSL_FOUND)
+-
+ INCLUDE(FindPackageHandleStandardArgs)
+ FIND_PACKAGE_HANDLE_STANDARD_ARGS(GSL DEFAULT_MSG GSL_LIBRARIES GSL_INCLUDE_DIRS GSL_LIBRARY_DIRS)
diff --git a/libexec.patch b/libexec.patch
new file mode 100644
index 0000000..3f4faf9
--- /dev/null
+++ b/libexec.patch
@@ -0,0 +1,11 @@
+--- gnuradio-3.7.9.2/CMakeLists.txt~ 2016-04-11 02:35:01.000000000 +0000
++++ gnuradio-3.7.9.2/CMakeLists.txt 2016-05-24 18:58:53.784633481 +0000
+@@ -150,7 +150,7 @@
+ set(GR_PKG_DATA_DIR ${GR_DATA_DIR}/${CMAKE_PROJECT_NAME} CACHE PATH "Path to install package data")
+ set(GR_DOC_DIR ${GR_DATA_DIR}/doc CACHE PATH "Path to install documentation")
+ set(GR_PKG_DOC_DIR ${GR_DOC_DIR}/${CMAKE_PROJECT_NAME}-${DOCVER} CACHE PATH "Path to install package docs")
+-set(GR_LIBEXEC_DIR libexec CACHE PATH "Path to install libexec files")
++set(GR_LIBEXEC_DIR lib${LIB_SUFFIX} CACHE PATH "Path to install libexec files")
+ set(GR_PKG_LIBEXEC_DIR ${GR_LIBEXEC_DIR}/${CMAKE_PROJECT_NAME} CACHE PATH "Path to install package libexec files")
+ set(GRC_BLOCKS_DIR ${GR_PKG_DATA_DIR}/grc/blocks CACHE PATH "Path to install GRC blocks")
+ set(GR_THEMES_DIR ${GR_PKG_DATA_DIR}/themes CACHE PATH "Path to install QTGUI themes")
diff --git a/link.patch b/link.patch
new file mode 100644
index 0000000..0b4d137
--- /dev/null
+++ b/link.patch
@@ -0,0 +1,57 @@
+diff -ur gnuradio-3.7.9.2.orig/gnuradio-runtime/lib/CMakeLists.txt gnuradio-3.7.9.2/gnuradio-runtime/lib/CMakeLists.txt
+--- gnuradio-3.7.9.2.orig/gnuradio-runtime/lib/CMakeLists.txt 2015-08-28 14:47:45.000000000 +0000
++++ gnuradio-3.7.9.2/gnuradio-runtime/lib/CMakeLists.txt 2016-05-23 05:30:48.922358208 +0000
+@@ -154,7 +154,7 @@
+
+ #need to link with librt on ubuntu 11.10 for shm_*
+ if(LINUX)
+- list(APPEND gnuradio_runtime_libs rt)
++ list(APPEND gnuradio_runtime_libs rt pthread)
+ endif()
+
+ ########################################################################
+diff -ur gnuradio-3.7.9.2.orig/gr-audio/lib/CMakeLists.txt gnuradio-3.7.9.2/gr-audio/lib/CMakeLists.txt
+--- gnuradio-3.7.9.2.orig/gr-audio/lib/CMakeLists.txt 2015-04-13 14:32:43.000000000 +0000
++++ gnuradio-3.7.9.2/gr-audio/lib/CMakeLists.txt 2016-05-23 05:30:48.922358208 +0000
+@@ -96,7 +96,7 @@
+
+ include_directories(BEFORE ${CMAKE_CURRENT_SOURCE_DIR}/jack)
+ include_directories(${JACK_INCLUDE_DIRS})
+- list(APPEND gr_audio_libs ${JACK_LIBRARIES})
++ list(APPEND gr_audio_libs ${JACK_LIBRARIES} pthread)
+ add_definitions(${JACK_DEFINITIONS})
+ list(APPEND gr_audio_sources
+ ${CMAKE_CURRENT_SOURCE_DIR}/jack/jack_impl.cc
+diff -ur gnuradio-3.7.9.2.orig/gr-fcd/lib/CMakeLists.txt gnuradio-3.7.9.2/gr-fcd/lib/CMakeLists.txt
+--- gnuradio-3.7.9.2.orig/gr-fcd/lib/CMakeLists.txt 2015-04-13 14:32:43.000000000 +0000
++++ gnuradio-3.7.9.2/gr-fcd/lib/CMakeLists.txt 2016-05-23 05:30:48.925691583 +0000
+@@ -88,7 +88,7 @@
+
+ add_library(gnuradio-fcd SHARED ${gr_fcd_sources})
+ if (LINUX)
+- list(APPEND fcd_libs rt)
++ list(APPEND fcd_libs rt pthread)
+ endif()
+ target_link_libraries(gnuradio-fcd ${fcd_libs} ${LOG4CPP_LIBRARIES})
+
+diff -ur gnuradio-3.7.9.2.orig/volk/lib/CMakeLists.txt gnuradio-3.7.9.2/volk/lib/CMakeLists.txt
+--- gnuradio-3.7.9.2.orig/volk/lib/CMakeLists.txt 2016-03-31 05:23:12.000000000 +0000
++++ gnuradio-3.7.9.2/volk/lib/CMakeLists.txt 2016-05-23 05:30:48.925691583 +0000
+@@ -534,7 +534,7 @@
+
+ #Add dynamic library
+ add_library(volk SHARED $<TARGET_OBJECTS:volk_obj>)
+- target_link_libraries(volk ${volk_libraries})
++ target_link_libraries(volk ${volk_libraries} m)
+
+ #Configure target properties
+ set_target_properties(volk_obj PROPERTIES COMPILE_FLAGS "-fPIC")
+@@ -563,7 +563,7 @@
+ else()
+ #create the volk runtime library
+ add_library(volk SHARED ${volk_sources})
+- target_link_libraries(volk ${volk_libraries})
++ target_link_libraries(volk ${volk_libraries} m)
+ set_target_properties(volk PROPERTIES SOVERSION ${LIBVER})
+ set_target_properties(volk PROPERTIES DEFINE_SYMBOL "volk_EXPORTS")
+
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/gnuradio.git/commitdiff/d6476722d6b8662a30334b350fe8611cadc0a217
More information about the pld-cvs-commit
mailing list