summaryrefslogtreecommitdiffstats
path: root/meta/recipes-support/libical/libical/Fix-x32-ABI-build.patch
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-30 11:37:04 +0000
commit346b225b71f8293c9d05386b517b9714c75e475b (patch)
tree4a6c93bcac394fad371c162bfa76fda9f9847ccf /meta/recipes-support/libical/libical/Fix-x32-ABI-build.patch
parentb696bb32a7f0a7a187eb1f470f14aac0867c0eda (diff)
downloadpoky-346b225b71f8293c9d05386b517b9714c75e475b.tar.gz
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 <maxin.john@intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-support/libical/libical/Fix-x32-ABI-build.patch')
-rw-r--r--meta/recipes-support/libical/libical/Fix-x32-ABI-build.patch38
1 files changed, 0 insertions, 38 deletions
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 @@
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)