From patchwork Sat Apr 5 15:21:54 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: 337187 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from silver.osuosl.org (silver.osuosl.org [140.211.166.136]) by ozlabs.org (Postfix) with ESMTP id 8BA641400AA for ; Sun, 6 Apr 2014 02:23:24 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id D34A531CA8; Sat, 5 Apr 2014 15:23:23 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id rJh2c3X6XGuA; Sat, 5 Apr 2014 15:23:20 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id 2CB8A31D35; Sat, 5 Apr 2014 15:22:49 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from silver.osuosl.org (silver.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id E0B7C1BF97E for ; Sat, 5 Apr 2014 15:22:30 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id D4BEF26F30 for ; Sat, 5 Apr 2014 15:22:30 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id BVQPy-x5dGto for ; Sat, 5 Apr 2014 15:22:27 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wg0-f46.google.com (mail-wg0-f46.google.com [74.125.82.46]) by silver.osuosl.org (Postfix) with ESMTPS id 314E625516 for ; Sat, 5 Apr 2014 15:22:27 +0000 (UTC) Received: by mail-wg0-f46.google.com with SMTP id b13so4801728wgh.29 for ; Sat, 05 Apr 2014 08:22:25 -0700 (PDT) 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=p9L6f5xqDF0vPg5rR0Z+ARKiIt8wMEFOJlk3wNxYGA0=; b=TPSvgbH53ckt08jd7Ff37+D+P7/k/gzhjcfIujMhkyjPOJPLET98CdmW29W2JhTL5u ttPlVUfEiPV+PAoP/aYgtNTG/TUXA2/0MD3Y+I+q25Hy7FF74HL+oxVSTMR0cO0U1645 MqCd4YoOSMSV5qEcJF0HXHCEQzCqzmYCFMH6xqTpkKejLEzuKVJjFzeBWfyedVxWJzH2 XHBu1NhF54C/H/UIm+8hAQrDnvFScse7r2NP7WgwzvbY3PqDuuf2/pJAu+rDywwgTHVo k0LiLv0MNuD9LwUyViCFUggGtMRq1wniRLW5wGYTPG/JBTPGj05qcmx/ZoxkJgg+q8jV o/fA== X-Received: by 10.180.109.231 with SMTP id hv7mr12901509wib.38.1396711345528; Sat, 05 Apr 2014 08:22:25 -0700 (PDT) Received: from gourin.bzh.lan (ks3095497.kimsufi.com. [94.23.60.27]) by mx.google.com with ESMTPSA id t10sm11403796wiw.19.2014.04.05.08.22.24 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Sat, 05 Apr 2014 08:22:24 -0700 (PDT) From: "Yann E. MORIN" To: buildroot@buildroot.org Date: Sat, 5 Apr 2014 17:21:54 +0200 Message-Id: <4ea63d1d9f7c99a15e7ec99ad1f928101c688303.1396711074.git.yann.morin.1998@free.fr> X-Mailer: git-send-email 1.8.3.2 In-Reply-To: References: Cc: Thomas Petazzoni , "Yann E. MORIN" Subject: [Buildroot] [PATCH 17/21] 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 separate-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 Reviewed-by: Samuel Martin --- 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))