The following commit has been merged in the ubuntu-natty-3.3.1 branch:
commit e840ef35438abb27132af769e89c36e6f8d73203
Author: Matthias Klose <[email protected]>
Date: Tue Mar 1 14:16:44 2011 +0100
lp#727118: openjdk for ppc
diff --git a/patches/ppc-openjdk.diff b/patches/ppc-openjdk.diff
new file mode 100644
index 0000000..e868d2b
--- /dev/null
+++ b/patches/ppc-openjdk.diff
@@ -0,0 +1,28 @@
+--- /dev/null 2011-03-01 08:31:43.040093003 +0100
++++ libreoffice/libreoffice-build/patches/dev300/ppc64-openjdk.diff
2011-03-01 14:08:33.944672004 +0100
+@@ -0,0 +1,15 @@
++--- set_soenv.in
+++++ set_soenv.in
++@@ -521,6 +521,12 @@ elsif ( $platform =~ m/linux/ )
++ $JRETOOLKITDIR =
'$JAVA_HOME'.$ds."jre".$ds."lib".$ds."ppc64".$ds."client";
++ $JRETHREADDIR =
'$JAVA_HOME'.$ds."jre".$ds."lib".$ds."ppc64".$ds."native_threads";
++ }
+++ # OpenJDK
+++ elsif ($JDK =~ m/sun/) {
+++ $JRELIBDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."ppc64";
+++ $JRETOOLKITDIR =
'$JAVA_HOME'.$ds."jre".$ds."lib".$ds."ppc64".$ds."server";
+++ $JRETHREADDIR =
'$JAVA_HOME'.$ds."jre".$ds."lib".$ds."ppc64".$ds."native_threads";
+++ }
++ }
++ else {
++ print "Setting Linux PPC specific values... ";
+--- libreoffice/libreoffice-build/patches/dev300/apply 2011-03-01
14:10:55.164672003 +0100
++++ libreoffice/libreoffice-build/patches/dev300/apply 2011-03-01
14:11:47.424672376 +0100
+@@ -2388,3 +2388,7 @@
+
+ [ AXP ]
+ alpha-no-relax.diff
++
++[ UbuntuOnly ]
++ppc64-openjdk.diff
++
diff --git a/patches/series b/patches/series
index 4b709cb..8312ce6 100644
--- a/patches/series
+++ b/patches/series
@@ -11,3 +11,4 @@ disable-impress-media-embedding.diff
desktop-templates.diff
desktop-translations.diff
human-icons-add.diff
+ppc-openjdk.diff
--
LibreOffice packaging repository
--
To UNSUBSCRIBE, email to [email protected]
with a subject of "unsubscribe". Trouble? Contact [email protected]
Archive: http://lists.debian.org/[email protected]
