From 77a92d42310e288e772e041b3c44075e45a8fca3 Mon Sep 17 00:00:00 2001
From: Mohammad Akhlaghi <mohammad@akhlaghi.org>
Date: Fri, 16 Aug 2019 19:14:31 +0530
Subject: Libtiff built without JBIG-KIT support

Until now, we weren't explicitly telling libtiff to ignore JBIG-KIT. So on
some systems, it would try to link withit and would thus fail.

With this commit, we have disabled JBIG-KIT support for libtiff. I tried to
import it into the template, but it doesn't have use the standard GNU Build
system. Maybe later we can add a set of build rules for it, I don't have
time now.

Also, this problem with libtiff occurred while building Ghostscript. But
was fixed after adding this option to libtiff. So libtiff was added as a
dependency of Ghostscript.

This bug was reported by Sheeraz Ahmad.
---
 reproduce/software/make/high-level.mk | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'reproduce/software/make')

diff --git a/reproduce/software/make/high-level.mk b/reproduce/software/make/high-level.mk
index 832b0b7..a17e989 100644
--- a/reproduce/software/make/high-level.mk
+++ b/reproduce/software/make/high-level.mk
@@ -470,7 +470,9 @@ $(ibidir)/libpng: $(tdir)/libpng-$(libpng-version).tar.xz
 $(ibidir)/libtiff: $(tdir)/tiff-$(libtiff-version).tar.gz \
                    $(ibidir)/libjpeg
 	$(call gbuild, $<, tiff-$(libtiff-version), static, \
-	               --disable-webp --disable-zstd) \
+	               --disable-jbig \
+	               --disable-webp \
+	               --disable-zstd) \
 	&& echo "Libtiff $(libtiff-version)" > $@
 
 $(ibidir)/libtirpc: $(tdir)/libtirpc-$(libtirpc-version).tar.bz2
@@ -676,7 +678,8 @@ $(ibidir)/cmake: $(tdir)/cmake-$(cmake-version).tar.gz \
 	&& rm -rf cmake-$(cmake-version) \
 	&& echo "CMake $(cmake-version)" > $@
 
-$(ibidir)/ghostscript: $(tdir)/ghostscript-$(ghostscript-version).tar.gz
+$(ibidir)/ghostscript: $(tdir)/ghostscript-$(ghostscript-version).tar.gz \
+                       $(ibidir)/libtiff
 	$(call gbuild, $<, ghostscript-$(ghostscript-version)) \
 	&& echo "GPL Ghostscript $(ghostscript-version)" > $@
 
-- 
cgit v1.2.1