mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

java dir for powepc64 and powepc64le can differ

Browse Source 
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 7a66dbe982.

Change-Id: I685f76d51e9775788a7fb225c6a5e2309a45ceb7
This commit is contained in:
David Tardon
2015-05-12 12:10:16 +02:00
parent d2ef03ce0b
commit d8eee8e4d1
3 changed files with 14 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
config_host/config_java.h.in Normal file
View File

@@ -0,0 +1,6 @@
#ifndef CONFIG_JAVA_H
#define CONFIG_JAVA_H
#undef JAVA_ARCH
#endif

3
configure.ac
View File

@@ -7002,6 +7002,7 @@ then
;; ;;
powerpc64le) powerpc64le)
AS_IF([test -d "$JAVA_HOME/jre/lib/ppc64le"], [my_java_arch=ppc64le], [my_java_arch=ppc64]) AS_IF([test -d "$JAVA_HOME/jre/lib/ppc64le"], [my_java_arch=ppc64le], [my_java_arch=ppc64])
JAVA_ARCH=$my_java_arch
;; ;;
x86_64) x86_64)
my_java_arch=amd64 my_java_arch=amd64
@@ -7011,6 +7012,7 @@ then
;; ;;
esac esac
JAWTLIB="-L$JAVA_HOME/jre/lib/$my_java_arch -ljawt" JAWTLIB="-L$JAVA_HOME/jre/lib/$my_java_arch -ljawt"
AS_IF([test "$JAVA_ARCH" != ""], [AC_DEFINE_UNQUOTED([JAVA_ARCH], ["$JAVA_ARCH"])])
fi fi
AC_MSG_RESULT([$JAWTLIB]) AC_MSG_RESULT([$JAWTLIB])
fi 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_gcc.h])
AC_CONFIG_HEADERS([config_host/config_global.h]) AC_CONFIG_HEADERS([config_host/config_global.h])
AC_CONFIG_HEADERS([config_host/config_graphite.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_lgpl.h])
AC_CONFIG_HEADERS([config_host/config_liblangtag.h]) AC_CONFIG_HEADERS([config_host/config_liblangtag.h])
AC_CONFIG_HEADERS([config_host/config_locales.h]) AC_CONFIG_HEADERS([config_host/config_locales.h])

6
jvmfwk/inc/vendorbase.hxx
View File

@@ -20,6 +20,8 @@
#ifndef INCLUDED_JVMFWK_PLUGINS_SUNMAJOR_PLUGINLIB_VENDORBASE_HXX #ifndef INCLUDED_JVMFWK_PLUGINS_SUNMAJOR_PLUGINLIB_VENDORBASE_HXX
#define 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/ustring.hxx"
#include "rtl/ref.hxx" #include "rtl/ref.hxx"
#include "osl/endian.h" #include "osl/endian.h"
@@ -31,7 +33,9 @@ namespace jfw_plugin
//Used by subclasses of VendorBase to build paths to Java runtime //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" #define JFW_PLUGIN_ARCH "sparcv9"
#elif defined SPARC #elif defined SPARC
#define JFW_PLUGIN_ARCH "sparc" #define JFW_PLUGIN_ARCH "sparc"