summaryrefslogtreecommitdiffstats
path: root/meta/recipes-support/libical/libical/Depend-on-headers-to-fix-parallel-build.patch
diff options
context:
space:
mode:
authorMaxin B. John <maxin.john@intel.com>2015-12-14 16:34:10 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-12-16 12:12:16 +0000
commit91c92fc09ea5353f040546d5fc3d134cb4faab9a (patch)
treec2392f719bf0190cf9c41a1ce8efd07e7e9b109f /meta/recipes-support/libical/libical/Depend-on-headers-to-fix-parallel-build.patch
parent5c6ff26cd85a5f710377959f92745b092866e234 (diff)
downloadpoky-91c92fc09ea5353f040546d5fc3d134cb4faab9a.tar.gz
libical: Upgrade 1.0.0 -> 1.0.1
* Build system changed to cmake * Patch build system to not check for perl (we use host perl which won't be found) * Patch build system to not break on parallel builds (From OE-Core rev: 8e6ab0617ab64ec93db5ca82f6c459be988e0287) Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> Signed-off-by: Maxin B. John <maxin.john@intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-support/libical/libical/Depend-on-headers-to-fix-parallel-build.patch')
-rw-r--r--meta/recipes-support/libical/libical/Depend-on-headers-to-fix-parallel-build.patch46
1 files changed, 46 insertions, 0 deletions
diff --git a/meta/recipes-support/libical/libical/Depend-on-headers-to-fix-parallel-build.patch b/meta/recipes-support/libical/libical/Depend-on-headers-to-fix-parallel-build.patch
new file mode 100644
index 0000000000..4d65c8143d
--- /dev/null
+++ b/meta/recipes-support/libical/libical/Depend-on-headers-to-fix-parallel-build.patch
@@ -0,0 +1,46 @@
1From 56a10a14c0a544df99c97ce279801ddf40b0df52 Mon Sep 17 00:00:00 2001
2From: Jussi Kukkonen <jussi.kukkonen@intel.com>
3Date: Mon, 14 Sep 2015 13:35:42 +0300
4Subject: [PATCH] WIP: Depend on headers to fix parallel build
5
6Parallel builds occasionally fail because generated headers are only
7half built when they're being used.
8
9This fix is extracted
10from https://github.com/libical/libical/commit/dcc40c7ae2d337a0d83c077bf9d8f283499c6717
11
12Upstream-Status: Backport
13Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
14
15---
16 examples/CMakeLists.txt | 1 +
17 src/libical/CMakeLists.txt | 1 +
18 2 files changed, 2 insertions(+)
19
20diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt
21index 3379ffd..514956b 100644
22--- a/examples/CMakeLists.txt
23+++ b/examples/CMakeLists.txt
24@@ -16,6 +16,7 @@ set(doesnothing_SRCS
25 )
26
27 add_executable(doesnothing ${doesnothing_SRCS})
28+add_dependencies(doesnothing ical icalss icalvcal)
29
30 target_link_libraries(doesnothing ical icalss icalvcal ical icalss icalvcal)
31
32diff --git a/src/libical/CMakeLists.txt b/src/libical/CMakeLists.txt
33index 6774352..468a7d9 100644
34--- a/src/libical/CMakeLists.txt
35+++ b/src/libical/CMakeLists.txt
36@@ -261,6 +261,7 @@ add_library(ical ${LIBRARY_TYPE} ${ical_LIB_SRCS})
37 add_library(ical-static STATIC ${ical_LIB_SRCS})
38
39 add_dependencies(ical ical-header)
40+add_dependencies(ical-static ical-header)
41
42 target_link_libraries(ical ${CMAKE_THREAD_LIBS_INIT})
43
44--
452.1.4
46