Skip to content

Commit d5db754

Browse files
cursoragentmyungjoo
andcommitted
fix(build): add explicit xml2 deps for unittest builds
Co-authored-by: MyungJoo Ham <myungjoo.ham@samsung.com>
1 parent 7cfddd5 commit d5db754

5 files changed

Lines changed: 18 additions & 2 deletions

File tree

c/meson.build

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ endif
88

99
# Dependencies
1010
nns_capi_common_deps = [glib_dep, gmodule_dep, nnstreamer_single_dep]
11+
nns_capi_common_link_args = []
1112
nns_capi_deps = [nnstreamer_dep, gst_dep, gst_app_dep]
1213

1314
if (get_option('enable-tizen'))
@@ -30,7 +31,14 @@ if (get_option('enable-tizen'))
3031
endif
3132

3233
if get_option('enable-tizen-feature-check')
33-
nns_capi_common_deps += dependency('capi-system-info')
34+
sysinfo_dep = dependency('capi-system-info')
35+
xml2_dep = dependency('libxml-2.0')
36+
nns_capi_common_deps += [sysinfo_dep, xml2_dep]
37+
# Resolve transitive xml2 dependencies used by HAL/pkgmgr in Tizen links.
38+
xml2_libdir = xml2_dep.get_pkgconfig_variable('libdir', default: '')
39+
if xml2_libdir != ''
40+
nns_capi_common_link_args += '-Wl,-rpath-link,' + xml2_libdir
41+
endif
3442
endif
3543
endif
3644

c/src/meson.build

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@ endif
4848

4949
nns_capi_common_dep = declare_dependency(link_with: nns_capi_common_lib,
5050
dependencies: nns_capi_common_deps,
51+
link_args: nns_capi_common_link_args,
5152
include_directories: nns_capi_include
5253
)
5354

debian/control

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ Build-Depends: gcc-9 | gcc-8 | gcc-7 | gcc-6 | gcc-5 (>=5.4),
66
ninja-build, meson (>=0.50), debhelper (>=9),
77
libgstreamer1.0-dev, libgstreamer-plugins-base1.0-dev, gstreamer1.0-plugins-base,
88
nnstreamer, nnstreamer-dev, nnstreamer-dev-internal, openjdk-11-jdk,
9-
libglib2.0-dev, libgtest-dev, ssat, gstreamer1.0-plugins-good, nnstreamer-edge-dev
9+
libglib2.0-dev, libxml2-dev, libgtest-dev, ssat, gstreamer1.0-plugins-good, nnstreamer-edge-dev
1010
Standards-Version: 3.9.6
1111
Homepage: https://github.com/nnstreamer/api
1212

debian/rules

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,11 @@ export BUILDDIR=build
1919
export MLAPI_SOURCE_ROOT_PATH=$(ROOT_DIR)
2020
export MLAPI_BUILD_ROOT_PATH=${MLAPI_SOURCE_ROOT_PATH}/${BUILDDIR}
2121
export JAVA_DIR ?= $(shell echo 'System.out.println(java.lang.System.getProperty("java.home"));' | jshell -)
22+
export XML2_LIBDIR ?= $(shell pkg-config --variable=libdir libxml-2.0 2>/dev/null)
23+
24+
ifneq ($(strip $(XML2_LIBDIR)),)
25+
export LDFLAGS := $(LDFLAGS) -Wl,-rpath-link,$(XML2_LIBDIR)
26+
endif
2227

2328
%:
2429
dh $@ --parallel

packaging/machine-learning-api.spec

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -118,6 +118,8 @@ BuildRequires: pkgconfig(mm-resource-manager)
118118

119119
%if 0%{?enable_tizen_feature}
120120
BuildRequires: pkgconfig(capi-system-info)
121+
BuildRequires: pkgconfig(libxml-2.0)
122+
BuildRequires: libxml2
121123
%endif
122124
%endif # tizen
123125

0 commit comments

Comments
 (0)