meson: port ncpmc iconv solution

Properly deals with iconv, unlike the current solution. have_iconv fails when libiconv CFLAGS are passed to the compiler. Tested under OpenWrt with its CONFIG_BUILD_NLS, which adds libiconv include flags. Signed-off-by: Rosen Penev <rosenp@gmail.com>

meson: port ncpmc iconv solution
cc557c4d · Rosen Penev · Max Kellermann · 956c5fae · cc557c4d · cc557c4d
Commit cc557c4d authored Jul 19, 2022 by Rosen Penev Committed by Max Kellermann Jul 20, 2022
Hide whitespace changes
Inline Side-by-side

Showing with 19 additions and 10 deletions

NEWS NEWS +1 -0

meson.build src/lib/icu/meson.build +18 -10

No files found.
--- a/NEWS
+++ b/NEWS
 ver 0.23.9 (not yet released)
 * output
  - pipewire: set app icon
+* improve iconv detection
 ver 0.23.8 (2022/07/09)
 * storage

--- a/src/lib/icu/meson.build
+++ b/src/lib/icu/meson.build
@@ -18,17 +18,25 @@ if icu_dep.found()
    'Util.cxx',
    'Init.cxx',
  ]
-elif not get_option('iconv').disabled()
+else
-  # an installed iconv library will make the builtin iconv() unavailable,
+  if meson.version().version_compare('>= 0.60')
-  # so search for the library first and pass it as (possible) dependency
+    iconv_dep = dependency('iconv', required: get_option('iconv'))
-  iconv_dep = compiler.find_library('libiconv', required: false)
+    conf.set('HAVE_ICONV', iconv_dep.found())
-  have_iconv = compiler.has_function('iconv', 
+  elif not get_option('iconv').disabled()
-    dependencies: iconv_dep, 
+    iconv_open_snippet = '''#include <iconv.h>
-    prefix : '#include <iconv.h>')
+      int main() {
-  if not have_iconv and get_option('iconv').enabled()
+      iconv_open("","");
-    error('iconv() not available')
+      }'''
+    have_iconv = compiler.links(iconv_open_snippet, name: 'iconv_open')
+    if not have_iconv
+      iconv_dep = compiler.find_library('iconv', required: false)
+      have_iconv = compiler.links(iconv_open_snippet, dependencies: iconv_dep, name: 'iconv_open')
+    endif
+    if not have_iconv and get_option('iconv').enabled()
+      error('iconv() not available')
+    endif
+    conf.set('HAVE_ICONV', have_iconv)
  endif
-  conf.set('HAVE_ICONV', have_iconv)
 endif
 icu = static_library(