cairo/cairo-1.10.2.patch | 9 +++++++++
cairo/pixman-0.24.4.patch | 9 +++++++++
hunspell/makefile.mk | 1 +
mythes/makefile.mk | 1 +
xpdf/makefile.mk | 8 ++++----
5 files changed, 24 insertions(+), 4 deletions(-)
New commits:
commit 729ebb3654b2b84971f8e87fbd437bacf35068f3
Author: Tor Lillqvist <t...@iki.fi>
Date: Sun Oct 14 22:01:22 2012 +0300
Handle the CPPRUNTIME crack
Change-Id: Id2b4758d979f8b8d2273e2ba8ddbe850eecc3b04
diff --git a/hunspell/makefile.mk b/hunspell/makefile.mk
index 16721d7..16a1adb 100644
--- a/hunspell/makefile.mk
+++ b/hunspell/makefile.mk
@@ -80,6 +80,7 @@ CONFIGURE_FLAGS+=CPPFLAGS="$(EXTRA_CDEFS)"
.IF "$(CROSS_COMPILING)"=="YES"
CONFIGURE_FLAGS+=--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)
LIBS="$(STDLIBCUIMT)"
+CONFIGURE_FLAGS:=$(subst,CPPRUNTIME,$(STDLIBCPP) $(CONFIGURE_FLAGS))
.ENDIF
BUILD_ACTION=$(GNUMAKE) -j$(EXTMAXPROCESS)
diff --git a/mythes/makefile.mk b/mythes/makefile.mk
index ce1005d..a8b7439 100644
--- a/mythes/makefile.mk
+++ b/mythes/makefile.mk
@@ -83,6 +83,7 @@ CONFIGURE_FLAGS+=CFLAGS='$(LCL_CONFIGURE_CFLAGS)'
.IF "$(CROSS_COMPILING)"=="YES"
CONFIGURE_FLAGS+=--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)
gio_can_sniff=no LIBS="$(STDLIBCUIMT)"
+CONFIGURE_FLAGS:=$(subst,CPPRUNTIME,$(STDLIBCPP) $(CONFIGURE_FLAGS))
.ENDIF
BUILD_ACTION=make
commit 22bf1df8ca4be32ca368458d022d48d0adcb62d1
Author: Tor Lillqvist <t...@iki.fi>
Date: Sun Oct 14 21:47:44 2012 +0300
Filter out fairly pointless ld warning from crt1.o (!) in the 10.4 SDK
Unfortunately the pixman and cairo configury consider any non-empty
stderr indicating an error, even if it just a warning and the exit
status of the command is success.
Change-Id: I921f72fcfc127d9c34a8db448926e478a82646d6
diff --git a/cairo/cairo-1.10.2.patch b/cairo/cairo-1.10.2.patch
index d13c1e4..fce1149 100644
--- a/cairo/cairo-1.10.2.patch
+++ b/cairo/cairo-1.10.2.patch
@@ -189,6 +189,15 @@
cairo_cv_xml_use=$use_xml
cairo_cv_xml_cache_vars=" BASE REQUIRES CFLAGS
NONPKGCONFIG_CFLAGS LIBS NONPKGCONFIG_LIBS NONPKGCONFIG_EXTRA_LIBS"
+@@ -32864,7 +32864,7 @@
+ $_compile_program
+ _ACEOF
+ if ac_fn_c_try_link "$LINENO"; then :
+- cairo_cc_stderr=`test -f conftest.err && cat conftest.err`
++ cairo_cc_stderr=`test -f conftest.err && grep -v 'ld: warning: object file
compiled with -mlong-branch which is no longer needed.' conftest.err`
+ cairo_cc_flag=yes
+ else
+ cairo_cc_stderr=`test -f conftest.err && cat conftest.err`
--- misc/cairo-1.10.2/src/cairo-deflate-stream.c 2010-06-18
13:47:12.000000000 +0200
+++ misc/build/cairo-1.10.2/src/cairo-deflate-stream.c 2010-06-18
13:47:12.000000000 +0200
@@ -37,7 +37,11 @@
diff --git a/cairo/pixman-0.24.4.patch b/cairo/pixman-0.24.4.patch
index c16ac84..88a44f9 100644
--- a/cairo/pixman-0.24.4.patch
+++ b/cairo/pixman-0.24.4.patch
@@ -112,6 +112,15 @@
{ $as_echo "$as_me:$LINENO: checking whether byte ordering is bigendian" >&5
$as_echo_n "checking whether byte ordering is bigendian... " >&6; }
if test "${ac_cv_c_bigendian+set}" = set; then
+@@ -24552,7 +24552,7 @@
+ test "$cross_compiling" = yes ||
+ $as_test_x conftest$ac_exeext
+ }; then
+- pixman_cc_stderr=`test -f conftest.err && cat conftest.err`
++ pixman_cc_stderr=`test -f conftest.err && grep -v 'ld: warning: object file
compiled with -mlong-branch which is no longer needed.' conftest.err`
+ pixman_cc_flag=yes
+ else
+ $as_echo "$as_me: failed program was:" >&5
--- misc/pixman-0.24.4/pixman/pixman-utils.c
+++ misc/build/pixman-0.24.4/pixman/pixman-utils.c
@@ -27,6 +27,7 @@
commit 0683f53d019a225da7ebe18e1aabfda41c6bb442
Author: Tor Lillqvist <t...@iki.fi>
Date: Sun Oct 14 18:11:20 2012 +0300
Check for cross-compilation in general
Change-Id: I52cbef2ff90fa4af04c21f043c07fcd2aae8d273
diff --git a/xpdf/makefile.mk b/xpdf/makefile.mk
index 239912b..53b3b67 100644
--- a/xpdf/makefile.mk
+++ b/xpdf/makefile.mk
@@ -88,6 +88,10 @@ CONFIGURE_FLAGS += \
--prefix=/@.__________________________________________________$(EXTRPATH)
.END
+.IF "$(CROSS_COMPILING)"=="YES"
+CONFIGURE_FLAGS+=--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)
+.ENDIF
+
.IF "$(OS)$(CPU)"=="MACOSXP"
CXXFLAGS+=-malign-natural
.EXPORT: CXXFLAGS
@@ -102,10 +106,6 @@ LDFLAGS=-Wl,--enable-runtime-pseudo-reloc-v2
CONFIGURE_ACTION=./configure
CONFIGURE_FLAGS+=--without-x --enable-multithreaded --enable-exceptions
LIBS=-lgdi32
-.IF "$(CROSS_COMPILING)"=="YES"
-CONFIGURE_FLAGS+=--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)
-.ENDIF
-
BUILD_ACTION=$(GNUMAKE) -j$(EXTMAXPROCESS)
.ELSE
CONFIGURE_ACTION=
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
