summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMaxin B. John <maxin.john@intel.com>2016-01-28 16:34:45 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-01-29 18:14:57 +0000
commit2912e2594c7574a9e695d9ba1c302ef941f6f9f8 (patch)
treebc3107bd18a750c69e124b81ea39c2912c2f568b
parent13cedd57ad4a449b749c29d30bb499c1c073a680 (diff)
downloadopenembedded-core-contrib-2912e2594c7574a9e695d9ba1c302ef941f6f9f8.tar.gz
openembedded-core-contrib-2912e2594c7574a9e695d9ba1c302ef941f6f9f8.tar.bz2
openembedded-core-contrib-2912e2594c7574a9e695d9ba1c302ef941f6f9f8.zip
libical: update to 2.0.0
1.0.1 -> 2.0.0 1. New version is not Binary Compatible with Older Versions 2. Removed two backported patches a. Fix-x32-ABI-build.patch b. Depend-on-headers-to-fix-parallel-build.patch 3. New RSCALE support requires icu Signed-off-by: Maxin B. John <maxin.john@intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com>
-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_2.0.0.bb (renamed from meta/recipes-support/libical/libical_1.0.1.bb)10
3 files changed, 5 insertions, 89 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 @@
-From 56a10a14c0a544df99c97ce279801ddf40b0df52 Mon Sep 17 00:00:00 2001
-From: Jussi Kukkonen <jussi.kukkonen@intel.com>
-Date: Mon, 14 Sep 2015 13:35:42 +0300
-Subject: [PATCH] WIP: Depend on headers to fix parallel build
-
-Parallel builds occasionally fail because generated headers are only
-half built when they're being used.
-
-This fix is extracted
-from https://github.com/libical/libical/commit/dcc40c7ae2d337a0d83c077bf9d8f283499c6717
-
-Upstream-Status: Backport
-Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
-
----
- examples/CMakeLists.txt | 1 +
- src/libical/CMakeLists.txt | 1 +
- 2 files changed, 2 insertions(+)
-
-diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt
-index 3379ffd..514956b 100644
---- a/examples/CMakeLists.txt
-+++ b/examples/CMakeLists.txt
-@@ -16,6 +16,7 @@ set(doesnothing_SRCS
- )
-
- add_executable(doesnothing ${doesnothing_SRCS})
-+add_dependencies(doesnothing ical icalss icalvcal)
-
- target_link_libraries(doesnothing ical icalss icalvcal ical icalss icalvcal)
-
-diff --git a/src/libical/CMakeLists.txt b/src/libical/CMakeLists.txt
-index 6774352..468a7d9 100644
---- a/src/libical/CMakeLists.txt
-+++ b/src/libical/CMakeLists.txt
-@@ -261,6 +261,7 @@ add_library(ical ${LIBRARY_TYPE} ${ical_LIB_SRCS})
- add_library(ical-static STATIC ${ical_LIB_SRCS})
-
- add_dependencies(ical ical-header)
-+add_dependencies(ical-static ical-header)
-
- target_link_libraries(ical ${CMAKE_THREAD_LIBS_INIT})
-
---
-2.1.4
-
diff --git a/meta/recipes-support/libical/libical/Fix-x32-ABI-build.patch b/meta/recipes-support/libical/libical/Fix-x32-ABI-build.patch
deleted file mode 100644
index 12186e2cb1..0000000000
--- a/meta/recipes-support/libical/libical/Fix-x32-ABI-build.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-Subject: [PATCH] Use GNUInstallDirs.
-
-x32 ABI build fails because of improper library path. Use
-GNUInstallDirs to fix it.
-
-Upstream-Status: Backport
-
-Signed-off-by: Maxin B. John <maxin.john@intel.com>
----
-diff -Naur libical-1.0.1-orig/CMakeLists.txt libical-1.0.1/CMakeLists.txt
---- libical-1.0.1-orig/CMakeLists.txt 2015-12-07 18:13:58.311503974 +0200
-+++ libical-1.0.1/CMakeLists.txt 2015-12-07 18:17:18.362002998 +0200
-@@ -92,6 +92,10 @@
- endif()
-
- set(PERL_EXECUTABLE perl)
-+# Ensure finding 64bit libs when using 64-bit compilers
-+if(CMAKE_CL_64)
-+ set_property(GLOBAL PROPERTY FIND_LIBRARY_USE_LIB64_PATHS True)
-+endif()
-
- # MSVC specific definitions
- if(WIN32)
-@@ -104,10 +108,10 @@
- add_definitions(-DBIG_ENDIAN=0 -DLITTLE_ENDIAN=1 -DBYTE_ORDER=BIG_ENDIAN)
- endif()
-
--set(LIB_SUFFIX "" CACHE STRING "Define suffix of directory name (32/64)")
--set(LIB_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}" CACHE STRING "Library directory name" FORCE)
--set(INCLUDE_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/include" CACHE STRING "Include directory name" FORCE)
--set(SHARE_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/share" CACHE STRING "Share directory name" FORCE)
-+include(GNUInstallDirs)
-+set(LIB_INSTALL_DIR ${CMAKE_INSTALL_LIBDIR} CACHE STRING "Library directory name" FORCE)
-+set(INCLUDE_INSTALL_DIR ${CMAKE_INSTALL_INCLUDEDIR} CACHE STRING "Include directory name" FORCE)
-+set(SHARE_INSTALL_DIR ${CMAKE_INSTALL_DATAROOTDIR} CACHE STRING "Share directory name")
-
- # set the output paths
- set(EXECUTABLE_OUTPUT_PATH ${CMAKE_BINARY_DIR}/bin)
diff --git a/meta/recipes-support/libical/libical_1.0.1.bb b/meta/recipes-support/libical/libical_2.0.0.bb
index 838e788bf4..fdbe026761 100644
--- a/meta/recipes-support/libical/libical_1.0.1.bb
+++ b/meta/recipes-support/libical/libical_2.0.0.bb
@@ -6,13 +6,13 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d4fc58309d8ed46587ac63bb449d82f8 \
file://LICENSE;md5=d1a0891cd3e582b3e2ec8fe63badbbb6"
SECTION = "libs"
-SRC_URI = "https://github.com/${BPN}/${BPN}/archive/v${PV}.tar.gz \
+SRC_URI = "https://github.com/${BPN}/${BPN}/releases/download/v${PV}/${BP}.tar.gz \
file://Remove-cmake-check-for-Perl.patch \
- file://Fix-x32-ABI-build.patch \
- file://Depend-on-headers-to-fix-parallel-build.patch \
"
-SRC_URI[md5sum] = "af91db06b22559f863869c5a382ad08a"
-SRC_URI[sha256sum] = "7d5f613454ec6c7d1bcfb441c919215be53292aa15cd1cb14249d1413d6c610c"
+DEPENDS = "icu"
+
+SRC_URI[md5sum] = "6bf8e5f5a3ba88baf390d0134e05d76e"
+SRC_URI[sha256sum] = "654c11f759c19237be39f6ad401d917e5a05f36f1736385ed958e60cf21456da"
UPSTREAM_CHECK_URI = "https://github.com/libical/libical/releases"
inherit cmake