From 10a47852dfb8bd207ccbaac020ff048b487b9eb3 Mon Sep 17 00:00:00 2001 From: Julien Vuillaumier Date: Mon, 29 Nov 2021 15:08:30 +0100 Subject: [PATCH] meson.build: Fixup for multilib support meson.build: moved nnstreamer_prefix definition upward, before its first usage. packaging/nnstreamer.spec: corrected subplugindir definition to rely on actual %{_prefix} variable and use the expected %{_prefix}/lib/nnstreamer path. Signed-off-by: Julien Vuillaumier --- meson.build | 2 +- packaging/nnstreamer.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/meson.build b/meson.build index b0628f5..c52725b 100644 --- a/meson.build +++ b/meson.build @@ -86,6 +86,7 @@ endforeach gst_api_verision = '1.0' # Set install path +nnstreamer_prefix = get_option('prefix') nnstreamer_libdir = join_paths(nnstreamer_prefix, get_option('libdir')) nnstreamer_bindir = join_paths(nnstreamer_prefix, get_option('bindir')) nnstreamer_includedir = join_paths(nnstreamer_prefix, get_option('includedir')) @@ -96,7 +97,6 @@ nnstreamer_inidir = join_paths(nnstreamer_prefix, get_option('sysconfdir')) plugins_install_dir = join_paths(nnstreamer_libdir, 'gstreamer-' + gst_api_verision) # nnstreamer sub-plugins path -nnstreamer_prefix = get_option('prefix') if get_option('subplugindir') == '' subplugin_install_prefix = join_paths(nnstreamer_prefix, get_option('libdir'), 'nnstreamer') else diff --git a/packaging/nnstreamer.spec b/packaging/nnstreamer.spec index 02593e7..6e6a9e3 100644 --- a/packaging/nnstreamer.spec +++ b/packaging/nnstreamer.spec @@ -779,7 +779,7 @@ CXXFLAGS=`echo $CXXFLAGS | sed -e "s|-Wp,-D_FORTIFY_SOURCE=[1-9]||g"` mkdir -p build meson --buildtype=plain --prefix=%{_prefix} --sysconfdir=%{_sysconfdir} --libdir=%{_lib} \ - --bindir=%{nnstbindir} --includedir=include -Dsubplugindir=%{prefix}/%{_lib}/nnstreamer \ + --bindir=%{nnstbindir} --includedir=include -Dsubplugindir=%{_prefix}/lib/nnstreamer \ %{enable_tizen} %{element_restriction} %{fw_priority} -Denable-env-var=false -Denable-symbolic-link=false \ %{enable_tf_lite} %{enable_tf2_lite} %{enable_tf} %{enable_pytorch} %{enable_caffe2} %{enable_python3} \ %{enable_nnfw_runtime} %{enable_mvncsdk2} %{enable_openvino} %{enable_armnn} %{enable_edgetpu} %{enable_vivante} %{enable_flatbuf} \ -- 2.7.4