summaryrefslogtreecommitdiffstats
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
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>
-rw-r--r--meta/recipes-support/libical/libical/Depend-on-headers-to-fix-parallel-build.patch46
-rw-r--r--meta/recipes-support/libical/libical/Fix-x32-ABI-build.patch38
-rw-r--r--meta/recipes-support/libical/libical/Remove-cmake-check-for-Perl.patch33
-rw-r--r--meta/recipes-support/libical/libical_1.0.1.bb (renamed from meta/recipes-support/libical/libical_1.0.0.bb)14
4 files changed, 126 insertions, 5 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
diff --git a/meta/recipes-support/libical/libical/Fix-x32-ABI-build.patch b/meta/recipes-support/libical/libical/Fix-x32-ABI-build.patch
new file mode 100644
index 0000000000..12186e2cb1
--- /dev/null
+++ b/meta/recipes-support/libical/libical/Fix-x32-ABI-build.patch
@@ -0,0 +1,38 @@
1Subject: [PATCH] Use GNUInstallDirs.
2
3x32 ABI build fails because of improper library path. Use
4GNUInstallDirs to fix it.
5
6Upstream-Status: Backport
7
8Signed-off-by: Maxin B. John <maxin.john@intel.com>
9---
10diff -Naur libical-1.0.1-orig/CMakeLists.txt libical-1.0.1/CMakeLists.txt
11--- libical-1.0.1-orig/CMakeLists.txt 2015-12-07 18:13:58.311503974 +0200
12+++ libical-1.0.1/CMakeLists.txt 2015-12-07 18:17:18.362002998 +0200
13@@ -92,6 +92,10 @@
14 endif()
15
16 set(PERL_EXECUTABLE perl)
17+# Ensure finding 64bit libs when using 64-bit compilers
18+if(CMAKE_CL_64)
19+ set_property(GLOBAL PROPERTY FIND_LIBRARY_USE_LIB64_PATHS True)
20+endif()
21
22 # MSVC specific definitions
23 if(WIN32)
24@@ -104,10 +108,10 @@
25 add_definitions(-DBIG_ENDIAN=0 -DLITTLE_ENDIAN=1 -DBYTE_ORDER=BIG_ENDIAN)
26 endif()
27
28-set(LIB_SUFFIX "" CACHE STRING "Define suffix of directory name (32/64)")
29-set(LIB_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}" CACHE STRING "Library directory name" FORCE)
30-set(INCLUDE_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/include" CACHE STRING "Include directory name" FORCE)
31-set(SHARE_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/share" CACHE STRING "Share directory name" FORCE)
32+include(GNUInstallDirs)
33+set(LIB_INSTALL_DIR ${CMAKE_INSTALL_LIBDIR} CACHE STRING "Library directory name" FORCE)
34+set(INCLUDE_INSTALL_DIR ${CMAKE_INSTALL_INCLUDEDIR} CACHE STRING "Include directory name" FORCE)
35+set(SHARE_INSTALL_DIR ${CMAKE_INSTALL_DATAROOTDIR} CACHE STRING "Share directory name")
36
37 # set the output paths
38 set(EXECUTABLE_OUTPUT_PATH ${CMAKE_BINARY_DIR}/bin)
diff --git a/meta/recipes-support/libical/libical/Remove-cmake-check-for-Perl.patch b/meta/recipes-support/libical/libical/Remove-cmake-check-for-Perl.patch
new file mode 100644
index 0000000000..c5c0cb076e
--- /dev/null
+++ b/meta/recipes-support/libical/libical/Remove-cmake-check-for-Perl.patch
@@ -0,0 +1,33 @@
1From 918cd8764a845a9d25918a444fbaa5070d2be609 Mon Sep 17 00:00:00 2001
2From: Jussi Kukkonen <jussi.kukkonen@intel.com>
3Date: Fri, 21 Aug 2015 16:38:05 +0300
4Subject: [PATCH] Remove cmake check for Perl
5
6We set "CMAKE_FIND_ROOT_PATH_MODE_PROGRAM ONLY" in cmake bbclass to
7make sure cmake does not find host programs. In this case we actually
8are fine with host perl: remove the check.
9
10Upstream-Status: Inappropriate [workaround]
11
12Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
13---
14 CMakeLists.txt | 3 +--
15 1 file changed, 1 insertion(+), 2 deletions(-)
16
17diff --git a/CMakeLists.txt b/CMakeLists.txt
18index d5aad80..5cc9863 100644
19--- a/CMakeLists.txt
20+++ b/CMakeLists.txt
21@@ -91,8 +91,7 @@ if(SHARED_ONLY)
22 set(LIBRARY_TYPE SHARED)
23 endif()
24
25-# must have Perl to create the derived stuff
26-find_package(Perl REQUIRED)
27+set(PERL_EXECUTABLE perl)
28
29 # MSVC specific definitions
30 if(WIN32)
31--
322.1.4
33
diff --git a/meta/recipes-support/libical/libical_1.0.0.bb b/meta/recipes-support/libical/libical_1.0.1.bb
index 026e7f1b26..e18b80339a 100644
--- a/meta/recipes-support/libical/libical_1.0.0.bb
+++ b/meta/recipes-support/libical/libical_1.0.1.bb
@@ -6,10 +6,14 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d4fc58309d8ed46587ac63bb449d82f8 \
6 file://LICENSE;md5=d1a0891cd3e582b3e2ec8fe63badbbb6" 6 file://LICENSE;md5=d1a0891cd3e582b3e2ec8fe63badbbb6"
7SECTION = "libs" 7SECTION = "libs"
8 8
9SRC_URI = "https://github.com/${BPN}/${BPN}/archive/v${PV}.tar.gz" 9SRC_URI = "https://github.com/${BPN}/${BPN}/archive/v${PV}.tar.gz \
10SRC_URI[md5sum] = "f4b8e33ae5efb2f025eb43ce69682a36" 10 file://Remove-cmake-check-for-Perl.patch \
11SRC_URI[sha256sum] = "0072e83834092315772e6719b85fc8b11530b1ff53f4d108315fb38cddbce8c2" 11 file://Fix-x32-ABI-build.patch \
12 file://Depend-on-headers-to-fix-parallel-build.patch \
13 "
14SRC_URI[md5sum] = "af91db06b22559f863869c5a382ad08a"
15SRC_URI[sha256sum] = "7d5f613454ec6c7d1bcfb441c919215be53292aa15cd1cb14249d1413d6c610c"
12 16
13UPSTREAM_CHECK_URI = "https://github.com/libical/libical/releases/" 17inherit cmake
14 18
15inherit autotools 19FILES_${PN}-dev += "${libdir}/cmake/*"