gnuradio: update to 3.10.0.0

- gr-pdu: Protocol Data Units library
- gr-iio: Linux industrial I/O library (but not packaged in pkgsrc)
- Custom Buffers Support
- switch from Log4CPP to spdlog

10 files changed, 94 insertions, 53 deletions

diff --git a/ham/gnuradio-core/Makefile b/ham/gnuradio-core/Makefile
index b6ad4511d06..3b3d847acc9 100644
--- a/ham/gnuradio-core/Makefile
+++ b/ham/gnuradio-core/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.89 2022/01/10 01:46:35 ryoon Exp $
+# $NetBSD: Makefile,v 1.90 2022/01/16 18:06:25 tnn Exp $
 
 PKGNAME=	gnuradio-core-${VERSION}
-PKGREVISION=	1
 COMMENT=	Core part of GNU Radio, all others need this
 
 PLIST_MINUS=	# empty
diff --git a/ham/gnuradio-core/Makefile.common b/ham/gnuradio-core/Makefile.common
index b31ac98813a..6fee22a3eac 100644
--- a/ham/gnuradio-core/Makefile.common
+++ b/ham/gnuradio-core/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.35 2021/06/27 08:08:59 tnn Exp $
+# $NetBSD: Makefile.common,v 1.36 2022/01/16 18:06:25 tnn Exp $
 # This Makefile fragment is included in the package Makefiles for
 # GNU Radio distributed packages (they all share common configure and build
 # settings).
@@ -81,8 +81,6 @@ CMAKE_ARGS+=	-DENABLE_GR_BLOCKS=ON
 CMAKE_ARGS+=	-DENABLE_GR_FFT=ON
 CMAKE_ARGS+=	-DENABLE_GR_FILTER=ON
 CMAKE_ARGS+=	-DENABLE_PYTHON=ON
-CMAKE_ARGS+=	-DENABLE_VOLK=ON -DENABLE_INTERNAL_VOLK=OFF
-CMAKE_ARGS+=	-DCMAKE_HAVE_PTHREADS_CREATE=OFF
 
 CMAKE_ARGS+=	-DLIB_SUFFIX=""
 
@@ -93,7 +91,6 @@ CMAKE_ARGS+=	-DCMAKE_INCLUDE_PATH=${PREFIX}/include/portaudio2
 CMAKE_ARGS+=	-DCMAKE_LIBRARY_PATH=${PREFIX}/lib/portaudio2
 CMAKE_ARGS+=	-DCMAKE_INSTALL_RPATH=${PREFIX}/lib:${PREFIX}/lib/portaudio2
 CMAKE_ARGS+=	-DCMAKE_INSTALL_RPATH_USE_LINK_PATH=TRUE
-CMAKE_ARGS+=	-DLIBUSB_INCLUDE_DIR=${PREFIX}/include/libusb-1.0
 CMAKE_ARGS+=	-Dpybind11_DIR=${PREFIX}/${PYSITELIB}/pybind11/share/cmake/pybind11
 
 CMAKE_ARGS+=	-DGR_LIBRARY_DIR=${PREFIX}/lib
@@ -140,15 +137,17 @@ do-install:
 .include	"../../devel/boost-libs/buildlink3.mk"
 .include	"../../devel/cppunit/buildlink3.mk"
 .include	"../../devel/gmp/buildlink3.mk"
+.include	"../../devel/spdlog/buildlink3.mk"
 BUILDLINK_API_DEPENDS.py-pybind11+=	${PYPKGPREFIX}-pybind11>=2.6.0
 .include	"../../devel/py-pybind11/buildlink3.mk"
 .include	"../../graphics/cairo/buildlink3.mk"
 .include	"../../graphics/cairo-gobject/buildlink3.mk"
+# FIXME should be optional
+.include	"../../lang/libunwind/buildlink3.mk"
 .include	"../../lang/python/application.mk"
 .include	"../../math/py-numpy/buildlink3.mk"
 .include	"../../math/fftw/buildlink3.mk"
 .include	"../../math/gsl/buildlink3.mk"
 .include	"../../math/volk/buildlink3.mk"
-.include	"../../textproc/log4cpp/buildlink3.mk"
 .include	"../../textproc/icu/buildlink3.mk"
 .include	"../../x11/gtk3/buildlink3.mk"
