Fix meson -Dblob=true builds for static ##windows

libr/anal/meson.build

@@ -223,7 +223,7 @@ r_anal_static = static_library('r_anal_static', r_anal_sources,
     r_syscall_static_dep,
     r_flag_static_dep,
     r_hash_static_dep,
-    java_dep,
+    java_static_dep,
     capstone_dep
   ],
   install: true,

libr/asm/meson.build

@@ -225,7 +225,7 @@ r_asm_static = static_library('r_asm_static', r_asm_sources,
     r_flag_static_dep,
     r_socket_static_dep,
     capstone_dep,
-    java_dep
+    java_static_dep
   ],
   install: true,
   implicit_include_directories: false,

libr/bin/format/elf/elf.c

@@ -300,7 +300,7 @@ static bool read_phdr(ELFOBJ *bin, bool linux_kernel_hack) {
 static int init_phdr(ELFOBJ *bin) {
 	ut32 phdr_size;
 
-	r_return_val_if_fail (!bin->phdr, false);
+	r_return_val_if_fail (bin && !bin->phdr, false);
 
 	if (!bin->ehdr.e_phnum) {
 		return false;

libr/bin/meson.build

@@ -180,7 +180,7 @@ r_bin_static = static_library('r_bin_static', r_bin_sources,
     r_magic_static_dep,
     r_socket_static_dep,
     r_syscall_static_dep,
-    java_dep,
+    java_static_dep,
     lz4_dep,
     yxml_dep
   ],

libr/cons/meson.build

@@ -39,8 +39,8 @@ r_cons_dep = declare_dependency(link_with: r_cons,
 r_cons_static = static_library('r_cons_static', r_cons_sources,
   include_directories: [platform_inc],
   c_args: library_cflags,
-  dependencies: [r_util_dep],
-  link_with: [r_util],
+  dependencies: [r_util_static_dep],
+  link_with: [r_util_static],
   install: true,
   implicit_include_directories: false,
   install_rpath: rpath_lib,

libr/core/meson.build

@@ -128,8 +128,8 @@ r_core_static_deps = [
   r_asm_static_dep,
   r_bp_static_dep,
   platform_deps,
-  gdb_dep,
-  java_dep,
+  gdb_static_dep,
+  java_static_dep,
   lrt
 ]
 

libr/debug/meson.build

@@ -67,9 +67,9 @@ r_debug_static_deps = [
   r_egg_static_dep,
   r_socket_static_dep,
   winkd_static_dep,
-  qnx_dep,
-  gdb_dep,
-  bochs_dep,
+  qnx_static_dep,
+  gdb_static_dep,
+  bochs_static_dep,
 ]
 
 if host_machine.system() == 'linux' or host_machine.system() == 'android'

libr/fs/meson.build

@@ -8,10 +8,12 @@ r_fs_sources = [
 ]
 
 r_fs_deps = [ r_util_dep ]
+r_fs_static_deps = [ r_util_static_dep ]
 r_fs_cflags = [ library_cflags ]
 
 if not user_plugins.contains('nogrub') and not get_option('nogpl')
   r_fs_deps += [ grub_dep ]
+  r_fs_static_deps += [ grub_static_dep ]
   r_fs_sources += [
     'p/fs_cpio.c',
     'p/fs_ext2.c',
@@ -58,7 +60,7 @@ r_fs_dep = declare_dependency(link_with: r_fs,
 r_fs_static = static_library('r_fs_static', r_fs_sources,
   include_directories: platform_inc,
   c_args: r_fs_cflags,
-  dependencies: r_fs_deps,
+  dependencies: r_fs_static_deps,
   install: true,
   implicit_include_directories: false,
 )

libr/magic/meson.build

@@ -10,9 +10,12 @@ r_magic_sources = [
 ]
 
 r_magic_deps = [r_util_dep]
+r_magic_static_deps = [r_util_static_dep]
+
 if use_syslib_magic
   message('Use system-provided magic library')
   r_magic_deps += [sys_magic]
+  r_magic_static_deps += [sys_magic]
 else
   message('Use bundled magic library')
 endif
@@ -35,7 +38,7 @@ r_magic_dep = declare_dependency(
 r_magic_static = static_library('r_magic_static', r_magic_sources,
   include_directories: platform_inc,
   c_args: library_cflags,
-  dependencies: r_magic_deps,
+  dependencies: r_magic_static_deps,
   install: true,
   implicit_include_directories: false,
 )

libr/reg/meson.build

@@ -23,7 +23,7 @@ r_reg_dep = declare_dependency(link_with: r_reg,
 r_reg_static = static_library('r_reg_static', r_reg_sources,
   include_directories: [platform_inc],
   c_args: library_cflags,
-  dependencies: [r_util_dep],
+  dependencies: [r_util_static_dep],
   install: true,
   implicit_include_directories: false,
 )

libr/socket/meson.build

@@ -11,9 +11,11 @@ r_socket_sources = [
 ]
 
 r_util_deps = [utl, r_util_dep, platform_deps]
+r_util_static_deps = [utl, r_util_static_dep, platform_deps]
 
 if use_sys_openssl
   r_util_deps += [sys_openssl]
+  r_util_static_deps += [sys_openssl]
 endif
 
 r_socket = library('r_socket', r_socket_sources,
@@ -33,8 +35,8 @@ r_socket_dep = declare_dependency(link_with: r_socket,
 
 r_socket_static = static_library('r_socket_static', r_socket_sources,
   include_directories: [platform_inc],
-  dependencies: r_util_deps,
-  link_with: [r_util],
+  dependencies: r_util_static_deps,
+  link_with: [r_util_static],
   c_args: library_cflags,
   install: true,
   implicit_include_directories: false,

shlr/meson.build

@@ -260,6 +260,16 @@ java_dep = declare_dependency(
   include_directories: java_inc
 )
 
+libr2java_static = static_library('r2java_static', java_files,
+  dependencies: [r_util_static_dep],
+  include_directories: java_inc,
+  implicit_include_directories: false
+)
+
+java_static_dep = declare_dependency(
+  link_with: libr2java_static,
+  include_directories: java_inc
+)
 
 # handle qnx dependency
 qnx_files = [
@@ -361,6 +371,17 @@ grub_dep = declare_dependency(
   include_directories: grub_inc
 )
 
+libr2grub_static = static_library('r2grub_static', grub_files,
+  dependencies: [r_util_static_dep],
+  include_directories: grub_inc,
+  implicit_include_directories: false
+)
+
+grub_static_dep = declare_dependency(
+  link_with: libr2grub_static,
+  include_directories: grub_inc
+)
+
 # handle winkd dependency
 winkd_files = [
   'winkd/iob_pipe.c',