From patchwork Tue Feb 25 22:02:09 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Yann E. MORIN" X-Patchwork-Id: 324118 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from fraxinus.osuosl.org (fraxinus.osuosl.org [140.211.166.137]) by ozlabs.org (Postfix) with ESMTP id DC6D52C009E for ; Wed, 26 Feb 2014 09:02:55 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 759A08B9BB; Tue, 25 Feb 2014 22:02:48 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id E0YH6JVu9GUx; Tue, 25 Feb 2014 22:02:46 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id 527648B94E; Tue, 25 Feb 2014 22:02:41 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (whitealder.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id A30721BF830 for ; Tue, 25 Feb 2014 22:02:27 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 9B00D8BE9F for ; Tue, 25 Feb 2014 22:02:27 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id SKMxGsXyZHjf for ; Tue, 25 Feb 2014 22:02:26 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-we0-f180.google.com (mail-we0-f180.google.com [74.125.82.180]) by whitealder.osuosl.org (Postfix) with ESMTPS id 4A3A08BDD1 for ; Tue, 25 Feb 2014 22:02:26 +0000 (UTC) Received: by mail-we0-f180.google.com with SMTP id u57so973035wes.11 for ; Tue, 25 Feb 2014 14:02:24 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=wV/aKB5oaejlEUQxTSXYwp8BDj/loS+7lYGd1fQKQtE=; b=BGTwmfyPO95zajaT5lODt2LXV/OnVIopddMxDIQs4e2spQwQ2xYwKhCMAlTq/2Rteh 8y3+H9XD9h5EYcuuN36uut+5HqRo1Ro0wmQ3NKWPy0TVhhnk/bTCLNYk6mnsfPwaFQSb TgkZiCLE4BgJNA08G29y1JEzu9Ysoy/AtBrGNh04WcNN9x4w/Ub7Pb3aKeikuS7yYvGD l3X9NXiox4SLkMFwU0ttR891byPNB0bd315h3XeH+L/ppU+BXeUlFSMb0LN6yFlZ25Mk gTamZkB1wiHJ1m+OgOzhFo4PiqeEPu/HOoe6zal5lOc6S84Phdn+4VsCiYOYWhD/IKGn BP5Q== X-Received: by 10.180.84.73 with SMTP id w9mr5067023wiy.58.1393365744884; Tue, 25 Feb 2014 14:02:24 -0800 (PST) Received: from gourin.bzh.lan (ks3095497.kimsufi.com. [94.23.60.27]) by mx.google.com with ESMTPSA id ux5sm54123117wjc.6.2014.02.25.14.02.23 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 25 Feb 2014 14:02:24 -0800 (PST) From: "Yann E. MORIN" To: buildroot@buildroot.org Date: Tue, 25 Feb 2014 23:02:09 +0100 Message-Id: X-Mailer: git-send-email 1.8.3.2 In-Reply-To: References: Cc: Thomas Petazzoni , "Yann E. MORIN" Subject: [Buildroot] [PATCH 09/10] package/jpeg: convert to the virtual-package infrastructure X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.14 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: buildroot-bounces@busybox.net From: "Yann E. MORIN" Since this package is implemented via a choice rather than the usual spearate-package providers, we only need BR2_PACKAGE_HAS_JPEG to be always defined when the 'jpeg' package is selected. Signed-off-by: "Yann E. MORIN" Cc: Eric Le Bihan Cc: Thomas Petazzoni Cc: Thomas De Schampheleire Cc: Mike Zick --- package/jpeg/Config.in | 3 +++ package/jpeg/jpeg.mk | 12 +----------- 2 files changed, 4 insertions(+), 11 deletions(-) diff --git a/package/jpeg/Config.in b/package/jpeg/Config.in index b7cdfeb..3042d24 100644 --- a/package/jpeg/Config.in +++ b/package/jpeg/Config.in @@ -30,6 +30,9 @@ config BR2_PACKAGE_JPEG_TURBO endchoice +config BR2_PACKAGE_HAS_JPEG + def_bool y + config BR2_PACKAGE_PROVIDES_JPEG string default "libjpeg" if BR2_PACKAGE_LIBJPEG diff --git a/package/jpeg/jpeg.mk b/package/jpeg/jpeg.mk index 3695bc8..2d56be6 100644 --- a/package/jpeg/jpeg.mk +++ b/package/jpeg/jpeg.mk @@ -4,14 +4,4 @@ # ################################################################################ -JPEG_SOURCE = -JPEG_DEPENDENCIES = $(call qstrip,$(BR2_PACKAGE_PROVIDES_JPEG)) - -ifeq ($(JPEG_DEPENDENCIES),) -define JPEG_CONFIGURE_CMDS - echo "No JPEG implementation defined. Configuration error" - exit 1 -endef -endif - -$(eval $(generic-package)) +$(eval $(virtual-package))