external/jpeg/ExternalProject_jpeg.mk | 1 + external/jpeg/UnpackedTarball_jpeg.mk | 1 + external/jpeg/jpeg.win_build.patch.1 | 15 +++++++++++++++ 3 files changed, 17 insertions(+)
New commits: commit 7854666e62a216bb927090f25c255439f497696a Author: Matúš Kukan <matus.ku...@collabora.com> Date: Fri Nov 14 22:00:11 2014 +0100 fix jpeg windows build Change-Id: I1f760cc68ad6d4972edc156504f63c70b8e7479a diff --git a/external/jpeg/ExternalProject_jpeg.mk b/external/jpeg/ExternalProject_jpeg.mk index e47fb14..b741e4f 100644 --- a/external/jpeg/ExternalProject_jpeg.mk +++ b/external/jpeg/ExternalProject_jpeg.mk @@ -25,6 +25,7 @@ $(call gb_ExternalProject_get_state_target,jpeg,build) : $(call gb_ExternalProje $(call gb_ExternalProject_get_state_target,jpeg,configure) : $(call gb_ExternalProject_run,configure,\ MAKE=$(MAKE) ./configure \ + --build=$(if $(filter WNT,$(OS)),i686-pc-cygwin,$(BUILD_PLATFORM)) \ --with-pic \ --enable-static \ --disable-shared \ diff --git a/external/jpeg/UnpackedTarball_jpeg.mk b/external/jpeg/UnpackedTarball_jpeg.mk index fa1999c..ac77b3a 100644 --- a/external/jpeg/UnpackedTarball_jpeg.mk +++ b/external/jpeg/UnpackedTarball_jpeg.mk @@ -13,6 +13,7 @@ $(eval $(call gb_UnpackedTarball_set_tarball,jpeg,$(JPEG_TARBALL))) $(eval $(call gb_UnpackedTarball_add_patches,jpeg,\ external/jpeg/jpeg.build.patch.1 \ + $(if $(filter WNT,$(OS)),external/jpeg/jpeg.win_build.patch.1) \ )) # vim: set noet sw=4 ts=4: diff --git a/external/jpeg/jpeg.win_build.patch.1 b/external/jpeg/jpeg.win_build.patch.1 new file mode 100644 index 0000000..1dc5b1e --- /dev/null +++ b/external/jpeg/jpeg.win_build.patch.1 @@ -0,0 +1,15 @@ +diff -ur jpeg.org/simd/Makefile.in jpeg/simd/Makefile.in +--- jpeg.org/simd/Makefile.in 2014-11-14 21:55:21.557802955 +0100 ++++ jpeg/simd/Makefile.in 2014-11-14 21:57:16.845804312 +0100 +@@ -583,8 +583,9 @@ + .asm.lo: + $(LIBTOOL) --mode=compile --tag NASM $(srcdir)/nasm_lt.sh $(NASM) $(NAFLAGS) -I$(srcdir) -I. $< -o $@ + +-jsimdcfg.inc: $(srcdir)/jsimdcfg.inc.h ../jpeglib.h ../jconfig.h ../jmorecfg.h +- $(CPP) -I$(top_builddir) -I$(top_builddir)/simd $(srcdir)/jsimdcfg.inc.h | $(EGREP) "^[\;%]|^\ %" | sed 's%_cpp_protection_%%' | sed 's@% define@%define@g' > $@ ++jsimdcfg.inc: $(top_srcdir)/win/jsimdcfg.inc ++ cp $< $@ ++ + # Tell versions [3.59,3.63) of GNU make to not export all variables. + # Otherwise a system limit (for SysV at least) may be exceeded. + .NOEXPORT:
_______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits