external/jpeg-turbo/jpeg-turbo.win_build.patch.1 | 11 +++++++++++ unotest/Library_unobootstrapprotector.mk | 5 +++++ 2 files changed, 16 insertions(+)
New commits: commit 9c6ce47eaf1a891edf7c200145de400fd1cf2871 Author: Michael Stahl <[email protected]> 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 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=` commit 7289ee9b9ce2346fa58dfa7c2f2b318f6db40d4d Author: Michael Stahl <[email protected]> Date: Sat Feb 21 20:35:59 2015 +0100 unotest: unobootstrapprotector needs runtime dependency on unorc Change-Id: Ie6ed784bb9676b9de8a51762aa58d0c75e071cfd diff --git a/unotest/Library_unobootstrapprotector.mk b/unotest/Library_unobootstrapprotector.mk index cb32bf9..3ec8b16 100644 --- a/unotest/Library_unobootstrapprotector.mk +++ b/unotest/Library_unobootstrapprotector.mk @@ -29,4 +29,9 @@ $(eval $(call gb_Library_add_exception_objects,unobootstrapprotector,\ unotest/source/cpp/unobootstrapprotector/unobootstrapprotector \ )) +# runtime dependency: needs unorc/uno.ini +$(eval $(call gb_Library_use_package,unobootstrapprotector,\ + instsetoo_native_setup_ure \ +)) + # vim: set noet sw=4 ts=4: _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
