From patchwork Thu Nov 30 13:19:34 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 120191 Delivered-To: patch@linaro.org Received: by 10.140.22.227 with SMTP id 90csp660239qgn; Thu, 30 Nov 2017 05:20:19 -0800 (PST) X-Google-Smtp-Source: AGs4zMYQIH26MGmeLruUPWeVuqygDaMJKW5c65CBgpZvT7T8/E7V6dmK/ADCP6OMO7/ZcBFUy+dQ X-Received: by 10.98.201.216 with SMTP id l85mr6639191pfk.217.1512048019256; Thu, 30 Nov 2017 05:20:19 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1512048019; cv=none; d=google.com; s=arc-20160816; b=DEQfRp8DmscQ4WzeH1PIBreGeQh7PNFsSfuXnONKpISI5jGVPajyuj4ewR/EhAvL+S KOldidlPjWO/PiAm1uY1PQIXYK57mvHK3FV4Mo8eipNHFTvf+TBiBrS4SmJdfV4jsxaV 7eOjtdIvWBLhZkYSTftdZ9MfC+/jM6/pVpUAZYqGNs4PXvHJyzAHuJNITLo/g2F5VHZL ZINoexzRnZnR6S1ye8DhExBApK4Wz6tJgsJlDl4KYL6lGPqeJECAFzh5dpA+hFYNzkpq /06Qi5PnxD8yK50pZ08JsMxFktWVKznQT/LU7N7vim//Cr4ke/9VI4qlytmagjx9lWAX cihw== 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:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to:arc-authentication-results; bh=bkBk3BUizKWFL5i7ZNwGDkwpXvTdhN1c5rI7autdV+g=; b=whiEIn1vYbC9/r20JBuIgYQF4cIeSLoOZ0oQmlctNS9CWgKqM/rkkbkpOKV6y+N7wM zeqsW+cT/9Ab1Hk5+1UEwxnGidVyBLUddpFt1UhoWo9fGhig1e60bVuR6UxXQs/1FF2m jmShuOqS6UfqRTYKnUJ73uLqjLdT7F/Kw1K+YpYE3IavlJfPnB5DmWyhaoMromkSG63l 25LEtvsR+5833XAEpM+406Jqq4qL/6A8MNDirfZRytzz0Jwbwsk6I/EG6za1bL7rOCzK SyhjftEorOGb2jO1yV1sC3Q9DCY4BdUcXSe7bVO/MQ7FfAoSx1nKvqJNJOQU8NpS4oaj pU3g== 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=Dknckf2V; 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 Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id s19si3245868pfd.142.2017.11.30.05.20.19; Thu, 30 Nov 2017 05:20:19 -0800 (PST) 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=Dknckf2V; 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 Received: from review.yoctoproject.org (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id 69A25784F5; Thu, 30 Nov 2017 13:20:12 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mail-wm0-f65.google.com (mail-wm0-f65.google.com [74.125.82.65]) by mail.openembedded.org (Postfix) with ESMTP id 86831784DB for ; Thu, 30 Nov 2017 13:19:45 +0000 (UTC) Received: by mail-wm0-f65.google.com with SMTP id 9so12938301wme.4 for ; Thu, 30 Nov 2017 05:19:46 -0800 (PST) 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:in-reply-to:references; bh=04Q9jFNDS0AIH8TUyf+panEsDtOntruttrif09bwxCc=; b=Dknckf2V+F27t4f9j8ReFysK1mgvktaQsO5IHlLFdPtZHvrO6TU178fw0ApLnfrzK3 rAaL3roCddAnzH9O4CF1SJKr9cV0SkrCZP9Vgku3c504zHVJjgyP9K400yJ+I0v4x+Ij J+Vrs4wKFmZxI/SKke0VfJyNENmfCT9odvVqOlOvD+586y63/tmFhcovfcTs1JEBk4eM +YNSXnAcYbdtXJ/+Ebl143M3FDLoPYW1CqFYLE+PEAox+sGGWycU0wdDGVODLhMnvzSb /kdO4zAK0m8z9qarIpGAB6srRmR0N2VgBbzOnA5wmmIScDkjwK8Ul3WLLhboQA303Zwf gSuw== 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:in-reply-to :references; bh=04Q9jFNDS0AIH8TUyf+panEsDtOntruttrif09bwxCc=; b=WZN/Z7GROrAC3KpTsuPpvq9ZW/3/zHprQctI8DPSF634n2Tj8xCuICLNQnhgwcirjK YvAGzUXqvK8WVEBmzorUWTQQIakl7T7WyZYh6oNWb0dD4su3yMtr8FCTtCX4TqNBvLaV H1e80xHUd3dZ5eeRPUl/4stgHBBwJXQ2LPsVpvyhGKQaAJIxNlE+tmewlAcPc6RjJAlQ +F3+Kk5OsFROhABoE/2rB6l4jS58v8UgKkk4bj2HD0Vv9/mBvTWDA4aKE2ZGFUU5Glfj rZo7U6JcJrbEdmQY3l9e102KMej5D1uNu4d9wty07+XxGNSqAt5vo/zjIyPDrRix0zqz ZCVw== X-Gm-Message-State: AJaThX5ZVDKPFn4l/X/jV2HPVuY9DGzZ+OtLCWxZX2js/uRj+yq1FQ6e CyvyBgoRIluigs76u99iSVON1/Lx X-Received: by 10.28.63.141 with SMTP id m135mr1992697wma.72.1512047985922; Thu, 30 Nov 2017 05:19:45 -0800 (PST) Received: from flashheart.burtonini.com (home.burtonini.com. [81.2.106.35]) by smtp.gmail.com with ESMTPSA id q15sm3602780wra.91.2017.11.30.05.19.44 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 30 Nov 2017 05:19:45 -0800 (PST) From: Ross Burton To: openembedded-core@lists.openembedded.org Date: Thu, 30 Nov 2017 13:19:34 +0000 Message-Id: <20171130131935.20771-3-ross.burton@intel.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20171130131935.20771-1-ross.burton@intel.com> References: <20171130131935.20771-1-ross.burton@intel.com> Subject: [OE-core] [PATCH 3/4] gperf: merge inc into bb 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 Signed-off-by: Ross Burton --- meta/recipes-extended/gperf/gperf.inc | 22 ---------------------- meta/recipes-extended/gperf/gperf_3.1.bb | 23 +++++++++++++++++++++-- 2 files changed, 21 insertions(+), 24 deletions(-) delete mode 100644 meta/recipes-extended/gperf/gperf.inc -- 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-extended/gperf/gperf.inc b/meta/recipes-extended/gperf/gperf.inc deleted file mode 100644 index a8ce230f652..00000000000 --- a/meta/recipes-extended/gperf/gperf.inc +++ /dev/null @@ -1,22 +0,0 @@ -DESCRIPTION = "GNU gperf is a perfect hash function generator" -HOMEPAGE = "http://www.gnu.org/software/gperf" -SUMMARY = "Generate a perfect hash function from a set of keywords" -LICENSE = "GPLv3+" -LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \ - file://src/main.cc;beginline=8;endline=19;md5=dec8f611845d047387ed56b5b85fa99b" - -SRC_URI = "${GNU_MIRROR}/gperf/gperf-${PV}.tar.gz" - -inherit autotools - -# autoreconf couldn't find acinclude.m4 when stepping into subdirectory. Instead of -# duplicating acinclude.m4 in every subdirectory, use absolute include path to aclocal -EXTRA_AUTORECONF += " -I ${S}" - -do_configure_prepend() { - if [ ! -e ${S}/acinclude.m4 ]; then - cat ${S}/aclocal.m4 > ${S}/acinclude.m4 - fi -} - -BBCLASSEXTEND = "native" diff --git a/meta/recipes-extended/gperf/gperf_3.1.bb b/meta/recipes-extended/gperf/gperf_3.1.bb index 942820b91d5..c680ee183cb 100644 --- a/meta/recipes-extended/gperf/gperf_3.1.bb +++ b/meta/recipes-extended/gperf/gperf_3.1.bb @@ -1,5 +1,24 @@ -require gperf.inc - +DESCRIPTION = "GNU gperf is a perfect hash function generator" +HOMEPAGE = "http://www.gnu.org/software/gperf" +SUMMARY = "Generate a perfect hash function from a set of keywords" +LICENSE = "GPLv3+" +LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \ + file://src/main.cc;beginline=8;endline=19;md5=dec8f611845d047387ed56b5b85fa99b" +SRC_URI = "${GNU_MIRROR}/${BPN}/${BP}.tar.gz" SRC_URI[md5sum] = "9e251c0a618ad0824b51117d5d9db87e" SRC_URI[sha256sum] = "588546b945bba4b70b6a3a616e80b4ab466e3f33024a352fc2198112cdbb3ae2" + +inherit autotools + +# autoreconf couldn't find acinclude.m4 when stepping into subdirectory. Instead of +# duplicating acinclude.m4 in every subdirectory, use absolute include path to aclocal +EXTRA_AUTORECONF += " -I ${S}" + +do_configure_prepend() { + if [ ! -e ${S}/acinclude.m4 ]; then + cat ${S}/aclocal.m4 > ${S}/acinclude.m4 + fi +} + +BBCLASSEXTEND = "native"