Meson private (#11331)

* meson: refactor library cflags
* meson: use visibility=hidden by default
* remove unused var
* magic/meson: replace tabs with spaces

libr/anal/meson.build

@@ -118,7 +118,7 @@ r_anal_inc = [
 
 r_anal = library('r_anal', files,
   include_directories: r_anal_inc,
-  c_args: ['-DCORELIB=1'],
+  c_args: library_cflags,
   dependencies: [
     r_util_dep,
     r_reg_dep,

libr/asm/meson.build

@@ -172,7 +172,7 @@ r_asm_inc = [
 
 r_asm = library('r_asm', files,
   include_directories: r_asm_inc,
-  c_args: ['-DCORELIB=1'],
+  c_args: library_cflags,
   dependencies: [
     r_util_dep,
     r_syscall_dep,

libr/bin/meson.build

@@ -119,7 +119,7 @@ r_bin_inc = [platform_inc, include_directories('mangling', 'format')]
 
 r_bin = library('r_bin', files,
   include_directories: r_bin_inc,
-  c_args: ['-DCORELIB=1', '-DR_API_BIN_ONLY=1'],
+  c_args: ['-DR_API_BIN_ONLY=1'] + library_cflags,
   dependencies: [
     r_util_dep,
     r_io_dep,

libr/bp/meson.build

@@ -14,7 +14,7 @@ files = [
 
 r_bp = library('r_bp', files,
   include_directories: [platform_inc],
-  c_args: ['-DCORELIB=1'],
+  c_args: library_cflags,
   dependencies: [r_util_dep],
   install: true,
   implicit_include_directories: false,

libr/cons/meson.build

@@ -19,6 +19,7 @@ files = [
 
 r_cons = library('r_cons', files,
   include_directories: [platform_inc],
+  c_args: library_cflags,
   dependencies: [r_util_dep, sdb_dep],
   install: true,
   implicit_include_directories: false,

libr/core/meson.build

@@ -69,7 +69,7 @@ r_core_inc = [platform_inc, include_directories(r_core_inc)]
 
 r_core = library('r_core', files,
   include_directories: r_core_inc,
-  c_args: ['-DCORELIB=1'],
+  c_args: library_cflags,
   dependencies: [
     r_util_dep,
     r_reg_dep,

libr/crypto/meson.build

@@ -23,7 +23,7 @@ files = [
 r_crypto = library('r_crypto', files,
   include_directories: [platform_inc],
   dependencies: [r_util_dep],
-  c_args: ['-DCORELIB=1'],
+  c_args: library_cflags,
   install: true,
   implicit_include_directories: false,
   soversion: r2_libversion

libr/debug/meson.build

@@ -64,7 +64,7 @@ r_debug_inc = [
 
 r_debug = library('r_debug', files,
   include_directories: r_debug_inc,
-  c_args: ['-DCORELIB=1'],
+  c_args: library_cflags,
   dependencies: [
     r_util_dep,
     r_hash_dep,
@@ -78,11 +78,11 @@ r_debug = library('r_debug', files,
     r_cons_dep,
     r_lang_dep,
     r_egg_dep,
-    r_socket_dep,
     windbg_dep,
     qnx_dep,
     gdb_dep,
     bochs_dep,
+    r_socket_dep,
     sdb_dep
   ],
   install: true,

libr/egg/meson.build

@@ -16,7 +16,7 @@ files = [
 
 r_egg = library('r_egg', files,
   include_directories: [platform_inc],
-  c_args: ['-DCORELIB=1'],
+  c_args: library_cflags,
   dependencies: [
     r_util_dep,
     r_asm_dep,

libr/flag/meson.build

@@ -8,6 +8,7 @@ files = [
 
 r_flag = library('r_flag', files,
   include_directories: [platform_inc],
+  c_args: library_cflags,
   dependencies: [
     r_util_dep,
     sdb_dep

libr/fs/meson.build

@@ -28,7 +28,7 @@ files = [
 
 r_fs = library('r_fs', files,
   include_directories: platform_inc,
-  c_args: ['-DCORELIB=1'],
+  c_args: library_cflags,
   dependencies: [
     r_util_dep,
     grub_dep

libr/hash/meson.build

@@ -25,6 +25,7 @@ endif
 
 r_hash = library('r_hash', files,
   include_directories: [platform_inc],
+  c_args: library_cflags,
   dependencies: dependencies,
   install: true,
   implicit_include_directories: false,

libr/io/meson.build

@@ -67,7 +67,7 @@ r_io = library('r_io', files,
     zip_dep,
     ar_dep
   ],
-  c_args: ['-DCORELIB=1'],
+  c_args: library_cflags,
   install: true,
   implicit_include_directories: false,
   soversion: r2_libversion

libr/lang/meson.build

@@ -12,7 +12,7 @@ files = [
 
 r_lang = library('r_lang', files,
   include_directories: [platform_inc],
-  c_args: ['-DCORELIB=1'],
+  c_args: library_cflags,
   dependencies: [r_util_dep, r_cons_dep],
   install: true,
   implicit_include_directories: false,

libr/magic/meson.build

@@ -16,16 +16,18 @@ if use_syslib_magic
 else
   message('Use bundled magic library')
   r_magic = library('r_magic', files,
-                    include_directories: platform_inc,
-                    c_args: ['-DCORELIB=1'],
-                    dependencies: [r_util_dep],
-                    install: true,
-                    implicit_include_directories: false,
-                    soversion: r2_libversion
-                   )
+    include_directories: platform_inc,
+    c_args: library_cflags,
+    dependencies: [r_util_dep],
+    install: true,
+    implicit_include_directories: false,
+    soversion: r2_libversion
+  )
 
-  r_magic_dep = declare_dependency(link_with: r_magic,
-                                   include_directories: platform_inc)
+  r_magic_dep = declare_dependency(
+    link_with: r_magic,
+    include_directories: platform_inc
+  )
 
   pkgconfig_mod.generate(
     libraries: [r_magic],

libr/parse/meson.build

@@ -19,7 +19,7 @@ files = [
 
 r_parse = library('r_parse', files,
   include_directories: platform_inc,
-  c_args: ['-DCORELIB=1'],
+  c_args: library_cflags,
   dependencies: [
     r_util_dep,
     r_flag_dep,

libr/reg/meson.build

@@ -9,6 +9,7 @@ files = [
 
 r_reg = library('r_reg', files,
   include_directories: [platform_inc],
+  c_args: library_cflags,
   dependencies: [r_util_dep],
   install: true,
   implicit_include_directories: false,

libr/search/meson.build

@@ -12,6 +12,7 @@ files = [
 
 r_search = library('r_search', files,
   include_directories: [platform_inc],
+  c_args: library_cflags,
   dependencies: [r_util_dep],
   install: true,
   implicit_include_directories: false,

libr/socket/meson.build

@@ -18,7 +18,7 @@ endif
 r_socket = library('r_socket', files,
   include_directories: [platform_inc],
   dependencies: dependencies,
-  c_args: ['-DCORELIB=1'],
+  c_args: library_cflags,
   install: true,
   implicit_include_directories: false,
   soversion: r2_libversion

libr/syscall/meson.build

@@ -5,6 +5,7 @@ files = [
 
 r_syscall = library('r_syscall', files,
   include_directories: [platform_inc],
+  c_args: library_cflags,
   dependencies: [
     r_util_dep,
     sdb_dep

libr/util/meson.build

@@ -85,8 +85,10 @@ if host_machine.system().startswith('freebsd')
   # backtrace_symbols_fd requires -lexecinfo
   r_util_deps += [cc.find_library('execinfo')]
 endif
+
 r_util = library('r_util', files,
   include_directories: platform_inc,
+  c_args: library_cflags,
   dependencies: r_util_deps,
   install: true,
   implicit_include_directories: false,

meson.build

@@ -100,6 +100,14 @@ if get_option('static_runtime')
   endif
 endif
 
+if get_option('default_library') == 'shared'
+  if host_machine.system() != 'windows' or cc.get_id() != 'msvc'
+    add_global_arguments('-fvisibility=hidden', language: 'c')
+  endif
+endif
+
+library_cflags = ['-DCORELIB=1']
+
 if host_machine.system() == 'windows'
   r2_prefix = '.'
   r2_libdir = 'lib'