The following commit has been merged in the debian-experimental-3.5 branch: commit 0852fb0fa7fb1cc65b66a5c759b92f0450979000 Author: Rene Engelhard <r...@debian.org> Date: Wed Jan 25 11:48:48 2012 +0000
build oox on ia64 with -g0 as otherwise it gets too big diff --git a/changelog b/changelog index 347de3d..eeb20ff 100644 --- a/changelog +++ b/changelog @@ -1,10 +1,9 @@ libreoffice (1:3.5.0~rc2-1) UNRELEASED; urgency=low * new upstream release candidate - - -- Rene Engelhard <r...@debian.org> Tue, 24 Jan 2012 18:25:17 +0100 - -libreoffice (1:3.5.0~rc1-2) UNRELEASED; urgency=low + + * debian/patches/ia64-oox-no-debug.diff: build oox on ia64 with -g0 + as otherwise it gets too big to link * debian/rules: - fix patch rule in check @@ -13,7 +12,7 @@ libreoffice (1:3.5.0~rc1-2) UNRELEASED; urgency=low times; strip pre-libreoffice entries otherwise. - (re-)enable -script-provider-js - -- Rene Engelhard <r...@debian.org> Tue, 24 Jan 2012 01:51:15 +0100 + -- Rene Engelhard <r...@debian.org> Wed, 25 Jan 2012 11:48:19 +0000 libreoffice (1:3.5.0~rc1-1) experimental; urgency=low diff --git a/patches/ia64-oox-no-debug.diff b/patches/ia64-oox-no-debug.diff new file mode 100644 index 0000000..a993f95 --- /dev/null +++ b/patches/ia64-oox-no-debug.diff @@ -0,0 +1,17 @@ +--- a/oox/Library_oox.mk-old 2012-01-25 11:44:21.000000000 +0000 ++++ b/oox/Library_oox.mk 2012-01-25 11:44:47.000000000 +0000 +@@ -44,6 +44,14 @@ + -DOOX_DLLIMPLEMENTATION \ + )) + ++ifeq ($(CPUNAME),IA64) ++ ifneq ($(ENABLE_SYMBOLS),) ++$(eval $(call gb_Library_add_cxxflags,oox,\ ++ -g0 \ ++)) ++ endif ++endif ++ + $(eval $(call gb_Library_add_api,oox,\ + offapi \ + udkapi \ diff --git a/patches/series b/patches/series index 9c885a6..6e17fcc 100644 --- a/patches/series +++ b/patches/series @@ -27,3 +27,4 @@ revert-468fe685e3c58c84bce6d9a48b931dcc21682679.diff propagate-gb_FULLDEPS.diff disable-sc-unoapi-subsequentcheck-for-now.diff fix-nsplugin-build-and-install.diff +ia64-oox-no-debug.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/e1rq1k4-000640...@vasks.debian.org