diff --git a/package/jpeg/Config.in b/package/jpeg/Config.in index 9508faf24..b7cdfeb79 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 eaa23944c..3695bc818 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