[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

[SCM] LibreOffice packaging repository branch, ubuntu-quantal-3.6, updated. libreoffice_3.5.4-5-143-g4d4f4d6



The following commit has been merged in the ubuntu-quantal-3.6 branch:
commit 6123c0470adf62191556a37da36aef4c35125914
Author: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
Date:   Wed Feb 22 10:54:11 2012 +0100

    do not run checks on powerpc armel armhf for now as they fail with debug output level 11 is too high

diff --git a/rules b/rules
index 43b1a09..4dcf242 100755
--- a/rules
+++ b/rules
@@ -501,6 +501,10 @@ ifeq "$(DEB_VENDOR)" "Ubuntu"
   # lucene has too heavy deps for main, internal copy does only build parts
   SYSTEM_STUFF := $(filter-out graphite libcdr libvisio lpsolve lucene, $(SYSTEM_STUFF))
   CONFIGURE_FLAGS += --with-intro-progressbar-color=221,72,20
+  # do not run checks on armel armhf powerpc for now as they fail with "debug output level 11 is too high"
+  ifneq (,$(filter armhf armel powerpc,$(DEB_HOST_ARCH)))
+    RUN_MAKE_CHECK:=n
+  endif
 endif
 
 CONFIGURE_FLAGS += $(foreach i, $(SYSTEM_STUFF),--with-system-$(i))

-- 
LibreOffice packaging repository


Reply to: