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

Tue Mar 3 01:10:42 PST 2015

external/jpeg-turbo/jpeg-turbo.win_build.patch.1 |   11 +++++++++++
 1 file changed, 11 insertions(+)

New commits:
commit d794783ada6fedad4fac9c701dfba6db065f513d
Author: Michael Stahl <mstahl at redhat.com>
Date:   Sat Feb 21 20:37:00 2015 +0100

    jpeg-turbo: work around failure in AC_PROG_MAKE_SET on WNT
    
    autoconf < 2.61a uses "echo" here and for some bizarre reason that
    converts " inside ' to \ so remove the " to get it to work.
    
    echo 'foo="bar"'
    foo=\bar"
    
    Change-Id: I6bee94d4d075ce953f5788b7fdf9d3b66a7db0c7
    (cherry picked from commit 9c6ce47eaf1a891edf7c200145de400fd1cf2871)
    Reviewed-on: https://gerrit.libreoffice.org/14589
    Tested-by: David Tardon <dtardon at redhat.com>
    Reviewed-by: David Tardon <dtardon at redhat.com>

diff --git a/external/jpeg-turbo/jpeg-turbo.win_build.patch.1 b/external/jpeg-turbo/jpeg-turbo.win_build.patch.1
index 1dc5b1e..dc767ab 100644
--- a/external/jpeg-turbo/jpeg-turbo.win_build.patch.1
+++ b/external/jpeg-turbo/jpeg-turbo.win_build.patch.1
@@ -13,3 +13,14 @@ diff -ur jpeg.org/simd/Makefile.in jpeg/simd/Makefile.in
  # 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:
+--- jpeg-turbo/configure.orig	2015-02-21 19:44:23.639600000 +0100
++++ jpeg-turbo/configure	2015-02-21 19:44:33.764000000 +0100
+@@ -1847,7 +1847,7 @@
+ else
+   cat >conftest.make <<\_ACEOF
+ all:
+-	@echo 'ac_maketemp="$(MAKE)"'
++	@echo 'ac_maketemp=$(MAKE)'
+ _ACEOF
+ # GNU make sometimes prints "make[1]: Entering...", which would confuse us.
+ eval `${MAKE-make} -f conftest.make 2>/dev/null | grep temp=`
