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

[SCM] LibreOffice packaging repository branch, debian-experimental-3.5, updated. libreoffice_3.5.0_rc3-1-10-ga0e23e4



The following commit has been merged in the debian-experimental-3.5 branch:
commit dfb2feb33e6e39f83aabe15537fa5c5cbac72070
Author: Rene Engelhard <rene@debian.org>
Date:   Sat Feb 11 00:55:05 2012 +0100

    internal icu also fails on arm*

diff --git a/rules b/rules
index b6d3083..541eeb7 100755
--- a/rules
+++ b/rules
@@ -347,10 +347,13 @@ ifeq "$(ENABLE_OPENGL)" "y"
   $(eval $(call gen_no_archs,OOO_OGLTRANS_ARCHS))
 endif
 
-ifneq (stdlibs,$(findstring stdlibs,$(SYSTEM_STUFF)))
-  ifneq (,$(findstring arm,$(DEB_HOST_ARCH)))
+ifneq (,$(findstring arm,$(DEB_HOST_ARCH)))
+  ifneq (stdlibs,$(findstring stdlibs,$(SYSTEM_STUFF)))
   $(error sal doesn not built on arm with internal stdlibs!)
   endif
+  ifneq (icu,$(findstring stdlibs,$(SYSTEM_STUFF)))
+  $(error internal icu ddoes nt build on arm!)
+  endif
 endif
 
 OOO_64BIT_ARCHS = $(filter alpha amd64 ia64 kfreebsd-amd64 ppc64 s390x, $(OOO_ARCHS))

-- 
LibreOffice packaging repository


Reply to: