summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2018-03-08 20:17:28 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-03-09 09:17:02 -0800
commitd1b6e1892d2a2782c86cc565c5dde22fcba0b12f (patch)
tree59ee6499f5199cdf095aabe304be86d18de41a28 /meta
parente109e6bd7f5d6dff035edb6851c532edeb5d1a02 (diff)
downloadpoky-d1b6e1892d2a2782c86cc565c5dde22fcba0b12f.tar.gz
libical: refresh patches
The patch tool will apply patches by default with "fuzz", which is where if the hunk context isn't present but what is there is close enough, it will force the patch in. Whilst this is useful when there's just whitespace changes, when applied to source it is possible for a patch applied with fuzz to produce broken code which still compiles (see #10450). This is obviously bad. We'd like to eventually have do_patch() rejecting any fuzz on these grounds. For that to be realistic the existing patches with fuzz need to be rebased and reviewed. (From OE-Core rev: 91e54d9967d8237abf0cc9aab408bad9bbb4c0b7) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-support/libical/libical/Remove-cmake-check-for-Perl.patch17
1 files changed, 7 insertions, 10 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
index c5c0cb076e..b50f50e701 100644
--- a/meta/recipes-support/libical/libical/Remove-cmake-check-for-Perl.patch
+++ b/meta/recipes-support/libical/libical/Remove-cmake-check-for-Perl.patch
@@ -14,11 +14,11 @@ Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
14 CMakeLists.txt | 3 +-- 14 CMakeLists.txt | 3 +--
15 1 file changed, 1 insertion(+), 2 deletions(-) 15 1 file changed, 1 insertion(+), 2 deletions(-)
16 16
17diff --git a/CMakeLists.txt b/CMakeLists.txt 17Index: libical-2.0.0/CMakeLists.txt
18index d5aad80..5cc9863 100644 18===================================================================
19--- a/CMakeLists.txt 19--- libical-2.0.0.orig/CMakeLists.txt
20+++ b/CMakeLists.txt 20+++ libical-2.0.0/CMakeLists.txt
21@@ -91,8 +91,7 @@ if(SHARED_ONLY) 21@@ -116,8 +116,7 @@ if(SHARED_ONLY)
22 set(LIBRARY_TYPE SHARED) 22 set(LIBRARY_TYPE SHARED)
23 endif() 23 endif()
24 24
@@ -26,8 +26,5 @@ index d5aad80..5cc9863 100644
26-find_package(Perl REQUIRED) 26-find_package(Perl REQUIRED)
27+set(PERL_EXECUTABLE perl) 27+set(PERL_EXECUTABLE perl)
28 28
29 # MSVC specific definitions 29 # Ensure finding 64bit libs when using 64-bit compilers
30 if(WIN32) 30 if(CMAKE_CL_64)
31--
322.1.4
33