From 1d8bd1262b231b486b8857bf22a0134afe1d7202 Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Mon, 17 Jun 2024 14:28:51 -0700 Subject: [PATCH] meson: fix icu and iconv om BSDs again 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 --- meson.build | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meson.build b/meson.build index 8c441d70..07417ad6 100644 --- a/meson.build +++ b/meson.build @@ -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