diff options
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.patch | 38 |
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 @@ | |||
1 | Subject: [PATCH] Use GNUInstallDirs. | ||
2 | |||
3 | x32 ABI build fails because of improper library path. Use | ||
4 | GNUInstallDirs to fix it. | ||
5 | |||
6 | Upstream-Status: Backport | ||
7 | |||
8 | Signed-off-by: Maxin B. John <maxin.john@intel.com> | ||
9 | --- | ||
10 | diff -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) | ||