summaryrefslogtreecommitdiffstats
path: root/meta/recipes-support/libical/libical
diff options
context:
space:
mode:
authorAlexander Kanavin <alex.kanavin@gmail.com>2021-03-01 19:30:04 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2021-03-10 10:30:39 +0000
commitef39fa61d583145517ede9b884a0ee0d10a7ab44 (patch)
tree9e5233a81aee5efb4427eeafd06141b43f76d7ad /meta/recipes-support/libical/libical
parentbe8062b07134f48764894d80adb8d9af54a9c0f7 (diff)
downloadpoky-ef39fa61d583145517ede9b884a0ee0d10a7ab44.tar.gz
libical: drop the ad hoc native generator build
With a bit of help from upstream I figured out how to do cross-builds the way upstream intends to. (From OE-Core rev: f13c2cd727b01a3a11211a42c682ebb5eef9aa11) Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-support/libical/libical')
-rw-r--r--meta/recipes-support/libical/libical/0001-Use-our-hand-build-native-src-generator.patch32
1 files changed, 0 insertions, 32 deletions
diff --git a/meta/recipes-support/libical/libical/0001-Use-our-hand-build-native-src-generator.patch b/meta/recipes-support/libical/libical/0001-Use-our-hand-build-native-src-generator.patch
deleted file mode 100644
index 0813641ee9..0000000000
--- a/meta/recipes-support/libical/libical/0001-Use-our-hand-build-native-src-generator.patch
+++ /dev/null
@@ -1,32 +0,0 @@
1From 378df7d6ef9207d3e11a3de54ffd05c04c6c0e0b Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex.kanavin@gmail.com>
3Date: Wed, 24 Feb 2021 20:28:22 +0000
4Subject: [PATCH] Use our hand-build native src-generator
5
6Upstream-Status: Inappropriate [reported at https://github.com/libical/libical/issues/481]
7Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
8---
9 src/libical-glib/CMakeLists.txt | 7 +------
10 1 file changed, 1 insertion(+), 6 deletions(-)
11
12diff --git a/src/libical-glib/CMakeLists.txt b/src/libical-glib/CMakeLists.txt
13index 13f77aa..c337c9e 100644
14--- a/src/libical-glib/CMakeLists.txt
15+++ b/src/libical-glib/CMakeLists.txt
16@@ -74,12 +74,7 @@ endforeach()
17
18 if(CMAKE_CROSSCOMPILING)
19 # import native ical-glib-src-generator when cross-compiling
20- set(IMPORT_ICAL_GLIB_SRC_GENERATOR "ICAL_GLIB_SRC_GENERATOR-NOTFOUND"
21- CACHE FILEPATH
22- "Path to exported ical-glib-src-generator target from native build"
23- )
24- include(${IMPORT_ICAL_GLIB_SRC_GENERATOR})
25- set(ical-glib-src-generator_EXE native-ical-glib-src-generator)
26+ set(ical-glib-src-generator_EXE ${CMAKE_BINARY_DIR}/src-generator)
27 else()
28 set(ical-glib-src-generator_EXE ical-glib-src-generator)
29 endif()
30--
312.17.1
32