diff --git a/ham/gnuradio-core/PLIST b/ham/gnuradio-core/PLIST
index c4d63ae9eac..940b5b427ec 100644
--- a/ham/gnuradio-core/PLIST
+++ b/ham/gnuradio-core/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.34 2021/12/11 14:57:50 tnn Exp $
+@comment $NetBSD: PLIST,v 1.35 2022/01/16 18:06:25 tnn Exp $
 bin/gnuradio-config-info
 bin/gr_filter_design
 include/gnuradio/analog/agc.h
@@ -134,11 +134,6 @@ include/gnuradio/blocks/pack_k_bits.h
 include/gnuradio/blocks/pack_k_bits_bb.h
 include/gnuradio/blocks/packed_to_unpacked.h
 include/gnuradio/blocks/patterned_interleaver.h
-include/gnuradio/blocks/pdu.h
-include/gnuradio/blocks/pdu_filter.h
-include/gnuradio/blocks/pdu_remove.h
-include/gnuradio/blocks/pdu_set.h
-include/gnuradio/blocks/pdu_to_tagged_stream.h
 include/gnuradio/blocks/peak_detector.h
 include/gnuradio/blocks/peak_detector2_fb.h
 include/gnuradio/blocks/phase_shift.h
@@ -146,7 +141,6 @@ include/gnuradio/blocks/plateau_detector_fb.h
 include/gnuradio/blocks/probe_rate.h
 include/gnuradio/blocks/probe_signal.h
 include/gnuradio/blocks/probe_signal_v.h
-include/gnuradio/blocks/random_pdu.h
 include/gnuradio/blocks/regenerate_bb.h
 include/gnuradio/blocks/repack_bits_bb.h
 include/gnuradio/blocks/repeat.h
@@ -159,7 +153,6 @@ include/gnuradio/blocks/selector.h
 include/gnuradio/blocks/short_to_char.h
 include/gnuradio/blocks/short_to_float.h
 include/gnuradio/blocks/skiphead.h
-include/gnuradio/blocks/socket_pdu.h
 include/gnuradio/blocks/stream_demux.h
 include/gnuradio/blocks/stream_mux.h
 include/gnuradio/blocks/stream_to_streams.h
@@ -176,18 +169,13 @@ include/gnuradio/blocks/tagged_file_sink.h
 include/gnuradio/blocks/tagged_stream_align.h
 include/gnuradio/blocks/tagged_stream_multiply_length.h
 include/gnuradio/blocks/tagged_stream_mux.h
-include/gnuradio/blocks/tagged_stream_to_pdu.h
 include/gnuradio/blocks/tags_strobe.h
-include/gnuradio/blocks/tcp_server_sink.h
 include/gnuradio/blocks/test_tag_variable_rate_ff.h
 include/gnuradio/blocks/threshold_ff.h
 include/gnuradio/blocks/throttle.h
 include/gnuradio/blocks/transcendental.h
 include/gnuradio/blocks/tsb_vector_sink.h
-include/gnuradio/blocks/tuntap_pdu.h
 include/gnuradio/blocks/uchar_to_float.h
-include/gnuradio/blocks/udp_sink.h
-include/gnuradio/blocks/udp_source.h
 include/gnuradio/blocks/unpack_k_bits.h
 include/gnuradio/blocks/unpack_k_bits_bb.h
 include/gnuradio/blocks/unpacked_to_packed.h
@@ -204,8 +192,14 @@ include/gnuradio/blocks/wavfile_sink.h
 include/gnuradio/blocks/wavfile_source.h
 include/gnuradio/blocks/xor_blk.h
 include/gnuradio/buffer.h
+include/gnuradio/buffer_double_mapped.h
+include/gnuradio/buffer_reader.h
+include/gnuradio/buffer_reader_sm.h
+include/gnuradio/buffer_single_mapped.h
+include/gnuradio/buffer_type.h
 include/gnuradio/config.h
 include/gnuradio/constants.h
+include/gnuradio/custom_lock.h
 include/gnuradio/endianness.h
 include/gnuradio/expj.h
 include/gnuradio/fft/api.h
@@ -244,8 +238,6 @@ include/gnuradio/filter/mmse_fir_interpolator_cc.h
 include/gnuradio/filter/mmse_fir_interpolator_ff.h
 include/gnuradio/filter/mmse_interp_differentiator_cc.h
 include/gnuradio/filter/mmse_interp_differentiator_ff.h
-include/gnuradio/filter/mmse_interpolator_cc.h
-include/gnuradio/filter/mmse_interpolator_ff.h
 include/gnuradio/filter/mmse_resampler_cc.h
 include/gnuradio/filter/mmse_resampler_ff.h
 include/gnuradio/filter/pfb_arb_resampler.h
