From f121bb7e89ce74dc554a656a163cd598b1d80eb1 Mon Sep 17 00:00:00 2001 From: Wook Song Date: Thu, 1 Feb 2024 10:59:14 +0900 Subject: [PATCH] Dist/Tizen: Use meson and its commands to build and install the targets This patch replaces the lines directly using ninja in the build and install sections with the meson's compile and install commands. Signed-off-by: Wook Song --- packaging/machine-learning-agent.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packaging/machine-learning-agent.spec b/packaging/machine-learning-agent.spec index f0878db..b2f7f5e 100644 --- a/packaging/machine-learning-agent.spec +++ b/packaging/machine-learning-agent.spec @@ -174,13 +174,13 @@ CXXFLAGS=`echo $CXXFLAGS | sed -e "s|-Wp,-D_FORTIFY_SOURCE=[1-9]||g"` %endif # unit_test rm -rf %{builddir} -meson --buildtype=plain --prefix=%{_prefix} --sysconfdir=%{_sysconfdir} --libdir=%{_libdir} \ +meson setup --buildtype=plain --prefix=%{_prefix} --sysconfdir=%{_sysconfdir} --libdir=%{_libdir} \ --bindir=%{_bindir} --includedir=%{_includedir} \ %{enable_test} %{install_test} %{enable_test_coverage} %{enable_gcov} \ %{enable_tizen} %{service_db_path} %{service_db_key_prefix} \ %{builddir} -ninja -C build %{?_smp_mflags} +meson compile -C %{builddir} %{?_smp_mflags} export MLAGENT_SOURCE_ROOT_PATH=$(pwd) export MLAGENT_BUILD_ROOT_PATH=$(pwd)/%{builddir} @@ -194,7 +194,7 @@ bash %{test_script} ./tests/daemon/unittest_gdbus_util %endif # unit_test %install -DESTDIR=%{buildroot} ninja -C %{builddir} %{?_smp_mflags} install +meson install -C %{builddir} --destdir=%{buildroot} %if 0%{?unit_test} %if 0%{?testcoverage} -- 2.7.4