From patchwork Tue Jun 4 20:55:00 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 165840 Delivered-To: patch@linaro.org Received: by 2002:a92:9e1a:0:0:0:0:0 with SMTP id q26csp6346635ili; Tue, 4 Jun 2019 13:55:18 -0700 (PDT) X-Google-Smtp-Source: APXvYqyQ+e4V4EzMlgpZUK1ooSM1dTv5zz7s2/zox2e5lJL0bGKD9CVaT8G5q4XekrNEatxZWl+F X-Received: by 2002:a17:90a:8b91:: with SMTP id z17mr39576530pjn.61.1559681718018; Tue, 04 Jun 2019 13:55:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1559681718; cv=none; d=google.com; s=arc-20160816; b=s3m5OQaGiQa4GguiApleOOELqGY+PK5Rb/7z1VevUuuHs9b+LyJRNTjU301CcLXUGd JJ19mwP+gM7ktl+v3FSmLp8KzJyNuPtH1A8ecgQpRmmeGhfJIG7LC68awnzil7vpwwvx hLBuUM8kMCLC4N/5KOAx/BI0q7258EkdjjzfloYZQecmq8bCI1prkbXClN/yB/csNjiF bHwur9t4WIenbCeiqXyvt3o0iJHb25tMm9430CDZyK+wCdQMIpX5pSU4qfdeZzr6Ydfz ZUyedzLVj1bOWcuqh3gevBjMI2JJNMFO/mx5Bt/ES49i7k971aL8hTutb55GLPcu9zs4 UgoA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender:content-transfer-encoding:mime-version :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:message-id:date:to:from:dkim-signature :delivered-to; bh=NIyzlzCVbHJ5aYOZBy1730SXMwcQSQNVNfLQriBBO6o=; b=ceaTQ3VWJJH/gj7rBrNW/piDX0vweSa5QT35f6VkDEwdkpEm5d8GQRJT94mdw09ufC /P0UJT5HCHh0JuP6Pd1NkkTcDdcGcDlcFUqzVYtn+fT7xcp34++GrUcRHA7eI59aiJU5 VcWxLCSj0+M5mdt8342ht/ntZEzKSX+aWMoOPavEYaml7E0bOT6Ijg0OD27VKfvf9bpZ ficHpMR+u/WLyz81ss7aRU/kS/CgyNPgttvFd+4S1zV97zuwr529y9NTVjpe3GSASkm7 E3OBxk1em942mIyUicO9ICjY5AWcax0GtKoZCS1Vej1ZG6LRW1xMcFnOsp9NbhAG9fys Ro2w== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel-com.20150623.gappssmtp.com header.s=20150623 header.b=lQThmdUb; spf=pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-core-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id x24si19296674pgh.393.2019.06.04.13.55.17; Tue, 04 Jun 2019 13:55:17 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) client-ip=140.211.169.62; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel-com.20150623.gappssmtp.com header.s=20150623 header.b=lQThmdUb; spf=pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-core-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from ec2-34-214-78-129.us-west-2.compute.amazonaws.com (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id A19F77E15F; Tue, 4 Jun 2019 20:55:09 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mail-wr1-f68.google.com (mail-wr1-f68.google.com [209.85.221.68]) by mail.openembedded.org (Postfix) with ESMTP id 6C29C7E08C for ; Tue, 4 Jun 2019 20:55:07 +0000 (UTC) Received: by mail-wr1-f68.google.com with SMTP id m3so1435517wrv.2 for ; Tue, 04 Jun 2019 13:55:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=intel-com.20150623.gappssmtp.com; s=20150623; h=from:to:subject:date:message-id; bh=4WCty8wi1weyfbnQtn0Qh3rE6fUWuZ4SwKHi7ALAPoI=; b=lQThmdUbprDy0RGx2hbNwXFkJH87CKlGuN0/papx/iml6KRuUkxt3x0QVCjtWtfHo/ 25vgefGkE87LCw117cNmqjzL0KH86m1NnuaUTZMe/nK1myOU9xRs3P96aBlWJ53mLOa3 08LlLZd3p4d2PQFguHHwnjgoBvCjokhTLzpJ8Yvx17xp0RA1lJ9NMsohUZ8HKAukyopA m8HyVzHE0ZO05gy5eT3qKjQXDVF+f5DMsR6CrXJoefzf7CcvF8fXBzqD4dx078+9Wq8u CanGUDioXD3cvDuGP6fItFmkazMt3Sun1sVJ84VjjZe1UV3nG1PAllGMHg6VF+VXljXc t+7Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id; bh=4WCty8wi1weyfbnQtn0Qh3rE6fUWuZ4SwKHi7ALAPoI=; b=jsj7jJXbXq759AO/sSErVaRRV8hSfdc5L8y8pMAhVgAPDR9MKv4+rvV8DOLouyZU5R 637IssiazXxsQlqjXrGm2FCMyiCsu3LBKbNoA/vYneUmNlO7/fU7ahkpJx3oRmCmdnsP DEfz6uirf5SeqDNFNYeunrKJZVtzCExQM7XjnqEbq8fyqgMOxBFyS6bFkoGJns/zYKPS QTdPbFAik+GRfqshEVQgsH2vS5EIxGVqtTii0J/wrkd6KEZHZMXBg2fLo4I1c5H6/B4B 47oskXPN/sGhvJDhnz56QX2DtUagIFppmkwkyQ2G5BZz/tW+Mo7JLDV6eF/E3RO3xlBA k/4w== X-Gm-Message-State: APjAAAVBvm3zsvEqKz1Cd0zuyCi9PH44s6Tq2yBYydfbvgGXEFvF/9NV ekG0eePX4eM0/c6rTaa8NIsD5k1EG+A= X-Received: by 2002:a5d:4692:: with SMTP id u18mr21963300wrq.285.1559681707920; Tue, 04 Jun 2019 13:55:07 -0700 (PDT) Received: from flashheart.burtonini.com (35.106.2.81.in-addr.arpa. [81.2.106.35]) by smtp.gmail.com with ESMTPSA id r131sm7529338wmf.4.2019.06.04.13.55.05 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 04 Jun 2019 13:55:06 -0700 (PDT) From: Ross Burton To: openembedded-core@lists.openembedded.org Date: Tue, 4 Jun 2019 21:55:00 +0100 Message-Id: <20190604205500.10166-1-ross.burton@intel.com> X-Mailer: git-send-email 2.11.0 Subject: [OE-core] [PATCH] libical: tidy up Perl finding X-BeenThere: openembedded-core@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Patches and discussions about the oe-core layer List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: openembedded-core-bounces@lists.openembedded.org Errors-To: openembedded-core-bounces@lists.openembedded.org 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. Signed-off-by: Ross Burton --- .../libical/Remove-cmake-check-for-Perl.patch | 30 ---------------------- meta/recipes-support/libical/libical_2.0.0.bb | 4 ++- 2 files changed, 3 insertions(+), 31 deletions(-) delete mode 100644 meta/recipes-support/libical/libical/Remove-cmake-check-for-Perl.patch -- 2.11.0 -- _______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core 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 b50f50e7017..00000000000 --- a/meta/recipes-support/libical/libical/Remove-cmake-check-for-Perl.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 918cd8764a845a9d25918a444fbaa5070d2be609 Mon Sep 17 00:00:00 2001 -From: Jussi Kukkonen -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 ---- - CMakeLists.txt | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) - -Index: libical-2.0.0/CMakeLists.txt -=================================================================== ---- libical-2.0.0.orig/CMakeLists.txt -+++ libical-2.0.0/CMakeLists.txt -@@ -116,8 +116,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) - - # Ensure finding 64bit libs when using 64-bit compilers - 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 daa47abcbcf..fc33f8ea2df 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 \ SECTION = "libs" SRC_URI = "https://github.com/${BPN}/${BPN}/releases/download/v${PV}/${BP}.tar.gz \ - file://Remove-cmake-check-for-Perl.patch \ file://0001-CMakeLists.txt-libical.pc.in-fix-iculibs-remove-full.patch \ " DEPENDS = "icu" @@ -18,6 +17,9 @@ UPSTREAM_CHECK_URI = "https://github.com/libical/libical/releases" inherit cmake pkgconfig +# No need to use perl-native, the host perl is sufficient. +EXTRA_OECMAKE += "-DPERL_EXECUTABLE=${HOSTTOOLS_DIR}/perl" + do_install_append_class-target () { # Remove build host references sed -i \