[gcc-6] 220/401: * Really 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 34baaf64dcaa6328fdf9ad5976938a6500e0e337
Author: doko <doko at 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca>
Date:   Fri Sep 30 16:20:07 2016 +0000

      * Really fix gij installation on hppa. Closes: #838111.
    
    
    git-svn-id: svn://anonscm.debian.org/gcccvs/branches/sid/gcc-6@8991 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca
---
 debian/changelog              | 6 ++++++
 debian/rules.d/binary-java.mk | 4 ++--
 debian/rules.defs             | 8 +++++++-
 3 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 876954e..21f0247 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+gcc-6 (6.2.0-6) UNRELEASED; urgency=medium
+
+  * Really fix gij installation on hppa. Closes: #838111.
+
+ -- Matthias Klose <doko at debian.org>  Fri, 30 Sep 2016 18:18:39 +0200
+
 gcc-6 (6.2.0-5) unstable; urgency=medium
 
   * Update to SVN 20160927 (r240553, 6.2.1) from the gcc-6-branch.
diff --git a/debian/rules.d/binary-java.mk b/debian/rules.d/binary-java.mk
index e300fc4..0acf7ea 100644
--- a/debian/rules.d/binary-java.mk
+++ b/debian/rules.d/binary-java.mk
@@ -487,9 +487,9 @@ ifeq ($(DEB_HOST_ARCH),hppa)
 	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)
+	    $(d_jrehl)/$(PF)/bin/gij$(pkg_ver)
 	ln -sf $(cmd_prefix)gij$(pkg_ver).bin \
-	    $(d_gcj)/$(PF)/bin/gij$(pkg_ver).bin
+	    $(d_jrehl)/$(PF)/bin/gij$(pkg_ver).bin
   endif
 endif
 
diff --git a/debian/rules.defs b/debian/rules.defs
index 4255568..46d1407 100644
--- a/debian/rules.defs
+++ b/debian/rules.defs
@@ -109,7 +109,6 @@ BASE_VERSION := $(shell echo $(DEB_VERSION) | sed -e 's/\([1-9]\).*-.*/\1/')
 ifneq (,$(findstring gcc-snapshot, $(PKGSOURCE)))
   single_package = yes
   trunk_build = yes
-  with_linaro_branch =
 else ifneq (,$(findstring gcc-linaro, $(PKGSOURCE)))
   single_package = yes
   trunk_build = no
@@ -406,6 +405,13 @@ ifeq ($(distribution),Ubuntu)
   endif
 endif
 
+ifneq (,$(findstring gcc-snapshot, $(PKGSOURCE)))
+  with_linaro_branch =
+  with_ibm_branch =
+else ifneq (,$(findstring gcc-linaro, $(PKGSOURCE)))
+  with_ibm_branch =
+endif
+
 # check if we're building for armel or armhf
 ifneq (,$(filter %eabihf,$(DEB_TARGET_GNU_SYSTEM)))
   float_abi := hard

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