Merge branch 'develop' of https://gitlab.demlabs.net/cellframe/cellframe-sdk into develop

dap-sdk/plugin/CMakeLists.txt

@@ -12,7 +12,7 @@ add_library(${PROJECT_NAME} STATIC ${DAP_PLUGIN_SRCS} ${DAP_PLUGIN_HEADERS})
 
 target_link_libraries(${PROJECT_NAME})
 
-target_link_libraries(${PROJECT_NAME} dap_core dap_cli_server)
+target_link_libraries(${PROJECT_NAME} dap_core dap_cli_server dl)
 
 target_include_directories(${PROJECT_NAME} PUBLIC include/ )
 

dap-sdk/plugin/src/dap_plugin_binary.c

@@ -89,7 +89,7 @@ static int s_type_callback_load(dap_plugin_manifest_t * a_manifest, void ** a_pv
 #if defined (DAP_OS_DARWIN)
     char * l_path = dap_strdup_printf("%s/%s.darwin.%s.dylib",a_manifest->path,a_manifest->name,dap_get_arch());
 #elif defined (DAP_OS_LINUX)
-    char * l_path = dap_strdup_printf("%s/lib%s.linux.common.%s.so",a_manifest->path,a_manifest->name,dap_get_arch());
+    char * l_path = dap_strdup_printf("%s/%s.linux-common.%s.so",a_manifest->path,a_manifest->name,dap_get_arch());
 #endif
     l_pvt_data->handle = dlopen(l_path, RTLD_NOW | RTLD_GLOBAL); // Try with specified architecture first
     if(l_pvt_data->handle){

dap-sdk/plugin/src/dap_plugin_manifest.c

@@ -11,7 +11,7 @@
 
 #define LOG_TAG "dap_plugin_manifest"
 
-dap_plugin_manifest_t* s_manifests = NULL;
+static dap_plugin_manifest_t* s_manifests = NULL;
 
 static void s_manifest_delete(dap_plugin_manifest_t *a_manifest);