[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 33093693ef70523002adad67ba4987d19f263922
Author: Rene Engelhard <rene@debian.org>
Date:   Wed Feb 8 20:54:29 2012 +0000

    sal doesn not built on arm with internal stdlibs, fail then

diff --git a/rules b/rules
index da4e092..b6d3083 100755
--- a/rules
+++ b/rules
@@ -347,6 +347,12 @@ 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)))
+  $(error sal doesn not built on arm with internal stdlibs!)
+  endif
+endif
+
 OOO_64BIT_ARCHS = $(filter alpha amd64 ia64 kfreebsd-amd64 ppc64 s390x, $(OOO_ARCHS))
 
 # Java...

-- 
LibreOffice packaging repository


Reply to: