[ecj] 107/145: Work around build failures on amd64 and s390x

[Emmanuel Bourg]

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

ebourg-guest pushed a commit to branch master
in repository ecj.

commit 0ed0c65b2256b732dffa4a139c77f0482e550402
Author: Matthias Klose <doko at ubuntu.com>
Date:   Fri Aug 5 12:28:08 2016 +0200

    Work around build failures on amd64 and s390x
---
 debian/changelog | 6 ++++++
 debian/control   | 4 ++--
 debian/rules     | 4 ++++
 3 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 29104e2..d7c59a7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+ecj (3.11.0-5) unstable; urgency=medium
+
+  * Work around build failures on amd64 and s390x.
+
+ -- Matthias Klose <doko at ubuntu.com>  Fri, 05 Aug 2016 12:28:08 +0200
+
 ecj (3.11.0-4) unstable; urgency=medium
 
   * Build using GCC 6.
diff --git a/debian/control b/debian/control
index ddfead0..af970a5 100644
--- a/debian/control
+++ b/debian/control
@@ -3,8 +3,8 @@ Section: java
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Matthias Klose <doko at debian.org>
-Build-Depends: debhelper (>= 9), gcj-6-jdk, libgcj-bc, fastjar, ant, zip, dpkg (>= 1.13.19), python, time
-Build-Depends-Indep: maven-repo-helper
+Build-Depends: debhelper (>= 9), gcj-6-jdk, libgcj-bc, fastjar, ant, zip, unzip, dpkg (>= 1.13.19), python, time
+Build-Depends-Indep: maven-repo-helper, default-jre-headless
 Build-Conflicts: ecj-bootstrap-gcj (<< 3.8.2)
 Standards-Version: 3.9.8
 Vcs-Svn: svn://anonscm.debian.org/pkg-java/trunk/ecj
diff --git a/debian/rules b/debian/rules
index bb8b337..eda397e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -27,6 +27,10 @@ with_native := yes
 with_rebuild := yes
 with_sourcebuild := yes
 
+ifneq (,$(filter $(DEB_HOST_ARCH), s390x))
+  with_sourcebuild :=
+endif
+
 ifneq (,$(filter $(DEB_HOST_ARCH), arm armel))
   with_rebuild := no
 endif

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