@@ -269,6 +261,7 @@ include/gnuradio/fxpt_vco.h
 include/gnuradio/gr_complex.h
 include/gnuradio/hier_block2.h
 include/gnuradio/high_res_timer.h
+include/gnuradio/host_buffer.h
 include/gnuradio/integer_math.h
 include/gnuradio/io_signature.h
 include/gnuradio/logger.h
@@ -279,11 +272,11 @@ include/gnuradio/messages/msg_accepter_msgq.h
 include/gnuradio/messages/msg_passing.h
 include/gnuradio/messages/msg_producer.h
 include/gnuradio/messages/msg_queue.h
-include/gnuradio/misc.h
 include/gnuradio/msg_accepter.h
 include/gnuradio/msg_handler.h
 include/gnuradio/msg_queue.h
 include/gnuradio/nco.h
+include/gnuradio/pdu.h
 include/gnuradio/prefs.h
 include/gnuradio/pycallback_object.h
 include/gnuradio/random.h
@@ -304,7 +297,6 @@ include/gnuradio/sync_block.h
 include/gnuradio/sync_decimator.h
 include/gnuradio/sync_interpolator.h
 include/gnuradio/sys_paths.h
-include/gnuradio/tag_checker.h
 include/gnuradio/tagged_stream_block.h
 include/gnuradio/tags.h
 include/gnuradio/thread/thread.h
@@ -312,7 +304,9 @@ include/gnuradio/thread/thread_body_wrapper.h
 include/gnuradio/thread/thread_group.h
 include/gnuradio/top_block.h
 include/gnuradio/tpb_detail.h
+include/gnuradio/transfer_type.h
 include/gnuradio/types.h
+include/gnuradio/xoroshiro128p.h
 include/pmt/api.h
 include/pmt/pmt.h
 include/pmt/pmt_pool.h
@@ -328,7 +322,6 @@ lib/cmake/gnuradio/FindGMP.cmake
 lib/cmake/gnuradio/FindGSM.cmake
 lib/cmake/gnuradio/FindGit.cmake
 lib/cmake/gnuradio/FindJACK.cmake
-lib/cmake/gnuradio/FindLOG4CPP.cmake
 lib/cmake/gnuradio/FindMPIR.cmake
 lib/cmake/gnuradio/FindMPLIB.cmake
 lib/cmake/gnuradio/FindMathJax2.cmake
@@ -339,12 +332,16 @@ lib/cmake/gnuradio/FindSNDFILE.cmake
 lib/cmake/gnuradio/FindTHRIFT.cmake
 lib/cmake/gnuradio/FindUHD.cmake
 lib/cmake/gnuradio/FindZeroMQ.cmake
+lib/cmake/gnuradio/Findlibad9361.cmake
+lib/cmake/gnuradio/Findlibiio.cmake
 lib/cmake/gnuradio/Findlibunwind.cmake
 lib/cmake/gnuradio/GnuradioConfig.cmake
 lib/cmake/gnuradio/GnuradioConfigVersion.cmake
 lib/cmake/gnuradio/GrBoost.cmake
 lib/cmake/gnuradio/GrBuildTypes.cmake
+lib/cmake/gnuradio/GrCompilerSettings.cmake
 lib/cmake/gnuradio/GrComponent.cmake
+lib/cmake/gnuradio/GrMinReq.cmake
 lib/cmake/gnuradio/GrMiscUtils.cmake
 lib/cmake/gnuradio/GrPlatform.cmake
 lib/cmake/gnuradio/GrPybind.cmake
@@ -374,25 +371,25 @@ lib/cmake/gnuradio/gnuradio-runtimeConfig.cmake
 lib/cmake/gnuradio/gnuradio-runtimeTargets-release.cmake
 lib/cmake/gnuradio/gnuradio-runtimeTargets.cmake
 lib/libgnuradio-analog.so
-lib/libgnuradio-analog.so.3.9.4
+lib/libgnuradio-analog.so.3.10.0
 lib/libgnuradio-analog.so.${PKGVERSION}
 lib/libgnuradio-audio.so
-lib/libgnuradio-audio.so.3.9.4
+lib/libgnuradio-audio.so.3.10.0
 lib/libgnuradio-audio.so.${PKGVERSION}
 lib/libgnuradio-blocks.so
