[libreoffice] 03/04: Clean up COLLADA and GDRIVE conditional setting

[Rene Engelhard]

This is an automated email from the git hooks/post-receive script.

rene pushed a commit to branch master
in repository libreoffice.

commit 04f1d1679524ca8f2d7795fcfe52bed5b8365be3
Author: Rico Tzschichholz <ricotz at ubuntu.com>
Date:   Sun Aug 6 22:40:34 2017 +0200

    Clean up COLLADA and GDRIVE conditional setting
---
 rules | 25 +++++--------------------
 1 file changed, 5 insertions(+), 20 deletions(-)

diff --git a/rules b/rules
index f91368f..5cd5635 100755
--- a/rules
+++ b/rules
@@ -376,10 +376,8 @@ ifeq "$(ENABLE_GLTF)" "y"
   ENABLE_COLLADA=n
   # enable COLLADA (if any) only on i386/amd64 for now, rapidjson does seem
   # to have alignment problems on other archs (e.g. arm*)
-  ifeq "$(DEB_HOST_ARCH)" "amd64"
-    ENABLE_COLLADA=y
-  endif
-  ifeq "$(DEB_HOST_ARCH)" "i386"
+  OOO_COLLADA_ARCHS=amd64 i386
+  ifneq (,$(findstring $(DEB_HOST_ARCH),$(OOO_COLLADA_ARCHS)))
     ENABLE_COLLADA=y
   endif
   ifeq "$(ENABLE_COLLADA)" "y"
@@ -392,12 +390,9 @@ ifeq "$(ENABLE_GLTF)" "y"
   endif
   ifeq "$(GCC_VERSION_5_OR_GREATER)" "y"
     OPENCOLLADA_MINVER=(>= 0.1.0~20140703.ddf8f47+dfsg1-2)
-  else
-   OPENCOLLADA_MINVER=
-  endif
-  ifeq "$(GCC_VERSION_5_OR_GREATER)" "y"
     COLLADA2GLTF_MINVER=(>= 20140924-2)
   else
+    OPENCOLLADA_MINVER=
     COLLADA2GLTF_MINVER=
   endif
 endif
@@ -598,7 +593,6 @@ endef
 PLATFORMID := $(shell grep PLATFORMID debian/vars.$(DEB_HOST_ARCH) | cut -d"=" -f2)
 
 ifeq "$(ENABLE_GLTF)" "y"
-  OOO_COLLADA_ARCHS=amd64 i386
   $(eval $(call gen_no_archs,OOO_COLLADA_ARCHS))
 endif
 
@@ -725,19 +719,10 @@ endif
 
 ifeq "$(DEB_VENDOR)" "Debian"
   # chromium only available here.
-  ifeq "$(DEB_HOST_ARCH)" "amd64"
-    ENABLE_GDRIVE=y
-  endif
-  ifeq "$(DEB_HOST_ARCH)" "i386"
+  OOO_GDRIVE_ARCHS=amd64 arm64 armhf i386
+  ifneq (,$(findstring $(DEB_HOST_ARCH),$(OOO_GDRIVE_ARCHS))
     ENABLE_GDRIVE=y
   endif
-  ifeq "$(DEB_HOST_ARCH)" "arm64"
-      ENABLE_GDRIVE=y
-  endif
-  ifeq "$(DEB_HOST_ARCH)" "armhf"
-      ENABLE_GDRIVE=y
-  endif
-  OOO_GDRIVE_ARCHS += i386 amd64 armhf arm64
 endif
 
 ifeq "$(BUILD_DBGSYM_PACKAGES)" "y"

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git