[libreoffice] 01/01: disable the tests on kfreebsd-* (see 801865)
This is an automated email from the git hooks/post-receive script.
rene pushed a commit to branch master
in repository libreoffice.
commit 4aec13300c12b67b26f7dacb4b3c1d686a32b04c
Author: Rene Engelhard <rene@debian.org>
Date: Tue May 3 00:02:00 2016 +0200
disable the tests on kfreebsd-* (see 801865)
---
changelog | 3 ++-
control | 4 ++--
rules | 36 ++++++++++++++++++++----------------
3 files changed, 24 insertions(+), 19 deletions(-)
diff --git a/changelog b/changelog
index 3a3444a..13514be 100644
--- a/changelog
+++ b/changelog
@@ -3,8 +3,9 @@ libreoffice (1:5.1.3~rc1-2) UNRELEASED; urgency=medium
* debian/rules:
- print error in control without gcj-jdk installed
- don't try to run set GCJ_JAWT_DEPENDS if GCJ_VERSION is unset
+ - disable the tests on kfreebsd-* (see #801865)
- -- Rene Engelhard <rene@debian.org> Sun, 24 Apr 2016 00:02:55 +0200
+ -- Rene Engelhard <rene@debian.org> Tue, 03 May 2016 00:01:09 +0200
libreoffice (1:5.1.3~rc1-1) unstable; urgency=medium
diff --git a/control b/control
index c0fdd77..612afca 100644
--- a/control
+++ b/control
@@ -31,13 +31,13 @@ Build-Depends: ant (>= 1.7.0) [!mips64],
gcc-5 [hppa ia64 s390 sparc],
gcj-jdk [hppa ia64 s390 sparc],
gcj-native-helper [hppa ia64 s390 sparc],
- gdb,
+ gdb [!kfreebsd-i386 !kfreebsd-amd64],
gettext,
gobject-introspection (>= 1.32.0),
gperf,
java-common (>= 0.49),
javahelper (>= 0.37~),
- junit4 (>= 4.8.2-2),
+ junit4 (>= 4.8.2-2) [!kfreebsd-i386 !kfreebsd-amd64],
kdelibs5-dev (>= 4:4.3.4),
libabw-dev (>= 0.1),
libarchive-zip-perl,
diff --git a/rules b/rules
index 847ab56..4055cc0 100755
--- a/rules
+++ b/rules
@@ -265,25 +265,29 @@ PACKAGE_LOKIT=y
ifeq "$(ENABLE_JAVA)" "y"
ifeq "$(JDK)" "default"
ifeq "$(shell LANG=C /usr/lib/jvm/default-java/bin/java -version 2>&1 | tail -n 1 | awk '{ print $$1 }')" "OpenJDK"
- RUN_MAKE_CHECK=y
- RUN_PYTESTS=y
- ifeq "$(DEB_HOST_ARCH)" "i386"
- ENABLE_JUNIT4=y
- endif
- ifeq "$(DEB_HOST_ARCH)" "amd64"
- ENABLE_JUNIT4=y
+ ifeq (,$(findstring kfreebsd,$(DEB_HOST_ARCH)))
+ RUN_MAKE_CHECK=y
+ ifeq "$(DEB_HOST_ARCH)" "i386"
+ ENABLE_JUNIT4=y
+ endif
+ ifeq "$(DEB_HOST_ARCH)" "amd64"
+ ENABLE_JUNIT4=y
+ endif
endif
+ RUN_PYTESTS=y
endif
else
ifeq "$(JDK)" "openjdk"
- RUN_MAKE_CHECK=y
- RUN_PYTESTS=y
- ifeq "$(DEB_HOST_ARCH)" "i386"
- ENABLE_JUNIT4=y
- endif
- ifeq "$(DEB_HOST_ARCH)" "amd64"
- ENABLE_JUNIT4=y
+ ifeq (,$(findstring kfreebsd,$(DEB_HOST_ARCH)))
+ RUN_MAKE_CHECK=y
+ ifeq "$(DEB_HOST_ARCH)" "i386"
+ ENABLE_JUNIT4=y
+ endif
+ ifeq "$(DEB_HOST_ARCH)" "amd64"
+ ENABLE_JUNIT4=y
+ endif
endif
+ RUN_PYTESTS=y
else
RUN_MAKE_CHECK=n
ENABLE_JUNIT4=n
@@ -926,12 +930,12 @@ ifneq (,$(filter cppunit, $(SYSTEM_STUFF)))
BUILD_DEPS += , libcppunit-dev (>= $(CPPUNIT_MINVER))
endif
ifeq "$(RUN_MAKE_CHECK)" "y"
- BUILD_DEPS += , gdb
+ BUILD_DEPS += , gdb [!kfreebsd-i386 !kfreebsd-amd64]
BUILD_DEPS += , fontconfig
BUILD_DEPS += , fonts-liberation
BUILD_DEPS += , fonts-crosextra-carlito
ifeq "$(ENABLE_JUNIT4)" "y"
- BUILD_DEPS += , junit4 $(JUNIT_MIN_VER)
+ BUILD_DEPS += , junit4 $(JUNIT_MIN_VER) [!kfreebsd-i386 !kfreebsd-amd64]
else
CONFIGURE_FLAGS += --without-junit
endif
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git
Reply to: