shaba/libxml2
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/libxml2.git synced 2024-12-23 17:33:50 +03:00
Code

meson: fix icu and iconv om BSDs again

Browse Source 
libdir is needed when searching for iconv, not includedir.

Remove OpenBSD from the bsd list. Something is wrong there and iconv.h
is installed somewhere else.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
This commit is contained in:
Rosen Penev 2024-06-17 14:28:51 -07:00 committed by Nick Wellnhofer
parent f61d23b8c6
commit 1d8bd1262b
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
meson.build
View File

@ -32,7 +32,7 @@ dir_locale = dir_prefix / get_option('localedir')
host_os = host_machine.system()
bsd = ['freebsd', 'openbsd', 'dragonfly']
bsd = ['freebsd', 'dragonfly']
cygwin = 'cygwin'
windows = 'windows'
sys_bsd = bsd.contains(host_os)
@ -575,7 +575,7 @@ xml_deps += icu_dep
if not get_option('minimum')
# this is a hack for the BSDs. The iconv dependency works as long as libiconv is not in the include path.
if sys_bsd and icu_dep.found()
iconv_dep = cc.find_library('iconv', dirs: icu_dep.get_variable(pkgconfig: 'includedir'), required: get_option('iconv'))
iconv_dep = cc.find_library('iconv', dirs: icu_dep.get_variable(pkgconfig: 'libdir'), required: get_option('iconv'))
else
iconv_dep = dependency('iconv', required: get_option('iconv'))
endif