summaryrefslogtreecommitdiffstats
path: root/meta/recipes-support/libical/libical/Depend-on-headers-to-fix-parallel-build.patch
diff options
context:
space:
mode:
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, 0 insertions, 46 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
deleted file mode 100644
index 4d65c8143d..0000000000
--- a/meta/recipes-support/libical/libical/Depend-on-headers-to-fix-parallel-build.patch
+++ /dev/null
@@ -1,46 +0,0 @@
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