Bladeren bron

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 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@korsgaard.com>
Peter Korsgaard 1 jaar geleden
bovenliggende
commit
a7d491b0ff
2 gewijzigde bestanden met toevoegingen van 2 en 8 verwijderingen
  1. 0 4
      package/tiff/Config.in
  2. 2 4
      package/tiff/tiff.mk

+ 0 - 4
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

+ 2 - 4
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