[Libreoffice-commits] .: 3 commits - graphite/graphite_make.patch jvmfwk/plugins set_soenv.in

[René Engelhard]

 graphite/graphite_make.patch                     |    6 +++++-
 jvmfwk/plugins/sunmajor/pluginlib/vendorbase.hxx |    4 +++-
 set_soenv.in                                     |    9 +++++----
 3 files changed, 13 insertions(+), 6 deletions(-)

New commits:
commit c02eaf4bb94b2c81f6f27d7af665b344c2e1370a
Author: Rene Engelhard <rene at debian.org>
Date:   Tue Aug 23 15:04:38 2011 +0200

    fix $JRELIBDIR/$JRETOOLKITDIR/$JRETHREADDIR for mips(el) (missing /jre)

diff --git a/set_soenv.in b/set_soenv.in
index 4f6bff9..53ef4ce 100755
--- a/set_soenv.in
+++ b/set_soenv.in
@@ -616,13 +616,13 @@ elsif ( $platform =~ m/linux/ )
         }
       }
 
-      $JRELIBDIR      = '$JAVA_HOME'.$ds."lib".$ds.$ARCH;
+      $JRELIBDIR      = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds.$ARCH;
       if ( $JDK =~ m/sun/ && -d "@JAVA_HOME@".$ds."jre".$ds."lib".$ds."mips32" ) {
-      	$JRETOOLKITDIR  = '$JAVA_HOME'.$ds."lib".$ds.$ARCH.$ds."client"; # Lemote
+      	$JRETOOLKITDIR  = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds.$ARCH.$ds."client"; # Lemote
       } else {
-      	$JRETOOLKITDIR  = '$JAVA_HOME'.$ds."lib".$ds.$ARCH.$ds."server";
+      	$JRETOOLKITDIR  = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds.$ARCH.$ds."server";
       }
-      $JRETHREADDIR   = '$JAVA_HOME'.$ds."lib".$ds.$ARCH.$ds."native_threads";
+      $JRETHREADDIR   = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds.$ARCH.$ds."native_threads";
    }
 
 
commit 6683b842e1975197932d651ba8fb725dc5c3a306
Author: Rene Engelhard <rene at debian.org>
Date:   Tue Aug 23 15:03:00 2011 +0200

    fix JFW_PLUGIN_ARCH for OpenJDK/mipsel

diff --git a/jvmfwk/plugins/sunmajor/pluginlib/vendorbase.hxx b/jvmfwk/plugins/sunmajor/pluginlib/vendorbase.hxx
index 37b12b9..cb3b51a 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/vendorbase.hxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/vendorbase.hxx
@@ -56,7 +56,9 @@ namespace jfw_plugin
 #ifdef OSL_BIGENDIAN
 #  define JFW_PLUGIN_ARCH "mips"
 #else
-#  define JFW_PLUGIN_ARCH "mips32"
+/* FIXME: do JDKs have some JDK-specific define? This is for
+OpenJDK at least, but probably not true for Lemotes JDK */
+#  define JFW_PLUGIN_ARCH "mipsel"
 #endif
 #elif defined S390X
 #define JFW_PLUGIN_ARCH "s390x"
commit 260088aaf09b852d793105115c00ad9862f21e34
Author: Rene Engelhard <rene at debian.org>
Date:   Tue Aug 23 11:35:15 2011 +0200

    export WORDS_BIGENDIAN in set_soenv and make graphite2 use it

diff --git a/graphite/graphite_make.patch b/graphite/graphite_make.patch
index 73b6205..c137c12 100644
--- a/graphite/graphite_make.patch
+++ b/graphite/graphite_make.patch
@@ -1,6 +1,6 @@
 --- misc/build/graphite2-1.0.2/src/makefile.mk  Fri Mar  4 10:20:30 2011 +0700
 +++ misc/build/graphite2-1.0.2/src/makefile.mk  Fri Mar  4 10:20:30 2011 +0700
-@@ -1,1 +1,34 @@
+@@ -1,1 +1,38 @@
 -dummy
 +EXTERNAL_WARNINGS_NOT_ERRORS := TRUE
 +
@@ -18,6 +18,10 @@
 +CFLAGS+=-O3 -DNDEBUG
 +.ENDIF
 +
++.IF "$(WORDS_BIGENDIAN)" == "yes"
++CFLAGS += -DWORDS_BIGENDIAN
++.ENDIF
++
 +_NS := GR2
 +
 +GR2_MACHINE=call
diff --git a/set_soenv.in b/set_soenv.in
index 7b574ad..4f6bff9 100755
--- a/set_soenv.in
+++ b/set_soenv.in
@@ -1825,6 +1825,7 @@ ToFile( "ALIGNOF_SHORT",        "@ALIGNOF_SHORT@", "e" );
 ToFile( "ALIGNOF_INT",          "@ALIGNOF_INT@", "e" );
 ToFile( "ALIGNOF_LONG",         "@ALIGNOF_LONG@", "e" );
 ToFile( "ALIGNOF_DOUBLE",       "@ALIGNOF_DOUBLE@", "e" );
+ToFile( "WORDS_BIGENDIAN",      "@WORDS_BIGENDIAN@", "e" );
 ToFile( "HAVE_GCC_NO_LONG_DOUBLE", "@HAVE_GCC_NO_LONG_DOUBLE@", "e" );
 ToFile( "HAVE_GCC_AVX", "@HAVE_GCC_AVX@", "e" );
 ToFile( "HAVE_GCC_VISIBILITY_FEATURE",