[Buildroot] [git commit branch/2024.02.x] package/tiff: explicitly disable jbig support for host and target
Peter Korsgaard
peter at korsgaard.com
Thu May 2 08:29:58 UTC 2024
commit: https://git.buildroot.net/buildroot/commit/?id=02ff38a44ac38b98ce7b15dedd7af82d1315ca90
branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2024.02.x
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 91b16fbbf9db (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 at korsgaard.com>
(cherry picked from commit a7d491b0ffc5c0876053cc94c4112e73096aa5c2)
Signed-off-by: Peter Korsgaard <peter at korsgaard.com>
---
package/tiff/Config.in | 4 ----
package/tiff/tiff.mk | 6 ++----
2 files changed, 2 insertions(+), 8 deletions(-)
diff --git a/package/tiff/Config.in b/package/tiff/Config.in
index d1004d6668..d357d08406 100644
--- a/package/tiff/Config.in
+++ b/package/tiff/Config.in
@@ -63,10 +63,6 @@ config BR2_PACKAGE_TIFF_OLD_JPEG
bool "Old JPEG decompression"
default y
-config BR2_PACKAGE_TIFF_JBIG
- bool "JBIG compression"
- default y
-
config BR2_PACKAGE_TIFF_UTILITIES
bool "tiff utilities"
help
diff --git a/package/tiff/tiff.mk b/package/tiff/tiff.mk
index 8ec53d4fe1..0e5e0dd48a 100644
--- a/package/tiff/tiff.mk
+++ b/package/tiff/tiff.mk
@@ -17,6 +17,7 @@ TIFF_INSTALL_STAGING = YES
TIFF_CONF_OPTS = \
--disable-contrib \
--disable-lerc \
+ --disable-jbig \
--disable-tests \
--disable-webp
@@ -28,6 +29,7 @@ HOST_TIFF_CONF_OPTS = \
--disable-lerc \
--disable-libdeflate \
--disable-lzma \
+ --disable-jbig \
--disable-jpeg \
--disable-tests \
--disable-webp \
@@ -101,10 +103,6 @@ ifneq ($(BR2_PACKAGE_TIFF_OLD_JPEG),y)
TIFF_CONF_OPTS += --disable-old-jpeg
endif
-ifneq ($(BR2_PACKAGE_TIFF_JBIG),y)
-TIFF_CONF_OPTS += --disable-jbig
-endif
-
ifeq ($(BR2_PACKAGE_TIFF_UTILITIES),y)
TIFF_CONF_OPTS += --enable-tools
else
More information about the buildroot
mailing list