summaryrefslogtreecommitdiffstats
path: root/meta/recipes-support/libical
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2019-06-04 21:55:00 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-06-06 00:40:07 +0100
commit66a0ca52eff07b07ba58949d46d33e67463268bc (patch)
tree0054a3b183d86c2b96c4f9194151a58037e8e7b0 /meta/recipes-support/libical
parentee5544f30188854ebacaa9d84fa8a3dc0cac548a (diff)
downloadpoky-66a0ca52eff07b07ba58949d46d33e67463268bc.tar.gz
libical: tidy up Perl finding
Instead of patching out the Perl detection, seed the search for perl with HOSTTOOLS_DIR/perl. This search usually fails because we don't let find_program() hunt in the system paths currently. (From OE-Core rev: 802091c09091b71814cbdce0ec3323741862f807) 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')
-rw-r--r--meta/recipes-support/libical/libical/Remove-cmake-check-for-Perl.patch30
-rw-r--r--meta/recipes-support/libical/libical_2.0.0.bb4
2 files changed, 3 insertions, 31 deletions
diff --git a/meta/recipes-support/libical/libical/Remove-cmake-check-for-Perl.patch b/meta/recipes-support/libical/libical/Remove-cmake-check-for-Perl.patch
deleted file mode 100644
index b50f50e701..0000000000
--- a/meta/recipes-support/libical/libical/Remove-cmake-check-for-Perl.patch
+++ /dev/null
@@ -1,30 +0,0 @@
1From 918cd8764a845a9d25918a444fbaa5070d2be609 Mon Sep 17 00:00:00 2001
2From: Jussi Kukkonen <jussi.kukkonen@intel.com>
3Date: Fri, 21 Aug 2015 16:38:05 +0300
4Subject: [PATCH] Remove cmake check for Perl
5
6We set "CMAKE_FIND_ROOT_PATH_MODE_PROGRAM ONLY" in cmake bbclass to
7make sure cmake does not find host programs. In this case we actually
8are fine with host perl: remove the check.
9
10Upstream-Status: Inappropriate [workaround]
11
12Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
13---
14 CMakeLists.txt | 3 +--
15 1 file changed, 1 insertion(+), 2 deletions(-)
16
17Index: libical-2.0.0/CMakeLists.txt
18===================================================================
19--- libical-2.0.0.orig/CMakeLists.txt
20+++ libical-2.0.0/CMakeLists.txt
21@@ -116,8 +116,7 @@ if(SHARED_ONLY)
22 set(LIBRARY_TYPE SHARED)
23 endif()
24
25-# must have Perl to create the derived stuff
26-find_package(Perl REQUIRED)
27+set(PERL_EXECUTABLE perl)
28
29 # Ensure finding 64bit libs when using 64-bit compilers
30 if(CMAKE_CL_64)
diff --git a/meta/recipes-support/libical/libical_2.0.0.bb b/meta/recipes-support/libical/libical_2.0.0.bb
index daa47abcbc..fc33f8ea2d 100644
--- a/meta/recipes-support/libical/libical_2.0.0.bb
+++ b/meta/recipes-support/libical/libical_2.0.0.bb
@@ -7,7 +7,6 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d4fc58309d8ed46587ac63bb449d82f8 \
7SECTION = "libs" 7SECTION = "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 \
11 file://0001-CMakeLists.txt-libical.pc.in-fix-iculibs-remove-full.patch \ 10 file://0001-CMakeLists.txt-libical.pc.in-fix-iculibs-remove-full.patch \
12 " 11 "
13DEPENDS = "icu" 12DEPENDS = "icu"
@@ -18,6 +17,9 @@ UPSTREAM_CHECK_URI = "https://github.com/libical/libical/releases"
18 17
19inherit cmake pkgconfig 18inherit cmake pkgconfig
20 19
20# No need to use perl-native, the host perl is sufficient.
21EXTRA_OECMAKE += "-DPERL_EXECUTABLE=${HOSTTOOLS_DIR}/perl"
22
21do_install_append_class-target () { 23do_install_append_class-target () {
22 # Remove build host references 24 # Remove build host references
23 sed -i \ 25 sed -i \