[Libreoffice-commits] core.git: Branch 'libreoffice-5-4' - external/jpeg-turbo

[Caolán McNamara]

 external/jpeg-turbo/ExternalProject_jpeg-turbo.mk |    1 -
 1 file changed, 1 deletion(-)

New commits:
commit bfc270b86bb74a087c09caf318d5a4d1a38afa0f
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Thu Jun 15 21:15:42 2017 +0100

    Resolves: tdf#75788 build jpeg-turbo without --with-jpeg8
    
    Change-Id: I3da1559bd3434d574db65a3b492e1060c46143ee
    Reviewed-on: https://gerrit.libreoffice.org/38849
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>
    (cherry picked from commit 0c1fdff3efbb16836d679923828ebd7dda03b937)
    Reviewed-on: https://gerrit.libreoffice.org/38862

diff --git a/external/jpeg-turbo/ExternalProject_jpeg-turbo.mk b/external/jpeg-turbo/ExternalProject_jpeg-turbo.mk
index 595f4ea9a3fc..f3e3945caf99 100644
--- a/external/jpeg-turbo/ExternalProject_jpeg-turbo.mk
+++ b/external/jpeg-turbo/ExternalProject_jpeg-turbo.mk
@@ -30,7 +30,6 @@ $(call gb_ExternalProject_get_state_target,jpeg-turbo,configure) :
 			--with-pic \
 			--enable-static \
 			--disable-shared \
-			--with-jpeg8 \
 			--without-java \
 			--without-turbojpeg \
 			$(if $(NASM),,--without-simd) \