diff options
| author | Yann E. MORIN <yann.morin.1998@free.fr> | 2014-04-05 17:21:54 +0200 |
|---|---|---|
| committer | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2014-04-05 19:21:11 +0200 |
| commit | 5e82185537209962a6d6283e2ea898eff8129271 (patch) | |
| tree | d312fde86c4494515037f6549be944af067ff1d0 /package/jpeg | |
| parent | 10650a71256c074d6e728a80f29e34f78e303266 (diff) | |
package/jpeg: convert to the virtual-package infrastructure
Since this package is implemented via a choice rather than the usual
separate-package providers, we only need BR2_PACKAGE_HAS_JPEG to be
always defined when the 'jpeg' package is selected.
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Cc: Eric Le Bihan <eric.le.bihan.dev@free.fr>
Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Cc: Thomas De Schampheleire <patrickdepinguin@gmail.com>
Cc: Mike Zick <minimod@morethan.org>
Reviewed-by: Samuel Martin <s.martin49@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Diffstat (limited to 'package/jpeg')
| -rw-r--r-- | package/jpeg/Config.in | 3 | ||||
| -rw-r--r-- | package/jpeg/jpeg.mk | 12 |
2 files changed, 4 insertions, 11 deletions
diff --git a/package/jpeg/Config.in b/package/jpeg/Config.in index b7cdfeb79..3042d247f 100644 --- a/package/jpeg/Config.in +++ b/package/jpeg/Config.in @@ -30,6 +30,9 @@ config BR2_PACKAGE_JPEG_TURBO endchoice +config BR2_PACKAGE_HAS_JPEG + def_bool y + config BR2_PACKAGE_PROVIDES_JPEG string default "libjpeg" if BR2_PACKAGE_LIBJPEG diff --git a/package/jpeg/jpeg.mk b/package/jpeg/jpeg.mk index 3695bc818..2d56be6a7 100644 --- a/package/jpeg/jpeg.mk +++ b/package/jpeg/jpeg.mk @@ -4,14 +4,4 @@ # ################################################################################ -JPEG_SOURCE = -JPEG_DEPENDENCIES = $(call qstrip,$(BR2_PACKAGE_PROVIDES_JPEG)) - -ifeq ($(JPEG_DEPENDENCIES),) -define JPEG_CONFIGURE_CMDS - echo "No JPEG implementation defined. Configuration error" - exit 1 -endef -endif - -$(eval $(generic-package)) +$(eval $(virtual-package)) |