[SCM] LibreOffice packaging repository branch, debian-experimental-3.5, updated. libreoffice_3.5.0_beta2-1-10-g10be1b1
The following commit has been merged in the debian-experimental-3.5 branch:
commit d0c29ead5ed4049c149b2a22061d6b9f2d3eda2a
Author: Rene Engelhard <rene@debian.org>
Date: Thu Dec 29 18:25:55 2011 +0100
fix ARM detetcion in set_soenv
diff --git a/changelog b/changelog
index 2eacf84..cd7d8ab 100644
--- a/changelog
+++ b/changelog
@@ -1,10 +1,12 @@
libreoffice (1:3.5.0~beta2-2) UNRELASED; urgency=low
+ * debian/patches/fix-ARM-detetcion-in-set-soenv.diff: as name says
+
* debian/rules:
- force boost to 1.46 due to ICE with 1.48
- prevent creating bogus gcc- build-dependency on gcj archs
- -- Rene Engelhard <rene@debian.org> Wed, 28 Dec 2011 20:31:13 +0000
+ -- Rene Engelhard <rene@debian.org> Thu, 29 Dec 2011 18:25:07 +0100
libreoffice (1:3.5.0~beta2-1) experimental; urgency=low
diff --git a/patches/fix-ARM-detetcion-in-set-soenv.diff b/patches/fix-ARM-detetcion-in-set-soenv.diff
new file mode 100644
index 0000000..1eb918a
--- /dev/null
+++ b/patches/fix-ARM-detetcion-in-set-soenv.diff
@@ -0,0 +1,13 @@
+diff --git a/set_soenv.in b/set_soenv.in
+index 5347a84..7afcabb 100755
+--- a/set_soenv.in
++++ b/set_soenv.in
+@@ -559,7 +559,7 @@ elsif ( $platform =~ m/linux/ )
+ $JRETOOLKITDIR = $JAVA_HOME.$ds."jre".$ds."lib".$ds."alpha".$ds."server";
+ $JRETHREADDIR = $JAVA_HOME.$ds."jre".$ds."lib".$ds."alpha".$ds."native_threads";
+ }
+- elsif ($platform =~ m/^arm.*?l-/)
++ elsif ($platform =~ m/^arm.*-gnueabi/)
+ { print "Setting Linux ARM specific values... ";
+ $oldoutfile = "LinuxARMEnv.Set.sh";
+ $CPU = "R";
diff --git a/patches/series b/patches/series
index 8f4a9f4..7822afb 100644
--- a/patches/series
+++ b/patches/series
@@ -25,3 +25,4 @@ make-pyuno-work-with-system-wide-module-install.diff
search-usr-share-for-images.diff
make-package-modules-not-suck.diff
set-correct-icon-names-in-desktop-files.diff
+fix-ARM-detetcion-in-set-soenv.diff
--
LibreOffice packaging repository
Reply to: