[libreoffice] 01/02: enable libgltf on mips64*, should be fast enough :), add mips64* to *_ARCHS
This is an automated email from the git hooks/post-receive script.
rene pushed a commit to branch debian-experimental-5.1
in repository libreoffice.
commit d712beb0367c3c36b6d7f0f2be49110ad0fbd091
Author: Rene Engelhard <rene@debian.org>
Date: Fri Sep 18 19:40:53 2015 +0200
enable libgltf on mips64*, should be fast enough :), add mips64* to *_ARCHS
---
control | 2 +-
rules | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/control b/control
index 00b033b..745bcf0 100644
--- a/control
+++ b/control
@@ -68,7 +68,7 @@ Build-Depends: ant (>= 1.7.0) [!mips64eb],
libglew-dev,
libglib2.0-dev (>= 2.15.0),
libglm-dev (>= 0.9.6.3),
- libgltf-dev (>= 0.0.2-4) [!armel !mips !mipsel !mips64eb !mips64el],
+ libgltf-dev (>= 0.0.2-4) [!armel !mips !mipsel],
libglu1-mesa-dev,
libgraphite2-dev (>= 0.9.3),
libgstreamer-plugins-base1.0-dev,
diff --git a/rules b/rules
index a6db05b..bdb05f6 100755
--- a/rules
+++ b/rules
@@ -550,7 +550,7 @@ PLATFORMID := $(shell grep PLATFORMID debian/vars.$(DEB_HOST_ARCH) | cut -d"=" -
ifeq "$(ENABLE_GLTF)" "y"
# doesn't make that much sense on armel and mips(el), does it? :)
- OOO_GLTF_ARCHS = $(filter-out armel mips%, $(OOO_ARCHS))
+ OOO_GLTF_ARCHS = $(filter-out armel mips mipsel, $(OOO_ARCHS))
ifeq (,$(filter $(DEB_HOST_ARCH),$(OOO_GLTF_ARCHS)))
ENABLE_GLTF=n
endif
@@ -569,9 +569,9 @@ IGNORE_MAKE_CHECK_FAILURES:=
endif
endif
-OOO_64BIT_ARCHS = $(filter alpha amd64 arm64 ia64 kfreebsd-amd64 ppc64 ppc64el s390x, $(OOO_ARCHS))
+OOO_64BIT_ARCHS = $(filter alpha amd64 arm64 ia64 kfreebsd-amd64 mips64eb mips64el ppc64 ppc64el s390x, $(OOO_ARCHS))
$(eval $(call gen_no_archs,OOO_64BIT_ARCHS))
-OOO_BE_ARCHS = $(filter hppa m68k mips powerpc powerpcspe ppc64 s390 s390x sparc,$(OOO_ARCHS))
+OOO_BE_ARCHS = $(filter hppa m68k mips mips64be powerpc powerpcspe ppc64 s390 s390x sparc,$(OOO_ARCHS))
OOO_LE_ARCHS = $(filter-out $(OOO_BE_ARCHS),$(OOO_ARCHS))
$(eval $(call gen_no_archs,OOO_LE_ARCHS))
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git
Reply to: