[libreoffice] 02/03: disable graphite2 for armel and sparc for wheezy-backports
This is an automated email from the git hooks/post-receive script.
rene pushed a commit to branch master
in repository libreoffice.
commit bd9b51d95a0cdc3f435612255a770e7c934d113e
Author: Rene Engelhard <rene@debian.org>
Date: Tue Sep 3 19:20:29 2013 +0200
disable graphite2 for armel and sparc for wheezy-backports
This partially reverts 20824c9fcf1aa2d06de53556803930ebf5613cde
---
changelog | 1 +
rules | 15 +++++++++++++++
2 files changed, 16 insertions(+)
diff --git a/changelog b/changelog
index 1ef2a22..70ec2f0 100644
--- a/changelog
+++ b/changelog
@@ -2,6 +2,7 @@ libreoffice (1:4.1.1-2) UNRELEASED; urgency=low
* debian/rules:
- fix curl conditional to really add libcurl4-<whatever>-dev builddep....
+ - disable graphite2 for armel and sparc for wheezy-backports
-- Rene Engelhard <rene@debian.org> Tue, 03 Sep 2013 18:05:31 +0200
diff --git a/rules b/rules
index 25bd2ce..edef869 100755
--- a/rules
+++ b/rules
@@ -610,9 +610,24 @@ ifneq "$(ENABLE_MINIMIZER)" "y"
endif
BUILD_DEPS += , libpoppler-dev (>= 0.8.0), libpoppler-private-dev, libpoppler-cpp-dev
+ifeq "$(WHEEZY_BACKPORTS)" "y"
+# fails their tests
+ ifeq "$(DEB_HOST_ARCH)" "armel"
+ENABLE_GRAPHITE=n
+SYSTEM_STUFF := $(filter-out graphite, $(SYSTEM_STUFF))
+ endif
+ ifeq "$(DEB_HOST_ARCH)" "sparc"
+ENABLE_GRAPHITE=n
+SYSTEM_STUFF := $(filter-out graphite, $(SYSTEM_STUFF))
+ endif
+endif
+
ifeq "$(ENABLE_GRAPHITE)" "y"
ifneq (,$(filter graphite, $(SYSTEM_STUFF)))
BUILD_DEPS += , libgraphite2-dev (>= 0.9.3)
+ ifeq "$(WHEEZY_BACKPORTS)" "y"
+ BUILD_DEPS += [!armel !sparc]
+ endif
endif
else
CONFIGURE_FLAGS += --disable-graphite
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git
Reply to: