summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/recipes-support/libical/libical/0001-CMakeLists.txt-libical.pc.in-fix-iculibs-remove-full.patch44
-rw-r--r--meta/recipes-support/libical/libical_2.0.0.bb10
2 files changed, 46 insertions, 8 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 @@
1From 1a41069c0dc054e59cd76fc3d8cf7cc2a78b5e8d Mon Sep 17 00:00:00 2001
2From: Allen Winter <allen.winter@kdab.com>
3Date: Sat, 3 Sep 2016 16:56:29 -0400
4Subject: [PATCH] CMakeLists.txt, libical.pc.in - fix iculibs (remove full path) ISSUE: 227
5
6Upstream-Status: Backport
7
8Signed-off-by: Maxin B. John <maxin.john@intel.com>
9----
10diff -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
29diff -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}
diff --git a/meta/recipes-support/libical/libical_2.0.0.bb b/meta/recipes-support/libical/libical_2.0.0.bb
index 1042e6fa38..d4fe868eb4 100644
--- a/meta/recipes-support/libical/libical_2.0.0.bb
+++ b/meta/recipes-support/libical/libical_2.0.0.bb
@@ -8,6 +8,7 @@ SECTION = "libs"
8 8
9SRC_URI = "https://github.com/${BPN}/${BPN}/releases/download/v${PV}/${BP}.tar.gz \ 9SRC_URI = "https://github.com/${BPN}/${BPN}/releases/download/v${PV}/${BP}.tar.gz \
10 file://Remove-cmake-check-for-Perl.patch \ 10 file://Remove-cmake-check-for-Perl.patch \
11 file://0001-CMakeLists.txt-libical.pc.in-fix-iculibs-remove-full.patch \
11 " 12 "
12DEPENDS = "icu" 13DEPENDS = "icu"
13 14
@@ -15,13 +16,6 @@ SRC_URI[md5sum] = "6bf8e5f5a3ba88baf390d0134e05d76e"
15SRC_URI[sha256sum] = "654c11f759c19237be39f6ad401d917e5a05f36f1736385ed958e60cf21456da" 16SRC_URI[sha256sum] = "654c11f759c19237be39f6ad401d917e5a05f36f1736385ed958e60cf21456da"
16UPSTREAM_CHECK_URI = "https://github.com/libical/libical/releases" 17UPSTREAM_CHECK_URI = "https://github.com/libical/libical/releases"
17 18
18inherit cmake 19inherit cmake pkgconfig
19 20
20FILES_${PN}-dev += "${libdir}/cmake/*" 21FILES_${PN}-dev += "${libdir}/cmake/*"
21
22#
23# Turn specific library paths in the pkgconfig file into standard library entries
24#
25do_install_append () {
26 sed -i -e "s#${STAGING_LIBDIR}/lib\([a-z0-9]*\)\.so#-l\1#g" ${D}${libdir}/pkgconfig/libical.pc
27}