[libreoffice] 02/02: update m68k-use-mlong-jump-table-offsets.diff, also needed for oox

[Rene Engelhard]

This is an automated email from the git hooks/post-receive script.

rene pushed a commit to branch debian-experimental-5.3
in repository libreoffice.

commit ee8e89a048daff720562d2bd24b9207045116082
Author: Rene Engelhard <rene at debian.org>
Date:   Thu Jan 12 19:13:50 2017 +0100

    update m68k-use-mlong-jump-table-offsets.diff, also needed for oox
---
 patches/m68k-use-mlong-jump-table-offsets.diff | 69 +++++++++++++++++++-------
 1 file changed, 52 insertions(+), 17 deletions(-)

diff --git a/patches/m68k-use-mlong-jump-table-offsets.diff b/patches/m68k-use-mlong-jump-table-offsets.diff
index eea53cd..e734098 100644
--- a/patches/m68k-use-mlong-jump-table-offsets.diff
+++ b/patches/m68k-use-mlong-jump-table-offsets.diff
@@ -1,23 +1,15 @@
-diff --git a/xmloff/Library_xo.mk b/xmloff/Library_xo.mk
-index 2feb3cf95c69..d8cf94879670 100644
---- a/xmloff/Library_xo.mk
-+++ b/xmloff/Library_xo.mk
-@@ -368,4 +368,10 @@ $(eval $(call gb_Library_add_exception_objects,xo,\
-     xmloff/source/xforms/xformsimport \
- ))
- 
-+ifeq ($(CPUNAME),M68K)
-+$(eval $(call gb_Library_add_cxxflags,xo,\
-+    -mlong-jump-table-offsets \
-+))
-+endif
-+
- # vim: set noet sw=4 ts=4:
+From 22779b136058934f1af0dcfa50ba23ea6220db87 Mon Sep 17 00:00:00 2001
+From: Rene Engelhard <rene at debian.org>
+Date: Sat, 7 Jan 2017 16:46:14 +0100
+Subject: use (new) -mlong-jump-table-offsets on m68k for libxo
+
+Change-Id: I6e2886e2de4f3502c74f1e367216066352994865
+
 diff --git a/configure.ac b/configure.ac
-index 079e856..58d1672 100644
+index e808f14..dce6892 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -3792,6 +3792,19 @@ if test "$GCC" = "yes"; then
+@@ -3778,6 +3778,19 @@ if test "$GCC" = "yes"; then
      else
          AC_MSG_RESULT([no])
      fi
@@ -37,3 +29,46 @@ index 079e856..58d1672 100644
  fi
  AC_SUBST(HAVE_GCC_GGDB2)
  AC_SUBST(HAVE_GCC_FINLINE_LIMIT)
+diff --git a/xmloff/Library_xo.mk b/xmloff/Library_xo.mk
+index 2feb3cf..d8cf948 100644
+--- a/xmloff/Library_xo.mk
++++ b/xmloff/Library_xo.mk
+@@ -368,4 +368,10 @@ $(eval $(call gb_Library_add_exception_objects,xo,\
+     xmloff/source/xforms/xformsimport \
+ ))
+ 
++ifeq ($(CPUNAME),M68K)
++$(eval $(call gb_Library_add_cxxflags,xo,\
++    -mlong-jump-table-offsets \
++))
++endif
++
+ # vim: set noet sw=4 ts=4:
+-- 
+cgit v0.10.2
+
+From 8f15fa63ce726d0ef1f91a76d640981c16d301cd Mon Sep 17 00:00:00 2001
+From: Rene Engelhard <rene at debian.org>
+Date: Thu, 12 Jan 2017 19:00:28 +0100
+Subject: add -mlong-jump-table-offsets for m68k also for oox
+
+Change-Id: Ibfba6c7c808ca5212884032c17546e95fa16353a
+
+diff --git a/oox/Library_oox.mk b/oox/Library_oox.mk
+index fcd7215..e6765f4 100644
+--- a/oox/Library_oox.mk
++++ b/oox/Library_oox.mk
+@@ -314,4 +314,10 @@ $(eval $(call gb_Library_add_exception_objects,oox,\
+ ))
+ endif
+ 
++ifeq ($(CPUNAME),M68K)
++$(eval $(call gb_Library_add_cxxflags,oox,\
++    -mlong-jump-table-offsets \
++))
++endif
++
+ # vim: set noet sw=4 ts=4:
+-- 
+cgit v0.10.2
+

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git