building gnuradio, some workarounds

5 files changed, 8 insertions, 1 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0671223..c692cc5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -61,6 +61,8 @@ add_subdirectory(tests)
 set(CMAKE_SOURCE_DIR ${GRAS_SOURCE_DIR}/gnuradio)
 set(CMAKE_BINARY_DIR ${GRAS_BINARY_DIR}/gnuradio)
 
+set(GRAS_LIBRARIES gras) #for submodule linking
+
 add_subdirectory(gnuradio)
 
 ########################################################################
diff --git a/gnuradio b/gnuradio
-Subproject 59f9e558daeb3d148a26fbb56fedc8f1dac1a5b
+Subproject c0a983166dbbd8b2c033ff8b3662b7daeef8ce8
diff --git a/include/gras/block.hpp b/include/gras/block.hpp
index 983d54a..acc5d0c 100644
--- a/include/gras/block.hpp
+++ b/include/gras/block.hpp
@@ -183,6 +183,7 @@ struct GRAS_API Block : Element
     //! Return options for the work call
     enum
     {
+        WORK_DONE_ON_INPUT = -3,
         WORK_CALLED_PRODUCE = -2,
         WORK_DONE = -1
     };
diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
index 0657f28..5987d46 100644
--- a/lib/CMakeLists.txt
+++ b/lib/CMakeLists.txt
@@ -58,7 +58,7 @@ list(APPEND GRAS_SOURCES
 ########################################################################
 # Build library
 ########################################################################
-add_library(gras SHARED ${GRAS_SOURCES})
+add_library(gras STATIC ${GRAS_SOURCES})
 target_link_libraries(gras ${GRAS_LIBRARIES})
 
 install(TARGETS gras
diff --git a/lib/block_task.cpp b/lib/block_task.cpp
index be97af2..f3ddb04 100644
--- a/lib/block_task.cpp
+++ b/lib/block_task.cpp
@@ -224,6 +224,10 @@ void BlockActor::handle_task(void)
         }
     }
 
+    //workaround:
+    if (num_outputs) output_items[0].size() = work_noutput_items;
+    else input_items[0].size() = work_noutput_items;
+
     //------------------------------------------------------------------
     //-- the work
     //------------------------------------------------------------------