-lib/libgnuradio-blocks.so.3.9.4
+lib/libgnuradio-blocks.so.3.10.0
 lib/libgnuradio-blocks.so.${PKGVERSION}
 lib/libgnuradio-fft.so
-lib/libgnuradio-fft.so.3.9.4
+lib/libgnuradio-fft.so.3.10.0
 lib/libgnuradio-fft.so.${PKGVERSION}
 lib/libgnuradio-filter.so
-lib/libgnuradio-filter.so.3.9.4
+lib/libgnuradio-filter.so.3.10.0
 lib/libgnuradio-filter.so.${PKGVERSION}
 lib/libgnuradio-pmt.so
-lib/libgnuradio-pmt.so.3.9.4
+lib/libgnuradio-pmt.so.3.10.0
 lib/libgnuradio-pmt.so.${PKGVERSION}
 lib/libgnuradio-runtime.so
-lib/libgnuradio-runtime.so.3.9.4
+lib/libgnuradio-runtime.so.3.10.0
 lib/libgnuradio-runtime.so.${PKGVERSION}
 lib/pkgconfig/gnuradio-analog.pc
 lib/pkgconfig/gnuradio-audio.pc
@@ -457,6 +454,9 @@ ${PYSITELIB}/gnuradio/blocks/msg_pair_to_var.pyo
 ${PYSITELIB}/gnuradio/blocks/parse_file_metadata.py
 ${PYSITELIB}/gnuradio/blocks/parse_file_metadata.pyc
 ${PYSITELIB}/gnuradio/blocks/parse_file_metadata.pyo
+${PYSITELIB}/gnuradio/blocks/pdu_compatibility.py
+${PYSITELIB}/gnuradio/blocks/pdu_compatibility.pyc
+${PYSITELIB}/gnuradio/blocks/pdu_compatibility.pyo
 ${PYSITELIB}/gnuradio/blocks/stream_to_vector_decimator.py
 ${PYSITELIB}/gnuradio/blocks/stream_to_vector_decimator.pyc
 ${PYSITELIB}/gnuradio/blocks/stream_to_vector_decimator.pyo
@@ -657,8 +657,3 @@ share/gnuradio/examples/tags/tagged_file_sink.grc
 share/gnuradio/examples/tags/test_file_tags.py
 share/gnuradio/examples/tags/test_tag_prop.grc
 share/gnuradio/examples/tags/uhd_burst_detector.py
-share/gnuradio/examples/volk_benchmark/README
-share/gnuradio/examples/volk_benchmark/volk_math.py
-share/gnuradio/examples/volk_benchmark/volk_plot.py
-share/gnuradio/examples/volk_benchmark/volk_test_funcs.py
-share/gnuradio/examples/volk_benchmark/volk_types.py
diff --git a/ham/gnuradio-core/buildlink3.mk b/ham/gnuradio-core/buildlink3.mk
index d7f24dd2f9c..2d7cbe70f2c 100644
--- a/ham/gnuradio-core/buildlink3.mk
+++ b/ham/gnuradio-core/buildlink3.mk
@@ -1,16 +1,16 @@
-# $NetBSD: buildlink3.mk,v 1.33 2021/12/11 14:57:50 tnn Exp $
+# $NetBSD: buildlink3.mk,v 1.34 2022/01/16 18:06:25 tnn Exp $
 
 BUILDLINK_TREE+=	gnuradio-core
 
 .if !defined(GNURADIO_CORE_BUILDLINK3_MK)
 GNURADIO_CORE_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.gnuradio-core+=	gnuradio-core>=3.9.4.0
-BUILDLINK_ABI_DEPENDS.gnuradio-core+=	gnuradio-core>=3.9.4.0
+BUILDLINK_API_DEPENDS.gnuradio-core+=	gnuradio-core>=3.10.0.0
 BUILDLINK_PKGSRCDIR.gnuradio-core?=	../../ham/gnuradio-core
 
 .include "../../devel/gmp/buildlink3.mk"
-.include "../../textproc/log4cpp/buildlink3.mk"
+.include "../../devel/spdlog/buildlink3.mk"
+.include "../../lang/libunwind/buildlink3.mk"
 .include "../../math/volk/buildlink3.mk"
 .endif # GNURADIO_CORE_BUILDLINK3_MK
 
