The following commit has been merged in the master branch:
commit 313b349b5392b9f6e9c3efc0ab684b79836d9def
Author: Rene Engelhard <[email protected]>
Date: Tue Apr 3 14:47:02 2012 +0200
remove extraneous ""s breaking the build on ia64 as the hardened LDFLAGS is
empty there
diff --git a/changelog b/changelog
index 1271490..8c1e9af 100644
--- a/changelog
+++ b/changelog
@@ -3,6 +3,8 @@ libreoffice (1:3.5.2~rc2-2) UNRELEASED; urgency=low
* debian/patches/gtk3-hack-explicit-gmodule.diff: explicitly link to
gmodule, as we otherwise get undefined references to g_mdoule_ in the
gtk3 VCLplug...
+ * debian/patches/debian-hardened-buildflags.diff: remove extraneous ""'s
+ breaking the build on ia64 as the hardened LDFLAGS is empty there
* debian/rules:
- enable Base stuff on s390x again, libebook1.2-dev available now
@@ -16,7 +18,7 @@ libreoffice (1:3.5.2~rc2-2) UNRELEASED; urgency=low
* debian/control{,.lang}.in:
- suggest libreoffice-grammarcheck{,-@LCODE@} (e.g. provided by
lightproof)
- -- Rene Engelhard <[email protected]> Tue, 03 Apr 2012 01:30:48 +0200
+ -- Rene Engelhard <[email protected]> Tue, 03 Apr 2012 14:44:22 +0200
libreoffice (1:3.5.2~rc2-1) unstable; urgency=low
diff --git a/patches/debian-hardened-buildflags.diff
b/patches/debian-hardened-buildflags.diff
index 795fffe..5991ae1 100644
--- a/patches/debian-hardened-buildflags.diff
+++ b/patches/debian-hardened-buildflags.diff
@@ -39,7 +39,7 @@ index c094bb4..a0608f4 100644
OBJCXXFLAGS ?= $(gb_COMPILEROPTFLAGS)
endif
-+LDFLAGS += "$(HARDEN_LDFLAGS)"
++LDFLAGS += $(HARDEN_LDFLAGS)
+
# if enabled we link all of these libraries into one larger, merged library
# for which we can do a lot more optimisation, and which is faster to read
--
LibreOffice packaging repository
--
To UNSUBSCRIBE, email to [email protected]
with a subject of "unsubscribe". Trouble? Contact [email protected]
Archive: http://lists.debian.org/[email protected]
