Link sdb and spp libs wholly to rz_util (#951)

librz/core/meson.build

@@ -102,8 +102,9 @@ rz_core_deps = [
   rz_bin_dep,
   platform_deps,
   gdb_dep,
+  shell_parser_dep,
   lrt,
-  shell_parser_dep
+  mth
 ]
 
 if libuv_dep.found()

librz/lang/meson.build

@@ -11,10 +11,8 @@ rz_lang_sources = [
   #'p/spp.c',
 ]
 
-spp_inc = [platform_inc, include_directories('../../shlr/spp')]
-
 rz_lang = library('rz_lang', rz_lang_sources,
-  include_directories: [platform_inc, spp_inc],
+  include_directories: platform_inc,
   c_args: library_cflags,
   dependencies: [rz_util_dep, rz_cons_dep],
   install: true,

librz/util/meson.build

@@ -85,7 +85,7 @@ rz_util_sources = [
   'subprocess.c',
 ]
 
-rz_util_deps = [ldl, lrt, mth, spp_dep, pth, utl, sdb_dep, zlib_dep, platform_deps]
+rz_util_deps = [ldl, lrt, mth, pth, utl, sdb_dep, spp_dep, zlib_dep, platform_deps]
 if host_machine.system().startswith('freebsd') or host_machine.system().startswith('netbsd') or host_machine.system().startswith('haiku')
   # backtrace_symbols_fd requires -lexecinfo
   rz_util_deps += [cc.find_library('execinfo', static: is_static_build)]
@@ -108,9 +108,14 @@ rz_util = library('rz_util', rz_util_sources,
   soversion: rizin_libversion
 )
 
-rz_util_dep = declare_dependency(link_with: rz_util,
-                                include_directories: platform_inc,
-                                dependencies: rz_util_deps)
+rz_util_dep = declare_dependency(
+  link_with: rz_util,
+  include_directories: platform_inc,
+  dependencies: [
+    sdb_dep.partial_dependency(includes: true),
+    spp_dep.partial_dependency(includes: true)
+  ]
+)
 
 pkgconfig_mod.generate(rz_util,
   subdirs: ['librz', 'librz/sdb'],

meson.build

@@ -428,7 +428,7 @@ if r.returncode() == 1 and get_option('subprojects_check')
 endif
 
 sdb_proj = subproject('sdb', default_options: ['default_library=static', 'sdb_includedir=' + rizin_incdir])
-sdb_dep = sdb_proj.get_variable('sdb_dep')
+sdb_dep = sdb_proj.get_variable('sdb_whole_dep')
 sdb_exe  = sdb_proj.get_variable('sdb_native_exe')
 
 sdb_gen_cmd = [
@@ -445,14 +445,14 @@ spp_files = [
 spp_inc = [platform_inc, include_directories('shlr/spp')]
 
 librzspp = static_library('rzspp', spp_files,
-  dependencies: sdb_dep,
+  dependencies: sdb_dep.partial_dependency(includes: true),
   include_directories: spp_inc,
   c_args: ['-DHAVE_R_UTIL', '-DUSE_R2=1'],
   implicit_include_directories: false
 )
 
 spp_dep = declare_dependency(
-  link_with: librzspp,
+  link_whole: librzspp,
   include_directories: spp_inc
 )
 

subprojects/sdb.wrap

@@ -1,3 +1,3 @@
 [wrap-git]
 url = https://github.com/rizinorg/sdb.git
-revision = 29ce97365dead99bf6892d07bd2692aa169ff2ac
+revision = 248f8950580ef344430603d408a08b4fd6664744