/[packages]/updates/5/libreoffice/current/SOURCES/0002-java-dir-for-powepc64-and-powepc64le-can-differ.patch
ViewVC logotype

Contents of /updates/5/libreoffice/current/SOURCES/0002-java-dir-for-powepc64-and-powepc64le-can-differ.patch

Parent Directory Parent Directory | Revision Log Revision Log


Revision 896529 - (show annotations) (download)
Thu Oct 29 21:56:40 2015 UTC (8 years, 5 months ago) by tv
File size: 2871 byte(s)
new release
1 From 20c78b489598aa99a0aae7af7b3897036332fc0e Mon Sep 17 00:00:00 2001
2 From: David Tardon <dtardon@redhat.com>
3 Date: Tue, 12 May 2015 12:10:16 +0200
4 Subject: [PATCH] java dir for powepc64 and powepc64le can differ
5
6 E.g., RHEL >= 7.1 uses ppc64le for reasons listed in
7 https://bugs.openjdk.java.net/browse/JDK-8073139 .
8
9 This is a follow-up to commit 7a66dbe982623be620ad6ac426fe689a434e5f51.
10
11 Change-Id: I685f76d51e9775788a7fb225c6a5e2309a45ceb7
12 ---
13 config_host/config_java.h.in | 6 ++++++
14 configure.ac | 3 +++
15 jvmfwk/plugins/sunmajor/pluginlib/vendorbase.hxx | 6 +++++-
16 3 files changed, 14 insertions(+), 1 deletion(-)
17 create mode 100644 config_host/config_java.h.in
18
19 diff --git a/config_host/config_java.h.in b/config_host/config_java.h.in
20 new file mode 100644
21 index 0000000..8b23de9
22 --- /dev/null
23 +++ b/config_host/config_java.h.in
24 @@ -0,0 +1,6 @@
25 +#ifndef CONFIG_JAVA_H
26 +#define CONFIG_JAVA_H
27 +
28 +#undef JAVA_ARCH
29 +
30 +#endif
31 diff --git a/configure.ac b/configure.ac
32 index 78f5cba..dc2e5ad 100644
33 --- a/configure.ac
34 +++ b/configure.ac
35 @@ -6916,6 +6916,7 @@ then
36 ;;
37 powerpc64le)
38 AS_IF([test -d "$JAVA_HOME/jre/lib/ppc64le"], [my_java_arch=ppc64le], [my_java_arch=ppc64])
39 + JAVA_ARCH=$my_java_arch
40 ;;
41 x86_64)
42 my_java_arch=amd64
43 @@ -6925,6 +6926,7 @@ then
44 ;;
45 esac
46 JAWTLIB="-L$JAVA_HOME/jre/lib/$my_java_arch -ljawt"
47 + AS_IF([test "$JAVA_ARCH" != ""], [AC_DEFINE_UNQUOTED([JAVA_ARCH], ["$JAVA_ARCH"])])
48 fi
49 AC_MSG_RESULT([$JAWTLIB])
50 fi
51 @@ -12819,6 +12821,7 @@ AC_CONFIG_HEADERS([config_host/config_folders.h])
52 AC_CONFIG_HEADERS([config_host/config_gcc.h])
53 AC_CONFIG_HEADERS([config_host/config_global.h])
54 AC_CONFIG_HEADERS([config_host/config_graphite.h])
55 +AC_CONFIG_HEADERS([config_host/config_java.h])
56 AC_CONFIG_HEADERS([config_host/config_lgpl.h])
57 AC_CONFIG_HEADERS([config_host/config_locales.h])
58 AC_CONFIG_HEADERS([config_host/config_mpl.h])
59 diff --git a/jvmfwk/plugins/sunmajor/pluginlib/vendorbase.hxx b/jvmfwk/plugins/sunmajor/pluginlib/vendorbase.hxx
60 index 2ecd01f..a01db56 100644
61 --- a/jvmfwk/plugins/sunmajor/pluginlib/vendorbase.hxx
62 +++ b/jvmfwk/plugins/sunmajor/pluginlib/vendorbase.hxx
63 @@ -20,6 +20,8 @@
64 #ifndef INCLUDED_JVMFWK_PLUGINS_SUNMAJOR_PLUGINLIB_VENDORBASE_HXX
65 #define INCLUDED_JVMFWK_PLUGINS_SUNMAJOR_PLUGINLIB_VENDORBASE_HXX
66
67 +#include "config_java.h"
68 +
69 #include "rtl/ustring.hxx"
70 #include "rtl/ref.hxx"
71 #include "osl/endian.h"
72 @@ -31,7 +33,9 @@ namespace jfw_plugin
73
74
75 //Used by subclasses of VendorBase to build paths to Java runtime
76 -#if defined(__sparcv9)
77 +#if defined(JAVA_ARCH)
78 +#define JFW_PLUGIN_ARCH JAVA_ARCH
79 +#elif defined(__sparcv9)
80 #define JFW_PLUGIN_ARCH "sparcv9"
81 #elif defined SPARC
82 #define JFW_PLUGIN_ARCH "sparc"
83 --
84 2.4.0
85

  ViewVC Help
Powered by ViewVC 1.1.30