[libreoffice] 02/09: move the collada stuff down after the OOO_*_ARCHS settings and move OOO_GDRIVE_ARCHS setting "to the rest"

[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 8c19982c3aa5fbdd7ae5ff5a69a61e4ad2075f77
Author: Rene Engelhard <rene at rene-engelhard.de>
Date:   Sun Aug 6 22:24:19 2017 +0000

    move the collada stuff down after the OOO_*_ARCHS settings and move OOO_GDRIVE_ARCHS setting "to the rest"
---
 rules | 54 +++++++++++++++++++++++++-----------------------------
 1 file changed, 25 insertions(+), 29 deletions(-)

diff --git a/rules b/rules
index e8738ce..0f0986e 100755
--- a/rules
+++ b/rules
@@ -370,33 +370,6 @@ SYSTEM_STUFF += epoxy
 ENABLE_GLTF=y
 SYSTEM_STUFF += libgltf
 LIBGLTF_MINVER=0.1.0
-# I think we should only enable it when we have BOTH system-opencollasa
-# and system-collada2gltf working
-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*)
-  OOO_COLLADA_ARCHS=amd64 i386
-  $(eval $(call gen_no_archs,OOO_COLLADA_ARCHS))
-  ifneq (,$(findstring $(DEB_HOST_ARCH),$(OOO_COLLADA_ARCHS)))
-    ENABLE_COLLADA=y
-  endif
-  ifeq "$(ENABLE_COLLADA)" "y"
-    SYSTEM_STUFF += opencollada
-    OPENCOLLADA_CFLAGS="-I/usr/include/opencollada/COLLADABaseUtils -I/usr/include/opencollada/COLLADAFramework -I/usr/include/opencollada/COLLADASaxFrameworkLoader -I/usr/include/opencollada/GeneratedSaxParser -I/usr/include/opencollada"
-    OPENCOLLADA_LIBS="-L/usr/lib/opencollada -lUTF -lOpenCOLLADABaseUtils -lOpenCOLLADAFramework -lOpenCOLLADASaxFrameworkLoader -lGeneratedSaxParser -lMathMLSolver -lpcre"
-    SYSTEM_STUFF += collada2gltf
-    COLLADA2GLTF_CFLAGS="-I/usr/include/collada2gltf -I/usr/include/collada2gltf/JSON -I/usr/include/collada2gltf/GLTF -I/usr/include/collada2gltf/helpers -I/usr/include/collada2gltf/assetModifiers -I/usr/include/rapidjson" 
-    COLLADA2GLTF_LIBS="-lcollada2gltfConvert -lo3dgc_common_lib -lo3dgc_dec_lib -lo3dgc_enc_lib"
-  endif
-  ifeq "$(GCC_VERSION_5_OR_GREATER)" "y"
-    OPENCOLLADA_MINVER=(>= 0.1.0~20140703.ddf8f47+dfsg1-2)
-    COLLADA2GLTF_MINVER=(>= 20140924-2)
-  else
-    OPENCOLLADA_MINVER=
-    COLLADA2GLTF_MINVER=
-  endif
-endif
 ifeq "$(ENABLE_JAVA)" "y"
   ENABLE_REPORTDESIGN=y
   SYSTEM_STUFF += jfreereport
@@ -634,6 +607,12 @@ OOO_REPORTDESIGN_ARCHS := $(OOO_BASE_ARCHS)
 $(eval $(call gen_no_archs,OOO_REPORTDESIGN_ARCHS))
 OOO_FIREBIRD_ARCHS := $(OOO_LE_ARCHS)
 $(eval $(call gen_no_archs,OOO_FIREBIRD_ARCHS))
+# enable COLLADA (if any) only on i386/amd64 for now, rapidjson does seem
+# to have alignment problems on other archs (e.g. arm*)
+OOO_COLLADA_ARCHS=amd64 i386
+$(eval $(call gen_no_archs,OOO_COLLADA_ARCHS))
+# chromium only available here.
+OOO_GDRIVE_ARCHS=amd64 arm64 armhf i386
 
 OOO_CHECK_ARCHS := $(filter-out kfreebsd-i386 kfreebsd-amd64 $(OOO_BE_ARCHS),$(OOO_ARCHS))
 $(eval $(call gen_no_archs,OOO_CHECK_ARCHS))
@@ -716,8 +695,6 @@ ifeq "$(shell dpkg-parsechangelog | grep Distribution | awk '{ print $$2 }')" "U
 endif
 
 ifeq "$(DEB_VENDOR)" "Debian"
-  # chromium only available here.
-  OOO_GDRIVE_ARCHS=amd64 arm64 armhf i386
   ifneq (,$(findstring $(DEB_HOST_ARCH),$(OOO_GDRIVE_ARCHS)))
     ENABLE_GDRIVE=y
   endif
@@ -790,6 +767,25 @@ else
   ifneq (,$(findstring libgltf,$(SYSTEM_STUFF)))
 	BUILD_DEPS += , libgltf-dev (>= $(LIBGLTF_MINVER))
   endif
+  ENABLE_COLLADA=n
+  ifneq (,$(findstring $(DEB_HOST_ARCH),$(OOO_COLLADA_ARCHS)))
+    ENABLE_COLLADA=y
+  endif
+  ifeq "$(ENABLE_COLLADA)" "y"
+    SYSTEM_STUFF += opencollada
+    OPENCOLLADA_CFLAGS="-I/usr/include/opencollada/COLLADABaseUtils -I/usr/include/opencollada/COLLADAFramework -I/usr/include/opencollada/COLLADASaxFrameworkLoader -I/usr/include/opencollada/GeneratedSaxParser -I/usr/include/opencollada"
+    OPENCOLLADA_LIBS="-L/usr/lib/opencollada -lUTF -lOpenCOLLADABaseUtils -lOpenCOLLADAFramework -lOpenCOLLADASaxFrameworkLoader -lGeneratedSaxParser -lMathMLSolver -lpcre"
+    SYSTEM_STUFF += collada2gltf
+    COLLADA2GLTF_CFLAGS="-I/usr/include/collada2gltf -I/usr/include/collada2gltf/JSON -I/usr/include/collada2gltf/GLTF -I/usr/include/collada2gltf/helpers -I/usr/include/collada2gltf/assetModifiers -I/usr/include/rapidjson" 
+    COLLADA2GLTF_LIBS="-lcollada2gltfConvert -lo3dgc_common_lib -lo3dgc_dec_lib -lo3dgc_enc_lib"
+  endif
+  ifeq "$(GCC_VERSION_5_OR_GREATER)" "y"
+    OPENCOLLADA_MINVER=(>= 0.1.0~20140703.ddf8f47+dfsg1-2)
+    COLLADA2GLTF_MINVER=(>= 20140924-2)
+  else
+    OPENCOLLADA_MINVER=
+    COLLADA2GLTF_MINVER=
+  endif
   ifneq "$(ENABLE_COLLADA)" "y"
 	CONFIGURE_FLAGS += --disable-collada
   else

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