[gcc-6] 378/401: * Fix ecj1 symlink for gcj cross compiler packages. Addresses: #855640.

[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 0fc3353486211326feb1e0046f7acfef40692ee5
Author: doko <doko at 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca>
Date:   Tue Feb 21 09:35:41 2017 +0000

      * Fix ecj1 symlink for gcj cross compiler packages. Addresses: #855640.
    
    
    git-svn-id: svn://anonscm.debian.org/gcccvs/branches/sid/gcc-6@9304 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca
---
 debian/changelog              | 10 ++++++++--
 debian/rules.d/binary-java.mk |  7 ++-----
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 98f2134..65c2c37 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,10 @@
-gcc-6 (6.3.0-7) UNRELEASED; urgency=medium
+gcc-6 (6.3.0-8) UNRELEASED; urgency=medium
+
+  * Fix ecj1 symlink for gcj cross compiler packages. Addresses: #855640.
+
+ -- Matthias Klose <doko at debian.org>  Tue, 21 Feb 2017 10:28:40 +0100
+
+gcc-6 (6.3.0-7) unstable; urgency=medium
 
   * Update to SVN 20170218 (r245414) from the gcc-6-branch.
     - Fix PR target/78945 (ARM), PR translation/79397,
@@ -19,7 +25,7 @@ gcc-6 (6.3.0-7) UNRELEASED; urgency=medium
     Closes: #855197.
   * Bump binutils version requirement.
 
- -- Matthias Klose <doko at debian.org>  Sat, 18 Feb 2017 06:18:49 +0100
+ -- Matthias Klose <doko at debian.org>  Sat, 18 Feb 2017 10:00:36 +0100
 
 gcc-6 (6.3.0-6) unstable; urgency=medium
 
diff --git a/debian/rules.d/binary-java.mk b/debian/rules.d/binary-java.mk
index 1327d76..bb5f2bf 100644
--- a/debian/rules.d/binary-java.mk
+++ b/debian/rules.d/binary-java.mk
@@ -278,17 +278,14 @@ $(binary_stamp)-gcj: $(install_stamp)
 	rm -rf $(d_gcj)
 	dh_installdirs -p$(p_gcj)  $(dirs_gcj)
 
-ifeq ($(DEB_CROSS),yes)
-	ln -sf ../../../gcc/$(DEB_HOST_GNU_TYPE)/$(BASE_VERSION)/ecj1 \
-		$(d)/$(gcc_lib_dir)/ecj1
-endif
 	$(dh_compat2) dh_movefiles -p$(p_gcj)  $(files_gcj)
 ifneq (,$(filter $(build_type), build-native cross-build-native))
 	mv $(d_gcj)/$(PF)/$(libdir)/libgcj.spec $(d_gcj)/$(gcc_lib_dir)/
 endif
 
 ifeq ($(with_external_ecj1),yes)
-	ln -sf ../../ecj1 $(d_gcj)/$(gcc_lexec_dir)/ecj1
+	dh_link -p$(p_gcj) \
+		/$(PF)/lib/$(DEB_HOST_GNU_TYPE)/gcc/ecj1 /$(gcc_lexec_dir)/ecj1
 endif
 ifeq ($(unprefixed_names),yes)
 	ln -sf $(cmd_prefix)gcj$(pkg_ver) \

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