From eb8dc40360f0cfef56fb6947cc817a547d6d9bc6 Mon Sep 17 00:00:00 2001 From: Dave Cobbley Date: Tue, 14 Aug 2018 10:05:37 -0700 Subject: [Subtree] Removing import-layers directory As part of the move to subtrees, need to bring all the import layers content to the top level. Change-Id: I4a163d10898cbc6e11c27f776f60e1a470049d8f Signed-off-by: Dave Cobbley Signed-off-by: Brad Bishop --- ...txt-libical.pc.in-fix-iculibs-remove-full.patch | 44 ++++++++++++++++++++++ .../libical/Remove-cmake-check-for-Perl.patch | 30 +++++++++++++++ poky/meta/recipes-support/libical/libical_2.0.0.bb | 19 ++++++++++ 3 files changed, 93 insertions(+) create mode 100644 poky/meta/recipes-support/libical/libical/0001-CMakeLists.txt-libical.pc.in-fix-iculibs-remove-full.patch create mode 100644 poky/meta/recipes-support/libical/libical/Remove-cmake-check-for-Perl.patch create mode 100644 poky/meta/recipes-support/libical/libical_2.0.0.bb (limited to 'poky/meta/recipes-support/libical') diff --git a/poky/meta/recipes-support/libical/libical/0001-CMakeLists.txt-libical.pc.in-fix-iculibs-remove-full.patch b/poky/meta/recipes-support/libical/libical/0001-CMakeLists.txt-libical.pc.in-fix-iculibs-remove-full.patch new file mode 100644 index 000000000..6db75f508 --- /dev/null +++ b/poky/meta/recipes-support/libical/libical/0001-CMakeLists.txt-libical.pc.in-fix-iculibs-remove-full.patch @@ -0,0 +1,44 @@ +From 1a41069c0dc054e59cd76fc3d8cf7cc2a78b5e8d Mon Sep 17 00:00:00 2001 +From: Allen Winter +Date: Sat, 3 Sep 2016 16:56:29 -0400 +Subject: [PATCH] CMakeLists.txt, libical.pc.in - fix iculibs (remove full path) ISSUE: 227 + +Upstream-Status: Backport + +Signed-off-by: Maxin B. John +---- +diff -Naur libical-2.0.0-orig/CMakeLists.txt libical-2.0.0/CMakeLists.txt +--- libical-2.0.0-orig/CMakeLists.txt 2016-09-08 18:05:06.166049345 +0300 ++++ libical-2.0.0/CMakeLists.txt 2016-09-08 18:05:45.201561334 +0300 +@@ -128,6 +128,7 @@ + # RSCALE info at http://tools.ietf.org/html/rfc7529 + find_package(ICU) + if(ICU_FOUND) ++ set(ICUUC_LIBS "-licuuc") #for libical.pc + set(HAVE_LIBICU 1) + if(ICU_MAJOR_VERSION VERSION_GREATER 50) + set(HAVE_ICU_DANGI TRUE) +@@ -137,6 +138,7 @@ + endif() + if(ICU_I18N_FOUND) + set(HAVE_LIBICU_I18N 1) ++ set(ICUI18N_LIBS "-licui18n") #for libical.pc + endif() + + # MSVC specific definitions +diff -Naur libical-2.0.0-orig/libical.pc.in libical-2.0.0/libical.pc.in +--- libical-2.0.0-orig/libical.pc.in 2015-12-28 23:44:53.000000000 +0200 ++++ libical-2.0.0/libical.pc.in 2016-09-08 18:09:12.991963597 +0300 +@@ -3,10 +3,10 @@ + libdir=@libdir@ + includedir=@includedir@ + threadslib=@PTHREAD_LIBS@ +-iculib=@ICU_LIBRARIES@ @ICU_I18N_LIBRARIES@ ++iculibs=@ICUUC_LIBS@ @ICUI18N_LIBS@ + + Name: libical + Description: An implementation of basic iCAL protocols + Version: @VERSION@ +-Libs: -L${libdir} -lical -licalss -licalvcal ${threadslib} ${iculib} ++Libs: -L${libdir} -lical -licalss -licalvcal ${threadslib} ${iculibs} + Cflags: -I${includedir} diff --git a/poky/meta/recipes-support/libical/libical/Remove-cmake-check-for-Perl.patch b/poky/meta/recipes-support/libical/libical/Remove-cmake-check-for-Perl.patch new file mode 100644 index 000000000..b50f50e70 --- /dev/null +++ b/poky/meta/recipes-support/libical/libical/Remove-cmake-check-for-Perl.patch @@ -0,0 +1,30 @@ +From 918cd8764a845a9d25918a444fbaa5070d2be609 Mon Sep 17 00:00:00 2001 +From: Jussi Kukkonen +Date: Fri, 21 Aug 2015 16:38:05 +0300 +Subject: [PATCH] Remove cmake check for Perl + +We set "CMAKE_FIND_ROOT_PATH_MODE_PROGRAM ONLY" in cmake bbclass to +make sure cmake does not find host programs. In this case we actually +are fine with host perl: remove the check. + +Upstream-Status: Inappropriate [workaround] + +Signed-off-by: Jussi Kukkonen +--- + CMakeLists.txt | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +Index: libical-2.0.0/CMakeLists.txt +=================================================================== +--- libical-2.0.0.orig/CMakeLists.txt ++++ libical-2.0.0/CMakeLists.txt +@@ -116,8 +116,7 @@ if(SHARED_ONLY) + set(LIBRARY_TYPE SHARED) + endif() + +-# must have Perl to create the derived stuff +-find_package(Perl REQUIRED) ++set(PERL_EXECUTABLE perl) + + # Ensure finding 64bit libs when using 64-bit compilers + if(CMAKE_CL_64) diff --git a/poky/meta/recipes-support/libical/libical_2.0.0.bb b/poky/meta/recipes-support/libical/libical_2.0.0.bb new file mode 100644 index 000000000..dcc21cc16 --- /dev/null +++ b/poky/meta/recipes-support/libical/libical_2.0.0.bb @@ -0,0 +1,19 @@ +SUMMARY = "iCal and scheduling (RFC 2445, 2446, 2447) library" +HOMEPAGE = "https://github.com/libical/libical" +BUGTRACKER = "https://github.com/libical/libical/issues" +LICENSE = "LGPLv2.1 | MPL-1" +LIC_FILES_CHKSUM = "file://COPYING;md5=d4fc58309d8ed46587ac63bb449d82f8 \ + file://LICENSE;md5=d1a0891cd3e582b3e2ec8fe63badbbb6" +SECTION = "libs" + +SRC_URI = "https://github.com/${BPN}/${BPN}/releases/download/v${PV}/${BP}.tar.gz \ + file://Remove-cmake-check-for-Perl.patch \ + file://0001-CMakeLists.txt-libical.pc.in-fix-iculibs-remove-full.patch \ + " +DEPENDS = "icu" + +SRC_URI[md5sum] = "6bf8e5f5a3ba88baf390d0134e05d76e" +SRC_URI[sha256sum] = "654c11f759c19237be39f6ad401d917e5a05f36f1736385ed958e60cf21456da" +UPSTREAM_CHECK_URI = "https://github.com/libical/libical/releases" + +inherit cmake pkgconfig -- cgit v1.2.1