The following commit has been merged in the master branch:
commit 316d2a576d32a4918ed9bf514bf0daf24ae2fc84
Author: Rene Engelhard <r...@debian.org>
Date: Mon Feb 21 20:44:52 2011 +0100
use -Wl,--no-relax on alpha
diff --git a/changelog b/changelog
index 4cbef9f..9172691 100644
--- a/changelog
+++ b/changelog
@@ -4,6 +4,8 @@ libreoffice (1:3.3.1~rc2-2) UNRELEASED; urgency=low
optimization for armv4t/6/7, based on i117017
* debian/patches/javaldx-LibreOffice.diff: s/openoffice.org/libreoffice/
for javaldx (closes: #614103)
+ * debian/patches/alpha-no-relax.diff: use -Wl,--no-relax on alpha
+ (https://bugs.freedesktop.org/show_bug.cgi?id=32224)
* debian/rules:
- --with-arm-target=7 on armhf, explicit --with-arm-target=4
@@ -11,7 +13,7 @@ libreoffice (1:3.3.1~rc2-2) UNRELEASED; urgency=low
* debian/libreoffice-common.links: s/openofficeorg3/libreoffice/
(closes: #614100)
- -- Rene Engelhard <r...@debian.org> Sun, 20 Feb 2011 14:12:56 +0000
+ -- Rene Engelhard <r...@debian.org> Mon, 21 Feb 2011 20:42:51 +0100
libreoffice (1:3.3.1~rc2-1) unstable; urgency=low
diff --git a/patches/alpha-no-relax.diff b/patches/alpha-no-relax.diff
new file mode 100644
index 0000000..8a42d22
--- /dev/null
+++ b/patches/alpha-no-relax.diff
@@ -0,0 +1,23 @@
+--- /dev/null 2011-02-09 23:43:13.080975836 +0100
++++ libreoffice-3.3.1/libreoffice-build/patches/dev300/alpha-no-relax.diff
2011-02-21 20:36:25.000000000 +0100
+@@ -0,0 +1,12 @@
++diff --git a/solenv/inc/unxlngaxp.mk b/solenv/inc/unxlngaxp.mk
++index bf7711a..ca20fb3 100644
++--- solenv/inc/unxlngaxp.mk
+++++ solenv/inc/unxlngaxp.mk
++@@ -29,6 +29,6 @@
++
++ PICSWITCH:=-fPIC
++ .INCLUDE : unxlng.mk
++-CFLAGS+=-DAXP
+++CFLAGS+=-DAXP -Wl,--no-relax
++ DLLPOSTFIX=ll
++ BUILD64=1
+--- libreoffice-3.3.1/libreoffice-build/patches/dev300/apply-old
2011-02-21 20:41:23.000000000 +0100
++++ libreoffice-3.3.1/libreoffice-build/patches/dev300/apply 2011-02-21
20:41:41.000000000 +0100
+@@ -2390,3 +2390,5 @@
+ [ ARM ]
+ arm-optimization.diff
+
++[ AXP ]
++alpha-no-relax.diff
diff --git a/patches/series b/patches/series
index d0c08a4..ffa6e14 100644
--- a/patches/series
+++ b/patches/series
@@ -7,3 +7,4 @@ bridges-mkstemp-error-better-message.diff
pyuno-demo-fix-PYTHONPATH.diff
arm-optimization.diff
javaldx-LibreOffice.diff
+alpha-no-relax.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/e1prbwa-00052y...@alioth.debian.org
