diff options
author | Ross Burton <ross.burton@intel.com> | 2019-06-04 21:55:00 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-06-06 00:40:07 +0100 |
commit | 66a0ca52eff07b07ba58949d46d33e67463268bc (patch) | |
tree | 0054a3b183d86c2b96c4f9194151a58037e8e7b0 /meta/recipes-support/libical/libical | |
parent | ee5544f30188854ebacaa9d84fa8a3dc0cac548a (diff) | |
download | poky-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/libical')
-rw-r--r-- | meta/recipes-support/libical/libical/Remove-cmake-check-for-Perl.patch | 30 |
1 files changed, 0 insertions, 30 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 @@ | |||
1 | From 918cd8764a845a9d25918a444fbaa5070d2be609 Mon Sep 17 00:00:00 2001 | ||
2 | From: Jussi Kukkonen <jussi.kukkonen@intel.com> | ||
3 | Date: Fri, 21 Aug 2015 16:38:05 +0300 | ||
4 | Subject: [PATCH] Remove cmake check for Perl | ||
5 | |||
6 | We set "CMAKE_FIND_ROOT_PATH_MODE_PROGRAM ONLY" in cmake bbclass to | ||
7 | make sure cmake does not find host programs. In this case we actually | ||
8 | are fine with host perl: remove the check. | ||
9 | |||
10 | Upstream-Status: Inappropriate [workaround] | ||
11 | |||
12 | Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> | ||
13 | --- | ||
14 | CMakeLists.txt | 3 +-- | ||
15 | 1 file changed, 1 insertion(+), 2 deletions(-) | ||
16 | |||
17 | Index: 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) | ||