external/jpeg-turbo/ExternalProject_jpeg-turbo.mk | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit ee457ab6304f16cdd76a9723368c314dc5a75c55
Author: David Ostrovsky <da...@ostrovsky.org>
Date: Tue Feb 3 13:13:55 2015 +0100
Fix jpeg-turbo on windows 64 bit
This fix supports building jpeg-turbo on both cygwin 32 nd 64 bit.
When only cygwin 64 bit is used, then it can be simplified by
passing BUILD_PLATFORM to configure script on all platforms.
Change-Id: Id335282f1761fcf7313fb18a6b9250e5eac392e4
Reviewed-on: https://gerrit.libreoffice.org/14315
Tested-by: Michael Stahl <mst...@redhat.com>
Reviewed-by: Michael Stahl <mst...@redhat.com>
diff --git a/external/jpeg-turbo/ExternalProject_jpeg-turbo.mk
b/external/jpeg-turbo/ExternalProject_jpeg-turbo.mk
old mode 100644
new mode 100755
index d9ac7e5..ad35a6f
--- a/external/jpeg-turbo/ExternalProject_jpeg-turbo.mk
+++ b/external/jpeg-turbo/ExternalProject_jpeg-turbo.mk
@@ -25,7 +25,7 @@ $(call gb_ExternalProject_get_state_target,jpeg-turbo,build)
: $(call gb_Externa
$(call gb_ExternalProject_get_state_target,jpeg-turbo,configure) :
$(call gb_ExternalProject_run,configure,\
MAKE=$(MAKE) ./configure \
- --build=$(if $(filter
WNT,$(OS)),i686-pc-cygwin,$(BUILD_PLATFORM)) \
+ --build=$(if $(filter WNT,$(OS)),$(if $(filter
INTEL,$(CPU)),i686-pc-cygwin,x86_64-pc-cygwin),$(BUILD_PLATFORM)) \
--with-pic \
--enable-static \
--disable-shared \
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
