| Brad Bishop | 0f291cc | 2019-09-01 15:16:57 -0400 | [diff] [blame^] | 1 | From 30bd4ae3badb152c9f81c6d34014c586fa0cc825 Mon Sep 17 00:00:00 2001 |
| 2 | From: Piotr Tworek <tworaz@tworaz.net> |
| 3 | Date: Mon, 12 Aug 2019 14:13:52 +0200 |
| 4 | Subject: [PATCH 4/7] Add native suffix to exacutables produced and run during |
| 5 | build process. |
| 6 | |
| 7 | CMake can't build tools for the host system when cross compiling. As |
| 8 | result eds currently fails to build in OE due to some programs being |
| 9 | cross compiled for the target and run on the host. To work around this |
| 10 | limitation modify existing targets using build time generated binaries |
| 11 | to invoke binaries suffixed with -native. We can inject such binaries |
| 12 | into expected locations prior to invoking ninja in do_compile. |
| 13 | |
| 14 | Upstream-Status: Inappropriate [OE specific] |
| 15 | |
| 16 | Signed-off-by: Piotr Tworek <tworaz@tworaz.net> |
| 17 | --- |
| 18 | src/addressbook/libebook-contacts/CMakeLists.txt | 2 +- |
| 19 | src/camel/CMakeLists.txt | 2 +- |
| 20 | 2 files changed, 2 insertions(+), 2 deletions(-) |
| 21 | |
| 22 | diff --git a/src/addressbook/libebook-contacts/CMakeLists.txt b/src/addressbook/libebook-contacts/CMakeLists.txt |
| 23 | index e9e3259..2ae72a8 100644 |
| 24 | --- a/src/addressbook/libebook-contacts/CMakeLists.txt |
| 25 | +++ b/src/addressbook/libebook-contacts/CMakeLists.txt |
| 26 | @@ -25,7 +25,7 @@ target_link_libraries(gen-western-table |
| 27 | |
| 28 | add_custom_command( |
| 29 | OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/e-name-western-tables.h |
| 30 | - 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 |
| 31 | + 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 |
| 32 | DEPENDS gen-western-table e-name-western-tables.h.in |
| 33 | ) |
| 34 | |
| 35 | diff --git a/src/camel/CMakeLists.txt b/src/camel/CMakeLists.txt |
| 36 | index be626a8..9226b2b 100644 |
| 37 | --- a/src/camel/CMakeLists.txt |
| 38 | +++ b/src/camel/CMakeLists.txt |
| 39 | @@ -10,7 +10,7 @@ target_include_directories(camel-gen-tables PUBLIC |
| 40 | |
| 41 | add_custom_command( |
| 42 | OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/camel-mime-tables.c |
| 43 | - COMMAND ${CMAKE_CURRENT_BINARY_DIR}/camel-gen-tables >${CMAKE_CURRENT_BINARY_DIR}/camel-mime-tables.c |
| 44 | + COMMAND ${CMAKE_CURRENT_BINARY_DIR}/camel-gen-tables-native >${CMAKE_CURRENT_BINARY_DIR}/camel-mime-tables.c |
| 45 | DEPENDS camel-gen-tables |
| 46 | ) |
| 47 | |
| 48 | -- |
| 49 | 2.21.0 |
| 50 | |