diff options
| -rw-r--r-- | meta/recipes-support/libical/libical/Remove-cmake-check-for-Perl.patch | 30 | ||||
| -rw-r--r-- | meta/recipes-support/libical/libical_2.0.0.bb | 4 |
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 @@ | |||
| 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) | ||
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 \ | |||
| 7 | SECTION = "libs" | 7 | SECTION = "libs" |
| 8 | 8 | ||
| 9 | SRC_URI = "https://github.com/${BPN}/${BPN}/releases/download/v${PV}/${BP}.tar.gz \ | 9 | SRC_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 | " |
| 13 | DEPENDS = "icu" | 12 | DEPENDS = "icu" |
| @@ -18,6 +17,9 @@ UPSTREAM_CHECK_URI = "https://github.com/libical/libical/releases" | |||
| 18 | 17 | ||
| 19 | inherit cmake pkgconfig | 18 | inherit cmake pkgconfig |
| 20 | 19 | ||
| 20 | # No need to use perl-native, the host perl is sufficient. | ||
| 21 | EXTRA_OECMAKE += "-DPERL_EXECUTABLE=${HOSTTOOLS_DIR}/perl" | ||
| 22 | |||
| 21 | do_install_append_class-target () { | 23 | do_install_append_class-target () { |
| 22 | # Remove build host references | 24 | # Remove build host references |
| 23 | sed -i \ | 25 | sed -i \ |
