[SCM] LibreOffice packaging repository branch, debian-experimental-3.5, updated. libreoffice_3.5.0_rc2-2-19-gd81bce2
The following commit has been merged in the debian-experimental-3.5 branch:
commit bdde5ddb7dee3cabaad575b0d3f3777376bdbc69
Author: Rene Engelhard <rene@debian.org>
Date: Tue Jan 31 19:38:44 2012 +0000
-Os on ia64 for oox seems to help...
This reverts commit 9df7a22cba408655308bef615b1a14fadaa06f8c.
diff --git a/changelog b/changelog
index 9ad1503..6416f88 100644
--- a/changelog
+++ b/changelog
@@ -3,6 +3,8 @@ libreoffice (1:3.5.0~rc2-3) UNRELEASED; urgency=low
* debian/patches/SwTblBoxFormula-destructor.diff: work around link error
on armel by specifying explicit SwTblBoxFormula destructor, thanks
Michael Meeks
+ * debian/patches/ia64-oox-size.diff: build oox on ia64 with -Os
+ as otherwise it gets too big to link
* debian/rules:
- give gb_FULLDEPS= to actual make check call, not debian/rules
diff --git a/patches/ia64-oox-size.diff b/patches/ia64-oox-size.diff
new file mode 100644
index 0000000..981a2f8
--- /dev/null
+++ b/patches/ia64-oox-size.diff
@@ -0,0 +1,15 @@
+--- a/oox/Library_oox.mk-old 2012-01-31 19:35:02.000000000 +0000
++++ b/oox/Library_oox.mk 2012-01-27 12:01:14.000000000 +0000
+@@ -40,6 +40,12 @@
+ -I$(realpath $(SRCDIR)/oox/inc) \
+ ))
+
++ifeq ($(CPUNAME),IA64)
++$(eval $(call gb_Library_add_cxxflags,oox,\
++ -Os \
++))
++endif
++
+ $(eval $(call gb_Library_add_defs,oox,\
+ -DOOX_DLLIMPLEMENTATION \
+ ))
diff --git a/patches/series b/patches/series
index 7e33b6b..d15208d 100644
--- a/patches/series
+++ b/patches/series
@@ -28,3 +28,4 @@ propagate-gb_FULLDEPS.diff
disable-sc-unoapi-subsequentcheck-for-now.diff
fix-nsplugin-build-and-install.diff
SwTblBoxFormula-destructor.diff
+ia64-oox-size.diff
--
LibreOffice packaging repository
Reply to: