[libreoffice] 01/03: only test odk manually with ENABLE_JAVA=y

Rene Engelhard rene at moszumanska.debian.org
Sun Aug 6 07:44:59 UTC 2017


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

rene pushed a commit to branch master
in repository libreoffice.

commit 48a45bcb7b168285c1116ec96391af8b6ad1dff9
Author: Rene Engelhard <rene at rene-engelhard.de>
Date:   Sat Aug 5 17:34:26 2017 +0200

    only test odk manually with ENABLE_JAVA=y
---
 rules | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/rules b/rules
index e8282b3..7c28bfc 100755
--- a/rules
+++ b/rules
@@ -2080,10 +2080,12 @@ endif
 
 check-indep:
 ifneq (nocheck,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))
+  ifeq "$(ENABLE_JAVA)" "y"
 	# since the gb_SUPPRESS_CHECK stuff in build this isn't checked.
 	# probably should, so do it here manually.
 	$(IGNORE_MAKE_CHECK_FAILURES)cd odk && \
 		$(MAKE) check
+  endif
 endif
 
 install: $(STAMP_DIR)/install-common $(STAMP_DIR)/install-arch $(STAMP_DIR)/install-indep

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



More information about the Pkg-openoffice-commits mailing list