The following commit has been merged in the ubuntu-precise-3.5 branch:
commit fa0a1bd457b3d81310c8420db76b88e2b3a29be1
Author: Rene Engelhard <[email protected]>
Date: Wed Apr 11 13:46:03 2012 +0200
add ulimit -c unlimited before make check call to catch backtraces on
sporatic soffice.bin crashes "failing" the build
Conflicts:
changelog
control
diff --git a/changelog b/changelog
index f5b7e02..cc3baf8 100644
--- a/changelog
+++ b/changelog
@@ -6,8 +6,12 @@ libreoffice (1:3.5.2-2ubuntu2) precise-proposed; urgency=low
* add recommend to -gnome|-kde from libreoffice metapackage
(LP: #841696)
* fix typo in unity quicklist for zh_CN/Base (LP: #984893)
+ * cherry-pick 0a20b5e181a4317ee838064ea122e753ab935430 from debian:
+ - add ulimit -c unlimited before make check call to catch
+ backtraces on sporatic soffice.bin crashes "failing" the build;
+ build-depend on gdb if RUN_MAKE_CHECK=y
- -- Bjoern Michaelsen <[email protected]> Wed, 18 Apr 2012
15:53:08 +0200
+ -- Bjoern Michaelsen <[email protected]> Mon, 23 Apr 2012
12:56:07 +0200
libreoffice (1:3.5.2-2ubuntu1) precise; urgency=low
diff --git a/rules b/rules
index 45ebd9d..49a48b4 100755
--- a/rules
+++ b/rules
@@ -687,6 +687,7 @@ ifneq (,$(filter cppunit, $(SYSTEM_STUFF)))
BUILD_DEPS += , libcppunit-dev (>= 1.12)
endif
ifeq "$(RUN_MAKE_CHECK)" "y"
+ BUILD_DEPS += , gdb
ifeq "$(ENABLE_JUNIT4)" "y"
BUILD_DEPS += , junit4 $(JUNIT_MIN_VER)
else
@@ -1641,6 +1642,7 @@ endif
export TMPDIR=$$t; \
export HOME=$$t; \
export SAL_USE_VCLPLUGIN="svp"; \
+ if [ -x /usr/bin/gdb ]; then ulimit -c unlimited; fi && \
$(MAKE) check gb_FULLDEPS= gb_Deliver_HARDLINK=T && \
rm -rf $$t
--
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]
