[gcc-6] 215/401: * Fix gij installation on hppa. Closes: #838111.

[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 704ff3008529040aa6889159907d9c8247fd49a8
Author: doko <doko at 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca>
Date:   Thu Sep 22 08:49:16 2016 +0000

      * Fix gij installation on hppa. Closes: #838111.
    
    
    git-svn-id: svn://anonscm.debian.org/gcccvs/branches/sid/gcc-6@8984 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca
---
 debian/changelog              | 1 +
 debian/rules.d/binary-java.mk | 6 ++++++
 2 files changed, 7 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index a139c5a..75cd176 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ gcc-6 (6.2.0-5) UNRELEASED; urgency=medium
       PR target/77326 (AVR), PR target/77349 (PPC), PR middle-end/77594,
       PR sanitizer/68260, PR fortran/77516, PR target/69255 (x86),
       PR c++/77553, PR c++/77539, PR fortran/77500.
+  * Fix gij installation on hppa. Closes: #838111.
 
  -- Matthias Klose <doko at debian.org>  Thu, 22 Sep 2016 10:21:49 +0200
 
diff --git a/debian/rules.d/binary-java.mk b/debian/rules.d/binary-java.mk
index 2b65669..e300fc4 100644
--- a/debian/rules.d/binary-java.mk
+++ b/debian/rules.d/binary-java.mk
@@ -485,6 +485,12 @@ ifeq ($(DEB_HOST_ARCH),hppa)
 	mv $(d_jrehl)/$(PF)/bin/$(cmd_prefix)gij$(pkg_ver) \
 		$(d_jrehl)/$(PF)/bin/$(cmd_prefix)gij$(pkg_ver).bin
 	install -m755 debian/gij-hppa $(d_jrehl)/$(PF)/bin/$(cmd_prefix)gij$(pkg_ver)
+  ifeq ($(unprefixed_names),yes)
+	ln -sf $(cmd_prefix)gij$(pkg_ver) \
+	    $(d_gcj)/$(PF)/bin/gij$(pkg_ver)
+	ln -sf $(cmd_prefix)gij$(pkg_ver).bin \
+	    $(d_gcj)/$(PF)/bin/gij$(pkg_ver).bin
+  endif
 endif
 
 	ln -s ../libgcj.so.$(GCJ_SONAME) \

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