diff options
| author | Yann E. MORIN <yann.morin.1998@free.fr> | 2013-12-20 23:27:58 +0100 |
|---|---|---|
| committer | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2013-12-25 18:21:44 +0100 |
| commit | 17a0165a2a605ca46fea5721674fee2f0b985dbc (patch) | |
| tree | f1a6112931b1f0b1496bc9ff08fa3d1b2dfa4420 | |
| parent | fe93cc8b5006db835ab1e417c2df6c9a0364697b (diff) | |
| download | buildroot-17a0165a2a605ca46fea5721674fee2f0b985dbc.tar.gz buildroot-17a0165a2a605ca46fea5721674fee2f0b985dbc.zip | |
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" <yann.morin.1998@free.fr>
Cc: Arnout Vandecappelle <arnout@mind.be>
Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Cc: Peter Korsgaard <jacmet@uclibc.org>
Cc: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
| -rw-r--r-- | package/jpeg/Config.in | 5 | ||||
| -rw-r--r-- | 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 |
