The following commit has been merged in the master branch:
commit effccd787e7f63c57dcea2353b97345e1b934215
Author: Rene Engelhard <r...@debian.org>
Date: Sun Sep 25 23:05:42 2011 +0000
add patch from aurel32 to fix build on s390x
diff --git a/changelog b/changelog
index 8c4e461..eb212a4 100644
--- a/changelog
+++ b/changelog
@@ -2,6 +2,8 @@ libreoffice (1:3.4.3-3) UNRELEASED; urgency=low
* debian/patches/jdk-1.7.0-vendorname.diff: backport from master; allow
"Oracle Corporation" JDK >= 1.7.0 (closes: #642425)
+ * debian/patches/s390x.diff: add patch from aurel32 to fix build on s390x
+ (closes: #642951)
* debian/rules:
- temporarily build with internal "jfreereport" libs until we figure
@@ -12,7 +14,7 @@ libreoffice (1:3.4.3-3) UNRELEASED; urgency=low
- stop building -gcj on all openjdk-archs, keep it on gcj-using archs
- build with gcc 4.6 again, add build-conflicts on g++ 4.6.1-10 and -11
- -- Rene Engelhard <r...@debian.org> Sat, 24 Sep 2011 20:17:18 +0000
+ -- Rene Engelhard <r...@debian.org> Sun, 25 Sep 2011 23:04:09 +0000
libreoffice (1:3.4.3-2) unstable; urgency=medium
diff --git a/patches/s390x.diff b/patches/s390x.diff
new file mode 100644
index 0000000..f750aff
--- /dev/null
+++ b/patches/s390x.diff
@@ -0,0 +1,14 @@
+--- libreoffice-3.4.0/libreoffice-build/patches/hotfixes/s390x.diff
++++ libreoffice-3.4.0/libreoffice-build/patches/hotfixes/s390x.diff
+@@ -0,0 +1,11 @@
++--- tools/inc/tools/solar.h.orig
+++++ tools/inc/tools/solar.h
++@@ -251,6 +251,8 @@
++ #define __DLLEXTENSION "lp.so"
++ #elif defined LINUX && defined S390
++ #define __DLLEXTENSION "l3.so"
+++#elif defined LINUX && defined S390X
+++ #define __DLLEXTENSION "l3.so"
++ #elif defined LINUX && defined ARM32
++ #define __DLLEXTENSION "lr.so"
++ #elif defined LINUX && defined SPARC
diff --git a/patches/series b/patches/series
index 5469206..0642537 100644
--- a/patches/series
+++ b/patches/series
@@ -24,3 +24,4 @@ fix-sample-icc-1.3.2-patch.diff
update-sdbc-postgresql.diff
handle-NULL-display-gracefully.diff
jdk-1.7.0-vendorname.diff
+s390x.diff
--
LibreOffice packaging repository
--
To UNSUBSCRIBE, email to debian-openoffice-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1r7xqs-000051...@vasks.debian.org
