From 17a0165a2a605ca46fea5721674fee2f0b985dbc Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Fri, 20 Dec 2013 23:27:58 +0100 Subject: [PATCH] package/libjpeg: switch to package-defined providers For the underlying reasons, see previous patch, titled: package/opengl/libegl: switch to package-defined providers Signed-off-by: "Yann E. MORIN" Cc: Arnout Vandecappelle Cc: Thomas Petazzoni Cc: Peter Korsgaard Cc: Gustavo Zacarias Signed-off-by: Thomas Petazzoni --- package/jpeg/Config.in | 5 +++++ package/jpeg/jpeg.mk | 9 +-------- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/package/jpeg/Config.in b/package/jpeg/Config.in index 9508faf24d..b7cdfeb79a 100644 --- a/package/jpeg/Config.in +++ b/package/jpeg/Config.in @@ -30,4 +30,9 @@ config BR2_PACKAGE_JPEG_TURBO endchoice +config BR2_PACKAGE_PROVIDES_JPEG + string + default "libjpeg" if BR2_PACKAGE_LIBJPEG + default "jpeg-turbo" if BR2_PACKAGE_JPEG_TURBO + endif diff --git a/package/jpeg/jpeg.mk b/package/jpeg/jpeg.mk index eaa23944c1..3695bc818d 100644 --- a/package/jpeg/jpeg.mk +++ b/package/jpeg/jpeg.mk @@ -5,14 +5,7 @@ ################################################################################ JPEG_SOURCE = - -ifeq ($(BR2_PACKAGE_JPEG_TURBO),y) -JPEG_DEPENDENCIES += jpeg-turbo -endif - -ifeq ($(BR2_PACKAGE_LIBJPEG),y) -JPEG_DEPENDENCIES += libjpeg -endif +JPEG_DEPENDENCIES = $(call qstrip,$(BR2_PACKAGE_PROVIDES_JPEG)) ifeq ($(JPEG_DEPENDENCIES),) define JPEG_CONFIGURE_CMDS -- 2.30.2