[Build] dependency to pkgmgr on ubuntu

Fix build error on ubuntu, dependency to pkgmgr.

Signed-off-by: Jaeyun Jung <jy1210.jung@samsung.com>

diff --git a/daemon/includes/pkg-mgr.h b/daemon/includes/pkg-mgr.h
index 6c2624c..caa3d7f 100644 (file)
--- a/daemon/includes/pkg-mgr.h
+++ b/daemon/includes/pkg-mgr.h
@@ -22,6 +22,7 @@
 extern "C" {
 #endif /* __cplusplus */
 
+#if defined(__TIZEN__)
 #include <glib.h>
 #include <stdio.h>
 
@@ -39,7 +40,10 @@ int pkg_mgr_init (void);
  * @return @c 0 on success. Otherwise a negative error value.
  */
 int pkg_mgr_deinit (void);
-
+#else
+#define pkg_mgr_init(...) ((int) 0)
+#define pkg_mgr_deinit(...) ((int) 0)
+#endif /* __TIZEN__ */
 #ifdef __cplusplus
 }
 #endif /* __cplusplus */

diff --git a/daemon/main.c b/daemon/main.c
index 56ff68a..354dc10 100644 (file)
--- a/daemon/main.c
+++ b/daemon/main.c
@@ -122,7 +122,8 @@ main (int argc, char **argv)
   gdbus_put_system_connection ();
   g_main_loop_unref (g_mainloop);
 
-  pkg_mgr_deinit();
+  if (pkg_mgr_deinit() < 0)
+    _W ("cannot finalize package manager");
 
   return 0;
 }

diff --git a/daemon/meson.build b/daemon/meson.build
index 15b1b28..cb753d2 100644 (file)
--- a/daemon/meson.build
+++ b/daemon/meson.build
@@ -1,8 +1,11 @@
 # Machine Learing Agent
 if get_option('enable-ml-service')
   nns_ml_agent_incs = include_directories('includes')
-  nns_ml_agent_srcs = files('main.c', 'modules.c', 'gdbus-util.c', 'pkg-mgr.c',
+  nns_ml_agent_srcs = files('main.c', 'modules.c', 'gdbus-util.c',
     'service-db.cc', 'pipeline-module.cc', 'model-dbus-impl.cc')
+  if get_option('enable-tizen')
+    nns_ml_agent_srcs += files('pkg-mgr.c')
+  endif
 
   # Generate GDbus header and code
   gdbus_prog = find_program('gdbus-codegen', required : true)
@@ -45,12 +48,11 @@ if get_option('enable-ml-service')
     gst_dep,
     leveldb_dep,
     sqlite_dep,
-    libsystemd_dep,
-    appfw_package_manager_dep
+    libsystemd_dep
   ]
 
   if (get_option('enable-tizen'))
-    ai_service_daemon_deps += dependency('dlog')
+    ai_service_daemon_deps += [appfw_package_manager_dep, dependency('dlog')]
   endif
 
   serviceDBPath = get_option('service-db-path')

diff --git a/meson.build b/meson.build
index 51ba432..bdbde1d 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -34,8 +34,10 @@ nnstreamer_dep = dependency('nnstreamer')
 if get_option('enable-ml-service')
   libsystemd_dep = dependency('libsystemd')
   sqlite_dep = dependency('sqlite3')
-  appfw_package_manager_dep = dependency('capi-appfw-package-manager')
 
+  if get_option('enable-tizen')
+    appfw_package_manager_dep = dependency('capi-appfw-package-manager')
+  endif
   leveldb_dep = dependency('leveldb', required: false)
   if (not leveldb_dep.found())
     leveldb_dep = cxx.find_library('leveldb', required: true)