From 30bd4ae3badb152c9f81c6d34014c586fa0cc825 Mon Sep 17 00:00:00 2001 From: Piotr Tworek Date: Mon, 12 Aug 2019 14:13:52 +0200 Subject: [PATCH 4/7] Add native suffix to exacutables produced and run during build process. CMake can't build tools for the host system when cross compiling. As result eds currently fails to build in OE due to some programs being cross compiled for the target and run on the host. To work around this limitation modify existing targets using build time generated binaries to invoke binaries suffixed with -native. We can inject such binaries into expected locations prior to invoking ninja in do_compile. Upstream-Status: Inappropriate [OE specific] Signed-off-by: Piotr Tworek --- src/addressbook/libebook-contacts/CMakeLists.txt | 2 +- src/camel/CMakeLists.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/addressbook/libebook-contacts/CMakeLists.txt b/src/addressbook/libebook-contacts/CMakeLists.txt index e9e3259..2ae72a8 100644 --- a/src/addressbook/libebook-contacts/CMakeLists.txt +++ b/src/addressbook/libebook-contacts/CMakeLists.txt @@ -25,7 +25,7 @@ target_link_libraries(gen-western-table add_custom_command( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/e-name-western-tables.h - COMMAND ${CMAKE_CURRENT_BINARY_DIR}/gen-western-table "${CMAKE_CURRENT_SOURCE_DIR}/e-name-western-tables.h.in" >${CMAKE_CURRENT_BINARY_DIR}/e-name-western-tables.h + COMMAND ${CMAKE_CURRENT_BINARY_DIR}/gen-western-table-native "${CMAKE_CURRENT_SOURCE_DIR}/e-name-western-tables.h.in" >${CMAKE_CURRENT_BINARY_DIR}/e-name-western-tables.h DEPENDS gen-western-table e-name-western-tables.h.in ) diff --git a/src/camel/CMakeLists.txt b/src/camel/CMakeLists.txt index be626a8..9226b2b 100644 --- a/src/camel/CMakeLists.txt +++ b/src/camel/CMakeLists.txt @@ -10,7 +10,7 @@ target_include_directories(camel-gen-tables PUBLIC add_custom_command( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/camel-mime-tables.c - COMMAND ${CMAKE_CURRENT_BINARY_DIR}/camel-gen-tables >${CMAKE_CURRENT_BINARY_DIR}/camel-mime-tables.c + COMMAND ${CMAKE_CURRENT_BINARY_DIR}/camel-gen-tables-native >${CMAKE_CURRENT_BINARY_DIR}/camel-mime-tables.c DEPENDS camel-gen-tables ) -- 2.21.0