[SCM] LibreOffice packaging repository branch, master, updated. libreoffice_4.0.4-2-1-g2029a5e
The following commit has been merged in the master branch:
commit 2029a5e657588af096615704aab75838c0cda3d4
Author: Rene Engelhard <rene@rene-engelhard.de>
Date: Tue Jul 2 22:14:18 2013 +0200
fix sal sparc build...
Conflicts:
changelog
patches/series
diff --git a/changelog b/changelog
index 7880f7e..98bee7d 100644
--- a/changelog
+++ b/changelog
@@ -1,3 +1,11 @@
+libreoffice (1:4.0.4-3) UNRELEASED; urgency=low
+
+ * debian/patches/hack-interlck_sparc.diff: hack around sparc build failure,
+ #undef __sparcv8plus, __sparcv9 and __sparc_v9__ for interlck_sparc.o as
+ we otherwise miss osl_InterlockedCountSetV9...
+
+ -- Rene Engelhard <rene@debian.org> Tue, 02 Jul 2013 22:12:36 +0200
+
libreoffice (1:4.0.4-2) unstable; urgency=low
* brown paper bag release
diff --git a/patches/hack-interlck_sparc.diff b/patches/hack-interlck_sparc.diff
new file mode 100644
index 0000000..363059b
--- /dev/null
+++ b/patches/hack-interlck_sparc.diff
@@ -0,0 +1,19 @@
+diff --git a/sal/osl/unx/asm/interlck_sparc.s b/sal/osl/unx/asm/interlck_sparc.s
+index 8d86b4d..8517bef 100644
+--- a/sal/osl/unx/asm/interlck_sparc.s
++++ b/sal/osl/unx/asm/interlck_sparc.s
+@@ -39,6 +39,14 @@
+ *
+ */
+
++/* FIXME: Crude hack to get this compile. Looks like all those three
++get defined now and this we don't get osl_InterlockedCountSetV9 which
++then makes sal fail to link (util.c uses it). Sparc people, better fix
++welcome */
++#undef __sparcv8plus
++#undef __sparcv9
++#undef __sparc_v9__
++
+ #if !defined(__sparcv8plus) && !defined(__sparcv9) && !defined(__sparc_v9__)
+
+ .section ".data"
diff --git a/patches/series b/patches/series
index dbb000c..f463ffa 100644
--- a/patches/series
+++ b/patches/series
@@ -31,3 +31,4 @@ wheezy-backports-python.diff
fix-internal-hsqldb-build.diff
fix-kk-in-lo-xlate-lang.diff
fdo-65882-fix-sw-unoapi-on-exit.diff
+hack-interlck_sparc.diff
--
LibreOffice packaging repository
Reply to: