dtardon pushed to libreoffice (f21). "add another ppc64le patch (..more)"

[notifications at fedoraproject.org]

From 08d314d7256eeb15a162b2dbd94e6770a06128ea Mon Sep 17 00:00:00 2001
From: David Tardon <dtardon at redhat.com>
Date: Tue, 12 May 2015 12:17:46 +0200
Subject: add another ppc64le patch

(cherry picked from commit 893557cc5f8f1d5e6fad998b17a525fd6997d4dd)

diff --git a/0002-java-dir-for-powepc64-and-powepc64le-can-differ.patch b/0002-java-dir-for-powepc64-and-powepc64le-can-differ.patch
new file mode 100644
index 0000000..f8b7caa
--- /dev/null
+++ b/0002-java-dir-for-powepc64-and-powepc64le-can-differ.patch
@@ -0,0 +1,85 @@
+From d8eee8e4d1a303044bf34b28c2e95bd6da23fd79 Mon Sep 17 00:00:00 2001
+From: David Tardon <dtardon at redhat.com>
+Date: Tue, 12 May 2015 12:10:16 +0200
+Subject: [PATCH] java dir for powepc64 and powepc64le can differ
+
+E.g., RHEL >= 7.1 uses ppc64le for reasons listed in
+https://bugs.openjdk.java.net/browse/JDK-8073139 .
+
+This is a follow-up to commit 7a66dbe982623be620ad6ac426fe689a434e5f51.
+
+Change-Id: I685f76d51e9775788a7fb225c6a5e2309a45ceb7
+---
+ config_host/config_java.h.in | 6 ++++++
+ configure.ac                 | 3 +++
+ jvmfwk/inc/vendorbase.hxx    | 6 +++++-
+ 3 files changed, 14 insertions(+), 1 deletion(-)
+ create mode 100644 config_host/config_java.h.in
+
+diff --git a/config_host/config_java.h.in b/config_host/config_java.h.in
+new file mode 100644
+index 0000000..8b23de9
+--- /dev/null
++++ b/config_host/config_java.h.in
+@@ -0,0 +1,6 @@
++#ifndef CONFIG_JAVA_H
++#define CONFIG_JAVA_H
++
++#undef JAVA_ARCH
++
++#endif
+diff --git a/configure.ac b/configure.ac
+index 55157a9..5414754 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -7002,6 +7002,7 @@ then
+             ;;
+         powerpc64le)
+             AS_IF([test -d "$JAVA_HOME/jre/lib/ppc64le"], [my_java_arch=ppc64le], [my_java_arch=ppc64])
++            JAVA_ARCH=$my_java_arch
+             ;;
+         x86_64)
+             my_java_arch=amd64
+@@ -7011,6 +7012,7 @@ then
+             ;;
+         esac
+         JAWTLIB="-L$JAVA_HOME/jre/lib/$my_java_arch -ljawt"
++        AS_IF([test "$JAVA_ARCH" != ""], [AC_DEFINE_UNQUOTED([JAVA_ARCH], ["$JAVA_ARCH"])])
+     fi
+     AC_MSG_RESULT([$JAWTLIB])
+ fi
+@@ -12988,6 +12990,7 @@ AC_CONFIG_HEADERS([config_host/config_folders.h])
+ AC_CONFIG_HEADERS([config_host/config_gcc.h])
+ AC_CONFIG_HEADERS([config_host/config_global.h])
+ AC_CONFIG_HEADERS([config_host/config_graphite.h])
++AC_CONFIG_HEADERS([config_host/config_java.h])
+ AC_CONFIG_HEADERS([config_host/config_lgpl.h])
+ AC_CONFIG_HEADERS([config_host/config_liblangtag.h])
+ AC_CONFIG_HEADERS([config_host/config_locales.h])
+diff --git a/jvmfwk/inc/vendorbase.hxx b/jvmfwk/inc/vendorbase.hxx
+index 2ecd01f..a01db56 100644
+--- a/jvmfwk/inc/vendorbase.hxx
++++ b/jvmfwk/inc/vendorbase.hxx
+@@ -20,6 +20,8 @@
+ #ifndef INCLUDED_JVMFWK_PLUGINS_SUNMAJOR_PLUGINLIB_VENDORBASE_HXX
+ #define INCLUDED_JVMFWK_PLUGINS_SUNMAJOR_PLUGINLIB_VENDORBASE_HXX
+ 
++#include "config_java.h"
++
+ #include "rtl/ustring.hxx"
+ #include "rtl/ref.hxx"
+ #include "osl/endian.h"
+@@ -31,7 +33,9 @@ namespace jfw_plugin
+ 
+ 
+ //Used by subclasses of VendorBase to build paths to Java runtime
+-#if defined(__sparcv9)
++#if defined(JAVA_ARCH)
++#define JFW_PLUGIN_ARCH JAVA_ARCH
++#elif defined(__sparcv9)
+ #define JFW_PLUGIN_ARCH "sparcv9"
+ #elif defined SPARC
+ #define JFW_PLUGIN_ARCH "sparc"
+-- 
+2.4.0
+
diff --git a/libreoffice.spec b/libreoffice.spec
index f6a4a3f..e92adaf 100644
--- a/libreoffice.spec
+++ b/libreoffice.spec
@@ -385,6 +385,7 @@ Patch73: 0001-Resolves-tdf-90757-ensure-start-row-end-row-order-ma.patch
 Patch74: 0001-Resolves-tdf-91078-check-also-DBData-modified-not-on.patch
 Patch75: 0001-misspell-some-words-copy-and-paste-slide-to-gimp.patch
 Patch76: 0001-java-dir-for-powepc64-and-powepc64le-can-differ.patch
+Patch77: 0002-java-dir-for-powepc64-and-powepc64le-can-differ.patch
 
 %define instdir %{_libdir}
 %define baseinstdir %{instdir}/libreoffice
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/libreoffice.git/commit/?h=f21&id=08d314d7256eeb15a162b2dbd94e6770a06128ea