From 9a06b352775e5976c8141c8d91184e2d7227f776 Mon Sep 17 00:00:00 2001
From: Riccardo Schirone <ret2libc@users.noreply.github.com>
Date: Wed, 18 Jul 2018 15:50:02 +0200
Subject: [PATCH] meson.build: do not add "r_magic" as Require in pkgconfig if
 using sys

---
 libr/bin/meson.build   | 5 ++---
 libr/core/meson.build  | 3 +--
 libr/magic/meson.build | 4 +++-
 meson.build            | 6 +++---
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/libr/bin/meson.build b/libr/bin/meson.build
index f9ada4b03e..a8cc5f1fcf 100644
--- a/libr/bin/meson.build
+++ b/libr/bin/meson.build
@@ -143,11 +143,10 @@ pkgconfig_mod.generate(
   version: r2_version,
   name: 'r_bin',
   filebase: 'r_bin',
-  requires: [
+  requires: pkgconfig_magic_requires + [
     'r_util',
     'r_io',
-    'r_socket',
-    'r_magic'
+    'r_socket'
   ],
   description: 'radare foundation libraries'
 )
diff --git a/libr/core/meson.build b/libr/core/meson.build
index 2ae2dd800f..ee225780f8 100644
--- a/libr/core/meson.build
+++ b/libr/core/meson.build
@@ -112,7 +112,7 @@ pkgconfig_mod.generate(
   version: r2_version,
   name: 'r_core',
   filebase: 'r_core',
-  requires: [
+  requires: pkgconfig_magic_requires + [
     'r_util',
     'r_reg',
     'r_syscall',
@@ -128,7 +128,6 @@ pkgconfig_mod.generate(
     'r_parse',
     'r_egg',
     'r_debug',
-    'r_magic',
     'r_crypto',
     'r_config',
     'r_bin',
diff --git a/libr/magic/meson.build b/libr/magic/meson.build
index 43d75f9889..c15ff00926 100644
--- a/libr/magic/meson.build
+++ b/libr/magic/meson.build
@@ -9,9 +9,10 @@ files = [
   'softmagic.c'
 ]
 
-if use_lib_magic
+if use_syslib_magic
   message('Use system-provided magic library')
   r_magic_dep = sys_magic
+  pkgconfig_magic_requires = []
 else
   message('Use bundled magic library')
   r_magic = library('r_magic', files,
@@ -37,4 +38,5 @@ else
     ],
     description: 'radare foundation libraries'
   )
+  pkgconfig_magic_requires = ['r_magic']
 endif
diff --git a/meson.build b/meson.build
index 610fa291a7..d7c89c9d02 100644
--- a/meson.build
+++ b/meson.build
@@ -198,15 +198,15 @@ config_h = configure_file(
 )
 
 sys_magic = cc.find_library('magic', required: false)
-use_lib_magic = false
+use_syslib_magic = false
 
 if sys_magic.found() and get_option('use_sys_magic')
-  use_lib_magic = true
+  use_syslib_magic = true
 endif
 
 userconf = configuration_data()
 userconf.set('HAVE_LIB_MAGIC', sys_magic.found().to_int())
-userconf.set('USE_LIB_MAGIC', use_lib_magic.to_int())
+userconf.set('USE_LIB_MAGIC', use_syslib_magic.to_int())
 userconf.set('DEBUGGER', 1)
 userconf.set('PREFIX', r2_prefix)
 userconf.set('LIBDIR', r2_libdir)