[gcc-6] 201/401: * gcj: Depend on the ecj1 standalone binary.

[Ximin Luo]

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

infinity0 pushed a commit to branch pu/reproducible_builds
in repository gcc-6.

commit 61eefff2e0c983acd17e964dc869f2b8ba69bcec
Author: doko <doko at 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca>
Date:   Sun Sep 4 15:09:31 2016 +0000

      * gcj: Depend on the ecj1 standalone binary.
    
    
    git-svn-id: svn://anonscm.debian.org/gcccvs/branches/sid/gcc-6@8968 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca
---
 debian/changelog              | 6 ++++++
 debian/rules.conf             | 2 +-
 debian/rules.d/binary-java.mk | 2 +-
 debian/rules.defs             | 7 +++++++
 4 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 1a51066..75a92f4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+gcc-6 (6.2.0-4) UNRELEASED; urgency=medium
+
+  * gcj: Depend on the ecj1 standalone binary.
+
+ -- Matthias Klose <doko at debian.org>  Sun, 04 Sep 2016 16:55:59 +0200
+
 gcc-6 (6.2.0-3) unstable; urgency=medium
 
   * Update to SVN 20160901 (r239944, 6.2.1) from the gcc-6-branch.
diff --git a/debian/rules.conf b/debian/rules.conf
index 3f6cee4..170a89b 100644
--- a/debian/rules.conf
+++ b/debian/rules.conf
@@ -527,7 +527,7 @@ ifeq ($(with_ecj),yes)
 else
   ECJ_DEP = ecj, libecj-java (>= 3.5.1)
   ECJ_DEP = ecj-gcj, libecj-java-gcj (>= 3.5.1)
-  ifneq (,$(filter $(DEB_HOST_ARCH),arm armel armhf))
+  ifeq ($(with_external_ecj1),yes)
     ECJ_DEP +=, ecj1
   endif
 endif
diff --git a/debian/rules.d/binary-java.mk b/debian/rules.d/binary-java.mk
index b223b77..ed4ad53 100644
--- a/debian/rules.d/binary-java.mk
+++ b/debian/rules.d/binary-java.mk
@@ -287,7 +287,7 @@ ifneq (,$(filter $(build_type), build-native cross-build-native))
 	mv $(d_gcj)/$(PF)/$(libdir)/libgcj.spec $(d_gcj)/$(gcc_lib_dir)/
 endif
 
-ifneq (,$(filter $(DEB_HOST_ARCH), arm armel))
+ifeq ($(with_external_ecj1),yes)
 	ln -sf ../../ecj1 $(d_gcj)/$(gcc_lexec_dir)/ecj1
 endif
 ifneq ($(DEB_CROSS),yes)
diff --git a/debian/rules.defs b/debian/rules.defs
index 5853f09..1680440 100644
--- a/debian/rules.defs
+++ b/debian/rules.defs
@@ -829,6 +829,13 @@ ifeq ($(with_java),yes)
   #  with_native_ecj := yes
   #endif
 
+  ifneq (,$(filter $(DEB_TARGET_ARCH),arm armel))
+    with_external_ecj1 := yes
+  endif
+  ifeq (,$(filter $(distrelease),squeeze wheezy jessie lucid precise trusty xenial))
+    with_external_ecj1 := yes
+  endif
+
   with_java_maintainer_mode := no
 
   # used as well in debian/rules.conf to determine the build deps

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/reproducible/gcc-6.git