Refactor meson build dependencies ##build

Author: quetz

binr/blob/meson.build

@@ -2,7 +2,6 @@ executable('r2blob', 'r2blob.c',
   include_directories: [platform_inc],
   dependencies: [
     r_main_dep,
-    r_util_dep,
   ],
   install: true,
   install_rpath: rpath_exe,
@@ -13,7 +12,6 @@ executable('r2blob.static', 'r2blob.c',
   include_directories: [platform_inc],
   dependencies: [
     r_main_static_dep,
-    r_util_static_dep,
   ],
   install: true,
   install_rpath: rpath_exe,

libr/cons/meson.build

@@ -21,26 +21,27 @@ r_cons_sources = [
   'winutils.c'
 ]
 
+r_cons_deps = [r_util_dep]
+
 r_cons = library('r_cons', r_cons_sources,
   include_directories: [platform_inc],
   c_args: library_cflags,
-  dependencies: [r_util_dep],
-  link_with: [r_util],
+  dependencies: r_cons_deps,
   install: true,
   implicit_include_directories: false,
   install_rpath: rpath_lib,
   soversion: r2_libversion
 )
 
 r_cons_dep = declare_dependency(link_with: r_cons,
+                                dependencies: r_cons_deps,
                                 include_directories: [platform_inc])
 
 if get_option('blob')
 r_cons_static = static_library('r_cons_static', r_cons_sources,
   include_directories: [platform_inc],
   c_args: library_cflags,
   dependencies: [r_util_static_dep],
-  link_with: [r_util_static],
   install: true,
   implicit_include_directories: false,
   install_rpath: rpath_lib,

libr/io/meson.build

@@ -100,7 +100,6 @@ endif
 
 r_io = library('r_io', r_io_sources,
   include_directories: platform_inc,
-  link_with: [r_util, r_cons, r_muta, r_socket],
   dependencies: r_io_deps,
   c_args: library_cflags,
   install: true,
@@ -109,7 +108,7 @@ r_io = library('r_io', r_io_sources,
   soversion: r2_libversion
 )
 
-r_io_dep = declare_dependency(link_with: [r_io, r_muta],
+r_io_dep = declare_dependency(link_with: r_io,
   include_directories: platform_inc)
 
 if get_option('blob')
@@ -129,7 +128,6 @@ r_io_static_deps = [
 
 r_io_static = static_library('r_io_static', r_io_sources,
   include_directories: platform_inc,
-  link_with: [r_util_static, r_muta_static, r_cons_static, r_socket_static],
   dependencies: r_io_static_deps,
   c_args: library_cflags,
   install: true,

libr/muta/meson.build

@@ -64,7 +64,6 @@ endif
 r_muta = library('r_muta', r_muta_sources,
   include_directories: [platform_inc],
   dependencies: r_muta_deps,
-  link_with: [r_util],
   c_args: library_cflags,
   install: true,
   implicit_include_directories: false,
@@ -73,13 +72,13 @@ r_muta = library('r_muta', r_muta_sources,
 )
 
 r_muta_dep = declare_dependency(link_with: r_muta,
+  dependencies: r_muta_deps,
   include_directories: [platform_inc])
 
 if get_option('blob')
 r_muta_static = static_library('r_muta_static', r_muta_sources,
   include_directories: [platform_inc],
   dependencies: [r_util_static_dep],
-  link_with: [r_util_static],
   c_args: library_cflags,
   install: true,
   implicit_include_directories: false,

libr/socket/meson.build

@@ -10,11 +10,11 @@ r_socket_sources = [
   'run.c',
 ]
 
-r_util_deps = [utl, r_util_dep, platform_deps]
+r_socket_deps = [r_util_dep, platform_deps]
 if get_option('blob')
-  r_util_static_deps = [utl, r_util_static_dep, platform_deps]
+  r_socket_static_deps = [r_util_static_dep, platform_deps]
   if use_sys_openssl
-    r_util_static_deps += [sys_openssl]
+    r_socket_static_deps += [sys_openssl]
   endif
 endif
 
@@ -25,38 +25,32 @@ if host_machine.system() == 'haiku'
 endif
 
 if use_sys_openssl
-  r_util_deps += [sys_openssl]
+  r_socket_deps += [sys_openssl]
 endif
 
 r_socket = library('r_socket', r_socket_sources,
   include_directories: [platform_inc],
-  dependencies: r_util_deps,
-  link_with: [r_util],
+  dependencies: r_socket_deps,
   c_args: library_cflags,
   install: true,
   implicit_include_directories: false,
   install_rpath: rpath_lib,
   soversion: r2_libversion
 )
 
-r_socket_dep = declare_dependency(link_with: r_socket,
-  dependencies: [r_util_dep],
-  include_directories: [platform_inc])
+r_socket_dep = declare_dependency(link_with: r_socket, dependencies: r_socket_deps, include_directories: [platform_inc])
 
 if get_option('blob')
 r_socket_static = static_library('r_socket_static', r_socket_sources,
   include_directories: [platform_inc],
-  dependencies: r_util_static_deps,
-  link_with: [r_util_static],
+  dependencies: r_socket_static_deps,
   c_args: library_cflags,
   install: true,
   implicit_include_directories: false,
   install_rpath: rpath_lib,
 )
 
-r_socket_static_dep = declare_dependency(link_with: r_socket_static,
-  dependencies: [r_util_static_dep],
-  include_directories: [platform_inc])
+r_socket_static_dep = declare_dependency(link_with: r_socket_static, include_directories: [platform_inc])
 endif
 
 pkgconfig_mod.generate(r_socket,

libr/util/meson.build

@@ -120,7 +120,7 @@ if not get_option('use_sys_lz4')
   library_cflags += ['-DUSE_RLZ4']
 endif
 
-r_util_deps = [ldl, mth, spp_dep, pth, utl, sdb_dep, lz4_dep, platform_deps]
+r_util_deps = [ldl, mth, spp_dep, pth, sdb_dep, lz4_dep, platform_deps]
 if get_option('use_zip')
   r_util_deps += [ zlib_dep ]
 endif

meson.build

@@ -134,7 +134,6 @@ message('r2 lib version: ' + r2_libversion)
 # required for linux
 ldl = cc.find_library('dl', required: false)
 pth = dependency('threads', required: false)
-utl = cc.find_library('util', required: false)
 if host_machine.system() == 'sunos'
   # workaround for Solaris until https://github.com/mesonbuild/meson/issues/4328 is fixed
   mth = declare_dependency(link_args: '-lm')

shlr/meson.build

@@ -97,7 +97,7 @@ qnx_files = [
   'qnx/src/utils.c',
 ]
 
-qnx_inc = [platform_inc, include_directories('qnx/include')]
+qnx_inc = [platform_inc, libsdb_includes, include_directories('qnx/include')]
 
 libr2qnx = static_library('r2qnx', qnx_files,
   dependencies: [r_socket_dep],