From 271f436b92bf6e8b6c9498be04de42749ad1c3ff Mon Sep 17 00:00:00 2001
From: Wook Song <wook16.song@samsung.com>
Date: Fri, 20 Mar 2020 17:29:27 +0900
Subject: [PATCH] [Filter/Python/Meson] Revise python dependencies

Although python2_incs and python3_incs are defined for the purpose of
providing proper -I flags to the compiler, they are not used anywhere.
Therefore, even though meson finds numpy in the system, building the
python extensions is failed due to lack of the proper -I flags.
Moreover, the existing mechanism to find numpy could not cover the cases
when numpy is installed with pip using the user sheme or is installed in
the virtual environment. This patch concerns this issue.

Signed-off-by: Wook Song <wook16.song@samsung.com>
---
 ext/nnstreamer/tensor_filter/meson.build |  4 +--
 meson.build                              | 48 +++++++++++++++++++++++---------
 2 files changed, 37 insertions(+), 15 deletions(-)

diff --git a/ext/nnstreamer/tensor_filter/meson.build b/ext/nnstreamer/tensor_filter/meson.build
index 7dc2644..38b90bc 100644
--- a/ext/nnstreamer/tensor_filter/meson.build
+++ b/ext/nnstreamer/tensor_filter/meson.build
@@ -198,7 +198,7 @@ foreach s : filter_sub_python_sources
 endforeach
 
 if have_python2
-  nnstreamer_filter_python2_deps = [python2_dep, libdl_dep, glib_dep, gst_dep, nnstreamer_dep]
+  nnstreamer_filter_python2_deps = [python2_deps, libdl_dep, glib_dep, gst_dep, nnstreamer_dep]
 
   shared_library('nnstreamer_filter_python2',
     nnstreamer_filter_python_sources,
@@ -224,7 +224,7 @@ if have_python2
 endif
 
 if have_python3
-  nnstreamer_filter_python3_deps = [python3_dep, libdl_dep, glib_dep, gst_dep, nnstreamer_dep]
+  nnstreamer_filter_python3_deps = [python3_deps, libdl_dep, glib_dep, gst_dep, nnstreamer_dep]
 
   shared_library('nnstreamer_filter_python3',
     nnstreamer_filter_python_sources,
diff --git a/meson.build b/meson.build
index 5a58c63..0850212 100644
--- a/meson.build
+++ b/meson.build
@@ -204,16 +204,25 @@ have_python3 = false
 
 if get_option('enable-python')
   pg_pkgconfig = find_program('pkg-config')
-
   # Check python 2.7
   python2_dep = dependency('python-2.7', required: false)
   if python2_dep.found()
-    python2_incs = []
-    python2_incs += run_command(pg_pkgconfig, ['python-2.7', '--cflags']).stdout().strip().split()
-    python2_incs += run_command('python2.7', ['-c', 'import site\nfor i in site.getsitepackages(): print("-I" + i + "/numpy/core/include")']).stdout().strip().split()
-    python2_incs += '-I' + run_command('python2.7', ['-m', 'site', '--user-site']).stdout().strip() + '/numpy/core/include'
-    if cc.has_header('numpy/arrayobject.h', args: python2_incs)
-      have_python2 = true
+    python2_inc_args = []
+    python2_inc_args += run_command(pg_pkgconfig, ['python-2.7', '--cflags']).stdout().strip().split()
+    python2_inc_args += run_command('python2.7', ['-c', 'import site\nfor i in site.getsitepackages(): print("-I" + i + "/numpy/core/include")']).stdout().strip().split()
+    python2_inc_args += '-I' + run_command('python2.7', ['-m', 'site', '--user-site']).stdout().strip() + '/numpy/core/include'
+    python2_inc_valid_args = []
+    foreach python2_inc_arg : python2_inc_args
+      if cxx.has_argument(python2_inc_arg) and \
+          cxx.check_header('numpy/arrayobject.h', args: python2_inc_arg, dependencies : python2_dep)
+        python2_inc_valid_args += python2_inc_arg
+        have_python2 = true
+        break
+      endif
+    endforeach
+    if have_python2
+      python2_deps = declare_dependency(dependencies: python2_dep,
+          compile_args : python2_inc_valid_args)
     else
       warning('Found python2.7, but failed to find numpy.')
       warning('Disable nnstreamer-python2.')
@@ -223,12 +232,25 @@ if get_option('enable-python')
   # Check python 3.x
   python3_dep = dependency('python3', required: false)
   if python3_dep.found()
-    python3_incs = []
-    python3_incs += run_command(pg_pkgconfig, ['python3', '--cflags']).stdout().strip().split()
-    python3_incs += run_command('python3', ['-c', 'import site\nfor i in site.getsitepackages(): print("-I" + i + "/numpy/core/include")']).stdout().strip().split()
-    python3_incs += '-I' + run_command('python3', ['-m', 'site', '--user-site']).stdout().strip() + '/numpy/core/include'
-    if cc.has_header('numpy/arrayobject.h', args: python3_incs)
-      have_python3 = true
+    message('Finding numpy for python3')
+    numpy_arryobj_h = 'numpy/arrayobject.h'
+
+    python3_inc_args = []
+    python3_inc_args += run_command(pg_pkgconfig, ['python3', '--cflags']).stdout().strip().split()
+    python3_inc_args += run_command('python3', ['-c', 'import site\nfor i in site.getsitepackages(): print("-I" + i + "/numpy/core/include")']).stdout().strip().split()
+    python3_inc_args += '-I' + run_command('python3', ['-m', 'site', '--user-site']).stdout().strip() + '/numpy/core/include'
+    python3_inc_valid_args = []
+    foreach python3_inc_arg : python3_inc_args
+      if cxx.has_argument(python3_inc_arg) and \
+          cxx.check_header('numpy/arrayobject.h', args : python3_inc_arg, dependencies : python3_dep)
+        python3_inc_valid_args += python3_inc_arg
+        have_python3 = true
+        break
+      endif
+    endforeach
+    if have_python3
+      python3_deps = declare_dependency(dependencies: python3_dep,
+          compile_args : python3_inc_valid_args)
     else
       warning('Found python3, but failed to find numpy.')
       warning('Disable nnstreamer-python3.')
-- 
2.7.4