SHA256
1
0
forked from pool/gnuradio
gnuradio/missing_library.patch
Martin Pluskal 53a91f1671 Accepting request 623468 from home:wkazubski:test:science
- Update to version 3.7.13.4
  * Fix Boost 1.67 linking issue
  * Logging - fixed issues where messages weren't properly written
    to stdout/stderr due to incorrect strings
  * gr-analog - `fmdet_cf`'s derivative coefficients were wrong.
  * gr-blocks - `skiphead` used to incorrectly handle tags, 
    now properly shifts
  * gr-digital - `qa_packet_format`: Unit test used to potentially
    lock up due to incorrect conditionals
    - `clock_recovery_cc`, `crc32_bb`: Accessing the `[0]` element
      of an empty vector is UB, even if you don't use the result
      afterwards.
  * gr-fec - `polar_encoder`/`_common`: Fixed multiple out-of-bound
    accesses due to insufficient vector length checks
  * gr-filter - `fft_filter`, `filter_delay`: Accessing the `[0]` 
    element of an empty vector is UB, even if you don't use the
    result afterwards.
- Patch missing_libraries.patch modified

OBS-URL: https://build.opensuse.org/request/show/623468
OBS-URL: https://build.opensuse.org/package/show/hardware:sdr/gnuradio?expand=0&rev=20
2018-07-18 06:36:00 +00:00

66 lines
2.5 KiB
Diff

Index: gnuradio-3.7.12.0/gr-uhd/gnuradio-uhd.pc.in
===================================================================
--- gnuradio-3.7.12.0.orig/gr-uhd/gnuradio-uhd.pc.in
+++ gnuradio-3.7.12.0/gr-uhd/gnuradio-uhd.pc.in
@@ -7,5 +7,5 @@ Name: gnuradio-uhd
Description: GNU Radio blocks for UHD
Requires: gnuradio-runtime
Version: @LIBVER@
-Libs: -L${libdir} -lgnuradio-uhd
+Libs: -L${libdir} -lgnuradio-uhd -lpthread
Cflags: -I${includedir}
Index: gnuradio-3.7.12.0/gr-uhd/examples/c++/CMakeLists.txt
===================================================================
--- gnuradio-3.7.12.0.orig/gr-uhd/examples/c++/CMakeLists.txt
+++ gnuradio-3.7.12.0/gr-uhd/examples/c++/CMakeLists.txt
@@ -31,6 +31,9 @@ include_directories(
link_directories(${UHD_LIBRARY_DIRS})
link_directories(${Boost_LIBRARY_DIRS})
+set(THREADS_PREFER_PTHREAD_FLAG ON)
+find_package(Threads REQUIRED)
+
########################################################################
# Build executable
########################################################################
Index: gnuradio-3.7.12.0/volk/lib/CMakeLists.txt
===================================================================
--- gnuradio-3.7.12.0.orig/volk/lib/CMakeLists.txt
+++ gnuradio-3.7.12.0/volk/lib/CMakeLists.txt
@@ -532,7 +532,7 @@ if(CMAKE_VERSION VERSION_GREATER "2.8.11
#Add dynamic library
add_library(volk SHARED $<TARGET_OBJECTS:volk_obj>)
- target_link_libraries(volk ${volk_libraries})
+ target_link_libraries(volk ${volk_libraries} "m")
target_include_directories(volk
PUBLIC ${PROJECT_BINARY_DIR}/include
PUBLIC ${PROJECT_SOURCE_DIR}/include
@@ -574,7 +574,7 @@ if(CMAKE_VERSION VERSION_GREATER "2.8.11
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")
include_directories(volk
PUBLIC ${PROJECT_BINARY_DIR}/include
PUBLIC ${PROJECT_SOURCE_DIR}/include
Index: gnuradio-3.7.12.0/gnuradio-runtime/lib/pmt/CMakeLists.txt
===================================================================
--- gnuradio-3.7.12.0.orig/gnuradio-runtime/lib/pmt/CMakeLists.txt
+++ gnuradio-3.7.12.0/gnuradio-runtime/lib/pmt/CMakeLists.txt
@@ -81,9 +81,13 @@ set(pmt_sources
${CMAKE_CURRENT_SOURCE_DIR}/pmt_serialize.cc
)
+set(THREADS_PREFER_PTHREAD_FLAG ON)
+find_package(Threads REQUIRED)
+
list(APPEND gnuradio_pmt_libs
${Boost_LIBRARIES}
${LOG4CPP_LIBRARIES}
+ Threads::Threads
)
add_custom_target(pmt_generated