From 346b225b71f8293c9d05386b517b9714c75e475b Mon Sep 17 00:00:00 2001 From: "Maxin B. John" Date: Thu, 28 Jan 2016 16:34:45 +0200 Subject: 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 (From OE-Core rev: 2912e2594c7574a9e695d9ba1c302ef941f6f9f8) Signed-off-by: Maxin B. John Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- .../libical/libical/Fix-x32-ABI-build.patch | 38 ---------------------- 1 file changed, 38 deletions(-) delete mode 100644 meta/recipes-support/libical/libical/Fix-x32-ABI-build.patch (limited to 'meta/recipes-support/libical/libical/Fix-x32-ABI-build.patch') 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 ---- -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) -- cgit v1.2.3-54-g00ecf