diff options
Diffstat (limited to 'meta/recipes-support/libical/libical/0001-CMakeLists.txt-libical.pc.in-fix-iculibs-remove-full.patch')
-rw-r--r-- | meta/recipes-support/libical/libical/0001-CMakeLists.txt-libical.pc.in-fix-iculibs-remove-full.patch | 44 |
1 files changed, 44 insertions, 0 deletions
diff --git a/meta/recipes-support/libical/libical/0001-CMakeLists.txt-libical.pc.in-fix-iculibs-remove-full.patch b/meta/recipes-support/libical/libical/0001-CMakeLists.txt-libical.pc.in-fix-iculibs-remove-full.patch new file mode 100644 index 0000000000..6db75f5086 --- /dev/null +++ b/meta/recipes-support/libical/libical/0001-CMakeLists.txt-libical.pc.in-fix-iculibs-remove-full.patch | |||
@@ -0,0 +1,44 @@ | |||
1 | From 1a41069c0dc054e59cd76fc3d8cf7cc2a78b5e8d Mon Sep 17 00:00:00 2001 | ||
2 | From: Allen Winter <allen.winter@kdab.com> | ||
3 | Date: Sat, 3 Sep 2016 16:56:29 -0400 | ||
4 | Subject: [PATCH] CMakeLists.txt, libical.pc.in - fix iculibs (remove full path) ISSUE: 227 | ||
5 | |||
6 | Upstream-Status: Backport | ||
7 | |||
8 | Signed-off-by: Maxin B. John <maxin.john@intel.com> | ||
9 | ---- | ||
10 | diff -Naur libical-2.0.0-orig/CMakeLists.txt libical-2.0.0/CMakeLists.txt | ||
11 | --- libical-2.0.0-orig/CMakeLists.txt 2016-09-08 18:05:06.166049345 +0300 | ||
12 | +++ libical-2.0.0/CMakeLists.txt 2016-09-08 18:05:45.201561334 +0300 | ||
13 | @@ -128,6 +128,7 @@ | ||
14 | # RSCALE info at http://tools.ietf.org/html/rfc7529 | ||
15 | find_package(ICU) | ||
16 | if(ICU_FOUND) | ||
17 | + set(ICUUC_LIBS "-licuuc") #for libical.pc | ||
18 | set(HAVE_LIBICU 1) | ||
19 | if(ICU_MAJOR_VERSION VERSION_GREATER 50) | ||
20 | set(HAVE_ICU_DANGI TRUE) | ||
21 | @@ -137,6 +138,7 @@ | ||
22 | endif() | ||
23 | if(ICU_I18N_FOUND) | ||
24 | set(HAVE_LIBICU_I18N 1) | ||
25 | + set(ICUI18N_LIBS "-licui18n") #for libical.pc | ||
26 | endif() | ||
27 | |||
28 | # MSVC specific definitions | ||
29 | diff -Naur libical-2.0.0-orig/libical.pc.in libical-2.0.0/libical.pc.in | ||
30 | --- libical-2.0.0-orig/libical.pc.in 2015-12-28 23:44:53.000000000 +0200 | ||
31 | +++ libical-2.0.0/libical.pc.in 2016-09-08 18:09:12.991963597 +0300 | ||
32 | @@ -3,10 +3,10 @@ | ||
33 | libdir=@libdir@ | ||
34 | includedir=@includedir@ | ||
35 | threadslib=@PTHREAD_LIBS@ | ||
36 | -iculib=@ICU_LIBRARIES@ @ICU_I18N_LIBRARIES@ | ||
37 | +iculibs=@ICUUC_LIBS@ @ICUI18N_LIBS@ | ||
38 | |||
39 | Name: libical | ||
40 | Description: An implementation of basic iCAL protocols | ||
41 | Version: @VERSION@ | ||
42 | -Libs: -L${libdir} -lical -licalss -licalvcal ${threadslib} ${iculib} | ||
43 | +Libs: -L${libdir} -lical -licalss -licalvcal ${threadslib} ${iculibs} | ||
44 | Cflags: -I${includedir} | ||