[Buildroot] [PATCH 6/7] package/libjpeg: switch to package-defined providers

Yann E. MORIN yann.morin.1998 at free.fr
Fri Dec 20 22:27:58 UTC 2013


From: "Yann E. MORIN" <yann.morin.1998 at free.fr>

For the underlying reasons, see previous patch, titled:
    package/opengl/libegl: switch to package-defined providers

Signed-off-by: "Yann E. MORIN" <yann.morin.1998 at free.fr>
Cc: Arnout Vandecappelle <arnout at mind.be>
Cc: Thomas Petazzoni <thomas.petazzoni at free-electrons.com>
Cc: Peter Korsgaard <jacmet at uclibc.org>
Cc: Gustavo Zacarias <gustavo at zacarias.com.ar>
---
 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 9508faf..b7cdfeb 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 eaa2394..3695bc8 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
-- 
1.8.1.2



More information about the buildroot mailing list