diff --git a/ham/gnuradio-core/distinfo b/ham/gnuradio-core/distinfo
index 033ad61fc61..dedf9f77ff5 100644
--- a/ham/gnuradio-core/distinfo
+++ b/ham/gnuradio-core/distinfo
@@ -1,8 +1,11 @@
-$NetBSD: distinfo,v 1.45 2021/12/11 14:57:50 tnn Exp $
+$NetBSD: distinfo,v 1.46 2022/01/16 18:06:25 tnn Exp $
 
-BLAKE2s (gnuradio-3.9.4.0.tar.gz) = 33705adfc5e619f88647e17c1cd05ea8c3bebeac88c4a528f5d01940fe3f71f6
-SHA512 (gnuradio-3.9.4.0.tar.gz) = 61c8a943f3cc0b33e4d4994b9e0bf5f79458bb21a2648fe6094dfb9b50edea7452f1bd35e6b1e566e331cf7fb4ea2a342d59bbd8798d5710d80eb037f427a183
-Size (gnuradio-3.9.4.0.tar.gz) = 4243680 bytes
-SHA1 (patch-gnuradio-runtime_lib_constants.cc.in) = 1c82722bc97a1f6b8d58a80d45ce096fb4267870
+BLAKE2s (gnuradio-3.10.0.0.tar.gz) = f6104b70a50ee7ed85e344b7e3f2311994ef077bc12367a2e5ad1eb00522a53d
+SHA512 (gnuradio-3.10.0.0.tar.gz) = d0cded792c85148385f3c2d3db5b25d1329b345ee2a0afee28ab2c7aca9fd381ef9c4ed115e2e38bf6fab602c04d6cc2376ece0983d61fe3b8b354efe8a92086
+Size (gnuradio-3.10.0.0.tar.gz) = 4313414 bytes
+SHA1 (patch-cmake_Modules_GrPybind.cmake) = e2b42c840ca985dc3b1c0cba3029002a088c8407
+SHA1 (patch-gnuradio-runtime_CMakeLists.txt) = a5b2b60c7fcc46b5784027e08e137480c0cf3307
+SHA1 (patch-gnuradio-runtime_lib_CMakeLists.txt) = 310d0432de07cf5c03fbd9fd34dcb42733cf6367
+SHA1 (patch-gnuradio-runtime_lib_constants.cc.in) = fef80a546c713c565c3851ee7289b4fa3a49e45b
 SHA1 (patch-gr-audio_lib_CMakeLists.txt) = 9adacb93a20b2be596a23985306cbfd5f93c80a8
 SHA1 (patch-gr-audio_lib_alsa_alsa__impl_h) = cfa9b629e5cf21198cfd53cf27a908b5874866f4
