buildroot
Public
Source
committed f6a33a73e23From 70ab56d74aff8b2e3ac49fed6bdf3751c9b1457e Mon Sep 17 00:00:00 2001From: Bernd Kuhls <bernd.kuhls@t-online.de>Date: Sun, 12 Feb 2017 14:24:18 +0100Subject: [PATCH] [cmake] iconv is a required dependencyThis patch adds support for libiconv currently only provided by theautoconf-based build system:https://github.com/xbmc/xbmc/blob/Krypton/configure.ac#L1172This commit fixes an error during linking with an uClibc-basedbuildroot toolchain:[100%] Linking CXX executable kodi.bin/home/buildroot/br8_ffmpeg3_kodi17_github/output/host/usr/lib/gcc/i586-buildroot-linux-uclibc/6.3.0/../../../../i586-buildroot-linux-uclibc/bin/ld: build/utils/utils.a(CharsetConverter.cpp.o): undefined reference to symbol 'libiconv_open'/home/buildroot/br8_ffmpeg3_kodi17_github/output/host/usr/i586-buildroot-linux-uclibc/sysroot/usr/lib32/libiconv.so.2: error adding symbols: DSO missing from command lineBackported to Krypton from master branch commit:https://github.com/xbmc/xbmc/commit/9a64537543e8dc8609ca8a98181ba17f30c53493Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>--- project/cmake/CMakeLists.txt | 2 +- project/cmake/modules/FindIconv.cmake | 44 +++++++++++++++++++++++++++++++++++ 2 files changed, 45 insertions(+), 1 deletion(-) create mode 100644 project/cmake/modules/FindIconv.cmakediff --git a/project/cmake/CMakeLists.txt b/project/cmake/CMakeLists.txtindex aeb1ff47c2..07c1d1a8d3 100644--- a/project/cmake/CMakeLists.txt+++ b/project/cmake/CMakeLists.txt@@ -103,7 +103,7 @@ list(APPEND DEPLIBS ${CMAKE_THREAD_LIBS_INIT}) # Required dependencies set(required_deps Sqlite3 FreeType PCRE Cpluff LibDvd- TinyXML Python Yajl Cdio+ TinyXML Python Yajl Cdio Iconv Lzo2 Fribidi TagLib FFMPEG CrossGUID) if(NOT WIN32) list(APPEND required_deps ZLIB)diff --git a/project/cmake/modules/FindIconv.cmake b/project/cmake/modules/FindIconv.cmakenew file mode 100644index 0000000000..8ee01fb6b8--- /dev/null+++ b/project/cmake/modules/FindIconv.cmake@@ -0,0 +1,44 @@+#.rst:+# FindICONV+# --------+# Finds the ICONV library+#+# This will will define the following variables::+#+# ICONV_FOUND - system has ICONV+# ICONV_INCLUDE_DIRS - the ICONV include directory+# ICONV_LIBRARIES - the ICONV libraries+#+# and the following imported targets::+#+# ICONV::ICONV - The ICONV library++find_path(ICONV_INCLUDE_DIR NAMES iconv.h)++find_library(ICONV_LIBRARY NAMES iconv libiconv c)