From: Yann E. MORIN Date: Sat, 3 Sep 2016 22:58:42 +0000 (+0200) Subject: package/jpeg: properly declare providers X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=35524d3733a5570794b1460bd545ad33bf6b49ef;p=buildroot.git package/jpeg: properly declare providers libjpeg and jpeg-turo are providers of the jpeg virtual package, so they must declare themselves as such. We do not have any problem, because the dependency is computed from the Kconfig-defined option BR2_PACKAGE_PROVIDES_JPEG, and we do not check the Makefile-defined _PROVIDES variable. For the sake of correctness, make both libjpeg and jpeg-turo declare themselves as providers for the jpeg virtual package. Signed-off-by: "Yann E. MORIN" Signed-off-by: Thomas Petazzoni --- diff --git a/package/jpeg-turbo/jpeg-turbo.mk b/package/jpeg-turbo/jpeg-turbo.mk index 047e925909..454b648c73 100644 --- a/package/jpeg-turbo/jpeg-turbo.mk +++ b/package/jpeg-turbo/jpeg-turbo.mk @@ -10,6 +10,8 @@ JPEG_TURBO_SITE = http://downloads.sourceforge.net/project/libjpeg-turbo/$(JPEG_ JPEG_TURBO_LICENSE = jpeg-license (BSD-3c-like) JPEG_TURBO_LICENSE_FILES = README README-turbo.txt JPEG_TURBO_INSTALL_STAGING = YES +JPEG_TURBO_PROVIDES = jpeg + JPEG_TURBO_CONF_OPTS = --with-jpeg8 ifeq ($(BR2_X86_CPU_HAS_MMX)$(BR2_ARM_CPU_HAS_NEON),y) diff --git a/package/libjpeg/libjpeg.mk b/package/libjpeg/libjpeg.mk index 14aba61fd4..b8f4bac56e 100644 --- a/package/libjpeg/libjpeg.mk +++ b/package/libjpeg/libjpeg.mk @@ -10,6 +10,7 @@ LIBJPEG_SOURCE = jpegsrc.v$(LIBJPEG_VERSION).tar.gz LIBJPEG_LICENSE = jpeg-license (BSD-3c-like) LIBJPEG_LICENSE_FILES = README LIBJPEG_INSTALL_STAGING = YES +LIBJPEG_PROVIDES = jpeg define LIBJPEG_REMOVE_USELESS_TOOLS rm -f $(addprefix $(TARGET_DIR)/usr/bin/,cjpeg djpeg jpegtran rdjpgcom wrjpgcom)