From 4648f448e19f076e1673d95773eab5bffd79efb2 Mon Sep 17 00:00:00 2001
From: pancake <pancake@nopcode.org>
Date: Tue, 15 Mar 2022 19:29:16 +0100
Subject: [PATCH] Fix some static meson blob dependency leftovers ##build

---
 libr/io/meson.build  |  8 ++++----
 shlr/gdb/meson.build | 11 +++++++++++
 shlr/meson.build     | 33 +++++++++++++++++++++++++++++++++
 3 files changed, 48 insertions(+), 4 deletions(-)

diff --git a/libr/io/meson.build b/libr/io/meson.build
index 09ec5d4b96..0a0f0fac5a 100644
--- a/libr/io/meson.build
+++ b/libr/io/meson.build
@@ -71,11 +71,11 @@ r_io_static_deps = [
   r_util_static_dep,
   r_socket_static_dep,
   winkd_static_dep,
-  bochs_dep,
-  gdb_dep,
-  qnx_dep,
+  bochs_static_dep,
+  gdb_static_dep,
+  qnx_static_dep,
+  ar_static_dep,
   zip_dep,
-  ar_dep,
   pth
 ]
 if host_machine.system() == 'linux' or host_machine.system() == 'android'
diff --git a/shlr/gdb/meson.build b/shlr/gdb/meson.build
index c13a11da76..a13aa68bc8 100644
--- a/shlr/gdb/meson.build
+++ b/shlr/gdb/meson.build
@@ -32,3 +32,14 @@ gdb_dep = declare_dependency(
   link_with: libr2gdb,
   include_directories: gdb_inc
 )
+
+libr2gdb_static = static_library('r2gdb_static', gdb_files,
+  include_directories: gdb_inc,
+  dependencies: [r_util_static_dep, r_cons_static_dep],
+  implicit_include_directories: false
+)
+
+gdb_static_dep = declare_dependency(
+  link_with: libr2gdb_static,
+  include_directories: gdb_inc
+)
diff --git a/shlr/meson.build b/shlr/meson.build
index fe9d2d35a1..e8d6a8131f 100644
--- a/shlr/meson.build
+++ b/shlr/meson.build
@@ -227,6 +227,17 @@ bochs_dep = declare_dependency(
   include_directories: bochs_inc
 )
 
+libr2bochs_static = static_library('r2bochs_static', bochs_files,
+  dependencies: [r_util_static_dep],
+  include_directories: bochs_inc,
+  implicit_include_directories: false
+)
+
+bochs_static_dep = declare_dependency(
+  link_with: libr2bochs_static,
+  include_directories: bochs_inc
+)
+
 
 # handle java dependency
 java_files = [
@@ -272,6 +283,17 @@ qnx_dep = declare_dependency(
   include_directories: qnx_inc
 )
 
+libr2qnx_static = static_library('r2qnx_static', qnx_files,
+  dependencies: [r_socket_static_dep],
+  include_directories: qnx_inc,
+  implicit_include_directories: false
+)
+
+qnx_static_dep = declare_dependency(
+  link_with: libr2qnx_static,
+  include_directories: qnx_inc
+)
+
 
 # handle grub dependency
 grub_files = [
@@ -390,6 +412,17 @@ ar_dep = declare_dependency(
   include_directories: ar_inc
 )
 
+libr2ar_static = static_library('r2ar_static', ar_files,
+  dependencies: [r_util_static_dep],
+  include_directories: ar_inc,
+  implicit_include_directories: false
+)
+
+ar_static_dep = declare_dependency(
+  link_with: libr2ar_static,
+  include_directories: ar_inc
+)
+
 # handle mpc dependency
 mpc_files = [
   'mpc/mpc.c'