package/tiff: explicitly disable jbig support for host and target

BR2_PACKAGE_TIFF_JBIG did actually not do anything, as no explicit
--enable-jbig was passed to configure and there is no libjbig in Buildroot,
so drop it and instead explicitly disable jbig support.

Also add --disable-jbig for the host build, which was missed when host
support was added in commit 91b16fbbf9 (tiff: add host variant).

As the TIFF_JBIG option was a noop, do not add legacy handling for it.

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
This commit is contained in:
Peter Korsgaard 2024-04-04 17:34:37 +02:00
parent a4011ec1e1
commit a7d491b0ff
2 changed files with 2 additions and 8 deletions

View File

@ -63,10 +63,6 @@ config BR2_PACKAGE_TIFF_OLD_JPEG
bool "Old JPEG decompression" bool "Old JPEG decompression"
default y default y
config BR2_PACKAGE_TIFF_JBIG
bool "JBIG compression"
default y
config BR2_PACKAGE_TIFF_UTILITIES config BR2_PACKAGE_TIFF_UTILITIES
bool "tiff utilities" bool "tiff utilities"
help help

View File

@ -17,6 +17,7 @@ TIFF_INSTALL_STAGING = YES
TIFF_CONF_OPTS = \ TIFF_CONF_OPTS = \
--disable-contrib \ --disable-contrib \
--disable-lerc \ --disable-lerc \
--disable-jbig \
--disable-tests \ --disable-tests \
--disable-webp --disable-webp
@ -28,6 +29,7 @@ HOST_TIFF_CONF_OPTS = \
--disable-lerc \ --disable-lerc \
--disable-libdeflate \ --disable-libdeflate \
--disable-lzma \ --disable-lzma \
--disable-jbig \
--disable-jpeg \ --disable-jpeg \
--disable-tests \ --disable-tests \
--disable-webp \ --disable-webp \
@ -101,10 +103,6 @@ ifneq ($(BR2_PACKAGE_TIFF_OLD_JPEG),y)
TIFF_CONF_OPTS += --disable-old-jpeg TIFF_CONF_OPTS += --disable-old-jpeg
endif endif
ifneq ($(BR2_PACKAGE_TIFF_JBIG),y)
TIFF_CONF_OPTS += --disable-jbig
endif
ifeq ($(BR2_PACKAGE_TIFF_UTILITIES),y) ifeq ($(BR2_PACKAGE_TIFF_UTILITIES),y)
TIFF_CONF_OPTS += --enable-tools TIFF_CONF_OPTS += --enable-tools
else else