diff --git a/ham/gnuradio-core/patches/patch-cmake_Modules_GrPybind.cmake b/ham/gnuradio-core/patches/patch-cmake_Modules_GrPybind.cmake
new file mode 100644
index 00000000000..fa9feeadbc7
--- /dev/null
+++ b/ham/gnuradio-core/patches/patch-cmake_Modules_GrPybind.cmake
@@ -0,0 +1,15 @@
+$NetBSD: patch-cmake_Modules_GrPybind.cmake,v 1.1 2022/01/16 18:06:25 tnn Exp $
+
+Disable use of precompiled headers; it doesn't play nice with pkgsrc nor ccache.
+
+--- cmake/Modules/GrPybind.cmake.orig	2022-01-14 15:27:04.000000000 +0000
++++ cmake/Modules/GrPybind.cmake
+@@ -158,7 +158,7 @@ target_include_directories(${name}_pytho
+ # Precompile the pybind11 header
+ # This should speed up building of the python bindings at least in larger modules
+ # This functionality is only available in CMake >= 3.16
+-if(${CMAKE_VERSION} VERSION_GREATER_EQUAL "3.16.0")
++if(false AND ${CMAKE_VERSION} VERSION_GREATER_EQUAL "3.16.0")
+   target_precompile_headers(
+     ${name}_python
+     PRIVATE
diff --git a/ham/gnuradio-core/patches/patch-gnuradio-runtime_CMakeLists.txt b/ham/gnuradio-core/patches/patch-gnuradio-runtime_CMakeLists.txt
new file mode 100644
index 00000000000..254750fb965
--- /dev/null
+++ b/ham/gnuradio-core/patches/patch-gnuradio-runtime_CMakeLists.txt
@@ -0,0 +1,15 @@
+$NetBSD: patch-gnuradio-runtime_CMakeLists.txt,v 1.1 2022/01/16 18:06:25 tnn Exp $
+
+Disable use of precompiled headers; it doesn't play nice with pkgsrc nor ccache.
+
+--- gnuradio-runtime/CMakeLists.txt.orig	2022-01-14 15:27:04.000000000 +0000
++++ gnuradio-runtime/CMakeLists.txt
+@@ -51,7 +51,7 @@ get_filename_component(GNURADIO_RUNTIME_
+ ########################################################################
+ # Setup precompiled header pseudo-component
+ ########################################################################
+-if(${CMAKE_VERSION} VERSION_GREATER_EQUAL "3.16.0")
++if(false AND ${CMAKE_VERSION} VERSION_GREATER_EQUAL "3.16.0")
+   set(GR_CMAKE_HAS_PCH ${CMAKE_VERSION})
+ endif()
+ 
diff --git a/ham/gnuradio-core/patches/patch-gnuradio-runtime_lib_CMakeLists.txt b/ham/gnuradio-core/patches/patch-gnuradio-runtime_lib_CMakeLists.txt
new file mode 100644
index 00000000000..f2d5c648c3e
--- /dev/null
+++ b/ham/gnuradio-core/patches/patch-gnuradio-runtime_lib_CMakeLists.txt
@@ -0,0 +1,15 @@
+$NetBSD: patch-gnuradio-runtime_lib_CMakeLists.txt,v 1.1 2022/01/16 18:06:25 tnn Exp $
+
+Disable use of precompiled headers; it doesn't play nice with pkgsrc nor ccache.
+
+--- gnuradio-runtime/lib/CMakeLists.txt.orig	2022-01-14 15:27:04.000000000 +0000
++++ gnuradio-runtime/lib/CMakeLists.txt
+@@ -171,7 +171,7 @@ target_compile_definitions(gnuradio-runt
+ # constants.cc includes boost::dll headers, force them to use std::filesystem
+ target_compile_definitions(gnuradio-runtime PRIVATE BOOST_DLL_USE_STD_FS)
+ 
+-if(${CMAKE_VERSION} VERSION_GREATER_EQUAL "3.16.0")
++if(false AND ${CMAKE_VERSION} VERSION_GREATER_EQUAL "3.16.0")
+   target_precompile_headers(
+     gnuradio-runtime
+     PRIVATE
diff --git a/ham/gnuradio-core/patches/patch-gnuradio-runtime_lib_constants.cc.in b/ham/gnuradio-core/patches/patch-gnuradio-runtime_lib_constants.cc.in
index 2ea3f505406..3dd1e47e31e 100644
--- a/ham/gnuradio-core/patches/patch-gnuradio-runtime_lib_constants.cc.in
+++ b/ham/gnuradio-core/patches/patch-gnuradio-runtime_lib_constants.cc.in
@@ -1,14 +1,14 @@
-$NetBSD: patch-gnuradio-runtime_lib_constants.cc.in,v 1.2 2021/12/11 14:57:50 tnn Exp $
+$NetBSD: patch-gnuradio-runtime_lib_constants.cc.in,v 1.3 2022/01/16 18:06:25 tnn Exp $
 
 Override broken PREFIX detection.
 
---- gnuradio-runtime/lib/constants.cc.in.orig	2021-10-31 14:28:27.000000000 +0000
+--- gnuradio-runtime/lib/constants.cc.in.orig	2022-01-14 15:27:04.000000000 +0000
 +++ gnuradio-runtime/lib/constants.cc.in
-@@ -28,6 +28,7 @@ const std::string prefix()
+@@ -27,6 +27,7 @@ const std::string prefix()
      if (prefix != NULL)
          return prefix;
  
 +    return "@PREFIX@";
      path prefix_rel_lib = "@prefix_relative_to_lib@";
-     path gr_runtime_lib_path = boost::dll::this_line_location();
-     // Ensure that the lib path is absolute (see next comment)
+     path gr_runtime_lib_path = boost::dll::this_line_location().string();
+     // Canonize before decomposing path so result is reliable and without symlinks
diff --git a/ham/gnuradio-core/version.mk b/ham/gnuradio-core/version.mk
index 19d010fc19d..a80ff49fea1 100644
--- a/ham/gnuradio-core/version.mk
+++ b/ham/gnuradio-core/version.mk
@@ -1,3 +1,3 @@
-# $NetBSD: version.mk,v 1.4 2021/12/11 14:57:50 tnn Exp $
+# $NetBSD: version.mk,v 1.5 2022/01/16 18:06:25 tnn Exp $
 
-VERSION=	3.9.4.0
+VERSION=	3.10.0.0