[SCM] LibreOffice packaging repository branch, master, updated. d2dc67d9f0054d7e49d8d9dafb7d9d21b94a62b7
The following commit has been merged in the master branch:
commit 0798ef545ee1b60508a420499b968f2b3ece338e
Author: Matthias Klose <doko@canonical.com>
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 f520609..d42946d 100644
--- a/patches/series
+++ b/patches/series
@@ -9,3 +9,4 @@ arm-optimization.diff
javaldx-LibreOffice.diff
alpha-no-relax.diff
disable-impress-media-embedding.diff
+ppc-openjdk.diff
--
LibreOffice packaging repository
Reply to: