summaryrefslogtreecommitdiff
path: root/Makefile.fetch
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2017-03-14 14:20:36 +0000
committerCaolán McNamara <caolanm@redhat.com>2017-03-15 11:47:02 +0000
commitae967544463d1683dc4e26492c3646f1dc431576 (patch)
tree461da88001b6a174e8f47d688c55bda571a12c6e /Makefile.fetch
parentd61efe5806c9b87f026a8bc45a00dcb171881711 (diff)
just use turbo-jpeg as sole internal solution
prefer having nasm/yasm but if its not there warn and fallback to disabling assembler optional goodness Change-Id: Ib31ad81717842f743c2910d575a9ebbc279a9c79 Reviewed-on: https://gerrit.libreoffice.org/35189 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'Makefile.fetch')
-rw-r--r--Makefile.fetch1
1 files changed, 0 insertions, 1 deletions
diff --git a/Makefile.fetch b/Makefile.fetch
index de929d82abc0..1191a82a83dc 100644
--- a/Makefile.fetch
+++ b/Makefile.fetch
@@ -146,7 +146,6 @@ $(WORKDIR)/download: $(BUILDDIR)/config_host.mk $(SRCDIR)/download.lst $(SRCDIR)
$(call fetch_Optional,JFREEREPORT,JFREEREPORT_LIBSERIALIZER_TARBALL) \
$(call fetch_Optional,JFREEREPORT,JFREEREPORT_LIBXML_TARBALL) \
$(call fetch_Optional,JFREEREPORT,JFREEREPORT_SAC_TARBALL) \
- $(call fetch_Optional,JPEG,JPEG_TARBALL) \
$(call fetch_Optional,JPEG_TURBO,JPEG_TURBO_TARBALL) \
$(call fetch_Optional,LANGUAGETOOL,LANGUAGETOOL_TARBALL) \
$(call fetch_Optional,LCMS2,LCMS2_TARBALL) \