Gitiles
Code Review Sign In
gerrit.openbmc.org / openbmc / openbmc / 23eaf03b3fff4acf8a79d082a85024bda6690436 / . / meta-openembedded / meta-gnome / recipes-gnome / evolution-data-server / evolution-data-server / 0001-CMakeLists.txt-Remove-TRY_RUN-for-iconv.patch
blob: e8c6d6a76354d8a943dacf50421cab7c31220a64 [file] [log] [blame]
Brad Bishop23eaf032019-11-20 05:15:02 -0500[diff] [blame^]1From 131b88a81aba3d72d566bc8a9d968941a98e0007 Mon Sep 17 00:00:00 2001
Brad Bishop316dfdd2018-06-25 12:45:53 -0400[diff] [blame]2From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
Brad Bishop23eaf032019-11-20 05:15:02 -0500[diff] [blame^]3Date: Sun, 31 Mar 2019 18:11:55 +0200
4Subject: [PATCH] CMakeLists.txt: Remove TRY_RUN for iconv
Brad Bishop316dfdd2018-06-25 12:45:53 -0400[diff] [blame]5MIME-Version: 1.0
6Content-Type: text/plain; charset=UTF-8
7Content-Transfer-Encoding: 8bit
8
9| CMake Error: TRY_RUN() invoked in cross-compiling mode, please set the following cache variables appropriately:
10| _correct_iconv_EXITCODE (advanced)
11
12Upstream-Status: Inappropriate [OE specific]
13
14Signed-off-by: Andreas MΓΌller <schnitzeltony@gmail.com>
15---
Brad Bishop23eaf032019-11-20 05:15:02 -0500[diff] [blame^]16 CMakeLists.txt | 11 -----------
17 1 file changed, 11 deletions(-)
Brad Bishop316dfdd2018-06-25 12:45:53 -0400[diff] [blame]18
19diff --git a/CMakeLists.txt b/CMakeLists.txt
Brad Bishop23eaf032019-11-20 05:15:02 -0500[diff] [blame^]20index 1672daf..0b3e4e0 100644
Brad Bishop316dfdd2018-06-25 12:45:53 -0400[diff] [blame]21--- a/CMakeLists.txt
22+++ b/CMakeLists.txt
Brad Bishop23eaf032019-11-20 05:15:02 -0500[diff] [blame^]23@@ -524,17 +524,6 @@ if(NOT HAVE_ICONV)
24 message(FATAL_ERROR "You need to install a working iconv implementation, such as ftp://ftp.gnu.org/pub/gnu/libiconv")
25 endif(NOT HAVE_ICONV)
Brad Bishop316dfdd2018-06-25 12:45:53 -0400[diff] [blame]26
Brad Bishop23eaf032019-11-20 05:15:02 -0500[diff] [blame^]27-set(CMAKE_REQUIRED_LIBRARIES ${ICONV_LIBS})
28-file(TO_NATIVE_PATH "${CMAKE_BINARY_DIR}/" _binary_dir_with_separator)
Brad Bishop0f291cc2019-09-01 15:16:57 -0400[diff] [blame]29-CHECK_C_SOURCE_RUNS("#define ICONV_DETECT_BUILD_DIR \"${_binary_dir_with_separator}\"
30- #include \"${CMAKE_SOURCE_DIR}/iconv-detect.c\"" _correct_iconv)
Brad Bishop23eaf032019-11-20 05:15:02 -0500[diff] [blame^]31-unset(_binary_dir_with_separator)
32-unset(CMAKE_REQUIRED_LIBRARIES)
33-
Brad Bishop316dfdd2018-06-25 12:45:53 -0400[diff] [blame]34-if(NOT _correct_iconv)
35- message(FATAL_ERROR "You need to install a working iconv implementation, such as ftp://ftp.gnu.org/pub/gnu/libiconv")
36-endif(NOT _correct_iconv)
37-
38 # ******************************
39 # Backtraces for debugging
40 # ******************************
41--
Brad Bishop23eaf032019-11-20 05:15:02 -0500[diff] [blame^]422.20.1
Brad Bishop316dfdd2018-06-25 12:45:53 -0400[diff] [blame]43