From 48c93b62f00fa0060cbb582ecd4da252897ac99c Mon Sep 17 00:00:00 2001 From: Jaroslav Škarvada Date: Jun 28 2018 14:52:09 +0000 Subject: New version Dropped unbundle-hidapi, doxygen-fix patches, soname-fix (not needed) Enabled parallel build --- diff --git a/gr-fcdproplus-3.7.2-build-fix.patch b/gr-fcdproplus-3.7.2-build-fix.patch deleted file mode 100644 index 98626cf..0000000 --- a/gr-fcdproplus-3.7.2-build-fix.patch +++ /dev/null @@ -1,44 +0,0 @@ -diff --git a/swig/CMakeLists.txt b/swig/CMakeLists.txt -index 910fb11..75b306b 100644 ---- a/swig/CMakeLists.txt -+++ b/swig/CMakeLists.txt -@@ -36,8 +36,8 @@ foreach(incdir ${GNURADIO_RUNTIME_INCLUDE_DIRS}) - endforeach(incdir) - - set(GR_SWIG_LIBRARIES gnuradio-fcdproplus) --set(GR_SWIG_DOC_FILE ${CMAKE_CURRENT_BINARY_DIR}/fcdproplus_swig_doc.i) --set(GR_SWIG_DOC_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/../include) -+#set(GR_SWIG_DOC_FILE ${CMAKE_CURRENT_BINARY_DIR}/fcdproplus_swig_doc.i) -+#set(GR_SWIG_DOC_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/../include) - - GR_SWIG_MAKE(fcdproplus_swig fcdproplus_swig.i) - -@@ -49,9 +49,9 @@ GR_SWIG_INSTALL(TARGETS fcdproplus_swig DESTINATION ${GR_PYTHON_DIR}/fcdproplus) - ######################################################################## - # Install swig .i files for development - ######################################################################## --install( -- FILES -- fcdproplus_swig.i -- ${CMAKE_CURRENT_BINARY_DIR}/fcdproplus_swig_doc.i -- DESTINATION ${GR_INCLUDE_DIR}/fcdproplus/swig --) -+#install( -+# FILES -+# fcdproplus_swig.i -+# ${CMAKE_CURRENT_BINARY_DIR}/fcdproplus_swig_doc.i -+# DESTINATION ${GR_INCLUDE_DIR}/fcdproplus/swig -+#) -diff --git a/swig/fcdproplus_swig.i b/swig/fcdproplus_swig.i -index b58050b..6cc37da 100644 ---- a/swig/fcdproplus_swig.i -+++ b/swig/fcdproplus_swig.i -@@ -5,7 +5,7 @@ - %include "gnuradio.i" // the common stuff - - //load generated python docstrings --%include "fcdproplus_swig_doc.i" -+//%include "fcdproplus_swig_doc.i" - - %{ - #include "fcdproplus/fcdproplus.h" diff --git a/gr-fcdproplus.spec b/gr-fcdproplus.spec index 43bc4ca..4e29e23 100644 --- a/gr-fcdproplus.spec +++ b/gr-fcdproplus.spec @@ -52,7 +52,7 @@ cd build # used -Wl,--as-needed to fix unused-direct-shlib-dependency rpmlint warning export LDFLAGS="-Wl,--as-needed %{?__global_ldflags}" %cmake -DENABLE_DOXYGEN=on -DGR_PKG_DOC_DIR=%{_docdir}/%{name} .. -make -j1 +make %{?_smp_mflags} %install cd build @@ -87,7 +87,7 @@ install -Dpm 0644 %{S:1} %{buildroot}%{_prefix}/lib/udev/rules.d/10-fcdproplus.r * Mon Jun 18 2018 Jaroslav Škarvada - 3.7.2-0.1.rc1.20180618gite5ff8396 - New version - Dropped unbundle-hidapi, doxygen-fix patches, soname-fix (not needed) -- Added build-fix patch as asworkaround for probably gnuradio bug in macro +- Enabled parallel build * Mon Jun 18 2018 Jaroslav Škarvada - 0-0.32.20140920git1edbe523 - Rebuilt for new gnuradio