From: Jussi Kukkonen <[email protected]> * Build system changed to cmake. * Patch build system to not check for perl (we use host perl which won't be found)
Signed-off-by: Jussi Kukkonen <[email protected]> Signed-off-by: Maxin B. John <[email protected]> --- .../libical/Remove-cmake-check-for-Perl.patch | 33 ++++++++++++++++++++++ .../libical/{libical_1.0.0.bb => libical_1.0.1.bb} | 12 +++++--- 2 files changed, 41 insertions(+), 4 deletions(-) create mode 100644 meta/recipes-support/libical/libical/Remove-cmake-check-for-Perl.patch rename meta/recipes-support/libical/{libical_1.0.0.bb => libical_1.0.1.bb} (61%) 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 new file mode 100644 index 0000000..c5c0cb0 --- /dev/null +++ b/meta/recipes-support/libical/libical/Remove-cmake-check-for-Perl.patch @@ -0,0 +1,33 @@ +From 918cd8764a845a9d25918a444fbaa5070d2be609 Mon Sep 17 00:00:00 2001 +From: Jussi Kukkonen <[email protected]> +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 <[email protected]> +--- + CMakeLists.txt | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index d5aad80..5cc9863 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -91,8 +91,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) + + # MSVC specific definitions + if(WIN32) +-- +2.1.4 + diff --git a/meta/recipes-support/libical/libical_1.0.0.bb b/meta/recipes-support/libical/libical_1.0.1.bb similarity index 61% rename from meta/recipes-support/libical/libical_1.0.0.bb rename to meta/recipes-support/libical/libical_1.0.1.bb index be6b635..7dcb9eb 100644 --- a/meta/recipes-support/libical/libical_1.0.0.bb +++ b/meta/recipes-support/libical/libical_1.0.1.bb @@ -6,8 +6,12 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d4fc58309d8ed46587ac63bb449d82f8 \ file://LICENSE;md5=d1a0891cd3e582b3e2ec8fe63badbbb6" SECTION = "libs" -SRC_URI = "https://github.com/${BPN}/${BPN}/archive/v${PV}.tar.gz"; -SRC_URI[md5sum] = "f4b8e33ae5efb2f025eb43ce69682a36" -SRC_URI[sha256sum] = "0072e83834092315772e6719b85fc8b11530b1ff53f4d108315fb38cddbce8c2" +SRC_URI = "https://github.com/${BPN}/${BPN}/archive/v${PV}.tar.gz \ + file://Remove-cmake-check-for-Perl.patch \ + " +SRC_URI[md5sum] = "af91db06b22559f863869c5a382ad08a" +SRC_URI[sha256sum] = "7d5f613454ec6c7d1bcfb441c919215be53292aa15cd1cb14249d1413d6c610c" -inherit autotools +inherit cmake + +FILES_${PN}-dev += "${libdir}/cmake/*" -- 2.4.0 -- _______________________________________________ Openembedded-core mailing list [email protected] http://lists.openembedded.org/mailman/listinfo/openembedded-core
