<div dir="ltr">This doesn't want to apply to the patches I've got locally for libical. Can you squash this with the other patches and just have a single libical upgrade commit that incorporates the upgrade and the fixes (for clarity, conciseness, and bisectability).<div><br></div><div>Cheers,</div><div>Ross</div></div><div class="gmail_extra"><br><div class="gmail_quote">On 11 December 2015 at 15:19, Maxin B. John <span dir="ltr"><<a href="mailto:maxin.john@intel.com" target="_blank">maxin.john@intel.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Parallel builds occasionally fail because generated headers are only<br>
partially built when they're being used.<br>
<br>
Signed-off-by: Jussi Kukkonen <<a href="mailto:jussi.kukkonen@intel.com">jussi.kukkonen@intel.com</a>><br>
Signed-off-by: Maxin B. John <<a href="mailto:maxin.john@intel.com">maxin.john@intel.com</a>><br>
---<br>
.../Depend-on-headers-to-fix-parallel-build.patch | 46 ++++++++++++++++++++++<br>
meta/recipes-support/libical/<a href="http://libical_1.0.1.bb" rel="noreferrer" target="_blank">libical_1.0.1.bb</a> | 1 +<br>
2 files changed, 47 insertions(+)<br>
create mode 100644 meta/recipes-support/libical/libical/Depend-on-headers-to-fix-parallel-build.patch<br>
<br>
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<br>
new file mode 100644<br>
index 0000000..4d65c81<br>
--- /dev/null<br>
+++ b/meta/recipes-support/libical/libical/Depend-on-headers-to-fix-parallel-build.patch<br>
@@ -0,0 +1,46 @@<br>
+From 56a10a14c0a544df99c97ce279801ddf40b0df52 Mon Sep 17 00:00:00 2001<br>
+From: Jussi Kukkonen <<a href="mailto:jussi.kukkonen@intel.com">jussi.kukkonen@intel.com</a>><br>
+Date: Mon, 14 Sep 2015 13:35:42 +0300<br>
+Subject: [PATCH] WIP: Depend on headers to fix parallel build<br>
+<br>
+Parallel builds occasionally fail because generated headers are only<br>
+half built when they're being used.<br>
+<br>
+This fix is extracted<br>
+from <a href="https://github.com/libical/libical/commit/dcc40c7ae2d337a0d83c077bf9d8f283499c6717" rel="noreferrer" target="_blank">https://github.com/libical/libical/commit/dcc40c7ae2d337a0d83c077bf9d8f283499c6717</a><br>
+<br>
+Upstream-Status: Backport<br>
+Signed-off-by: Jussi Kukkonen <<a href="mailto:jussi.kukkonen@intel.com">jussi.kukkonen@intel.com</a>><br>
+<br>
+---<br>
+ examples/CMakeLists.txt | 1 +<br>
+ src/libical/CMakeLists.txt | 1 +<br>
+ 2 files changed, 2 insertions(+)<br>
+<br>
+diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt<br>
+index 3379ffd..514956b 100644<br>
+--- a/examples/CMakeLists.txt<br>
++++ b/examples/CMakeLists.txt<br>
+@@ -16,6 +16,7 @@ set(doesnothing_SRCS<br>
+ )<br>
+<br>
+ add_executable(doesnothing ${doesnothing_SRCS})<br>
++add_dependencies(doesnothing ical icalss icalvcal)<br>
+<br>
+ target_link_libraries(doesnothing ical icalss icalvcal ical icalss icalvcal)<br>
+<br>
+diff --git a/src/libical/CMakeLists.txt b/src/libical/CMakeLists.txt<br>
+index 6774352..468a7d9 100644<br>
+--- a/src/libical/CMakeLists.txt<br>
++++ b/src/libical/CMakeLists.txt<br>
+@@ -261,6 +261,7 @@ add_library(ical ${LIBRARY_TYPE} ${ical_LIB_SRCS})<br>
+ add_library(ical-static STATIC ${ical_LIB_SRCS})<br>
+<br>
+ add_dependencies(ical ical-header)<br>
++add_dependencies(ical-static ical-header)<br>
+<br>
+ target_link_libraries(ical ${CMAKE_THREAD_LIBS_INIT})<br>
+<br>
+--<br>
+2.1.4<br>
+<br>
diff --git a/meta/recipes-support/libical/<a href="http://libical_1.0.1.bb" rel="noreferrer" target="_blank">libical_1.0.1.bb</a> b/meta/recipes-support/libical/<a href="http://libical_1.0.1.bb" rel="noreferrer" target="_blank">libical_1.0.1.bb</a><br>
index 0dcee46..e18b803 100644<br>
--- a/meta/recipes-support/libical/<a href="http://libical_1.0.1.bb" rel="noreferrer" target="_blank">libical_1.0.1.bb</a><br>
+++ b/meta/recipes-support/libical/<a href="http://libical_1.0.1.bb" rel="noreferrer" target="_blank">libical_1.0.1.bb</a><br>
@@ -9,6 +9,7 @@ SECTION = "libs"<br>
SRC_URI = "<a href="https://github.com/${BPN}/${BPN}/archive/v${PV}.tar.gz" rel="noreferrer" target="_blank">https://github.com/${BPN}/${BPN}/archive/v${PV}.tar.gz</a> \<br>
file://Remove-cmake-check-for-Perl.patch \<br>
file://Fix-x32-ABI-build.patch \<br>
+ file://Depend-on-headers-to-fix-parallel-build.patch \<br>
"<br>
SRC_URI[md5sum] = "af91db06b22559f863869c5a382ad08a"<br>
SRC_URI[sha256sum] = "7d5f613454ec6c7d1bcfb441c919215be53292aa15cd1cb14249d1413d6c610c"<br>
<span class="HOEnZb"><font color="#888888">--<br>
2.4.0<br>
<br>
--<br>
_______________________________________________<br>
Openembedded-core mailing list<br>
<a href="mailto:Openembedded-core@lists.openembedded.org">Openembedded-core@lists.openembedded.org</a><br>
<a href="http://lists.openembedded.org/mailman/listinfo/openembedded-core" rel="noreferrer" target="_blank">http://lists.openembedded.org/mailman/listinfo/openembedded-core</a><br>
</font></span></blockquote></div><br></div>