summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordoko <doko@6ca36cf4-e1d1-0310-8c6f-e303bb2178ca>2014-04-27 17:35:05 +0000
committerdoko <doko@6ca36cf4-e1d1-0310-8c6f-e303bb2178ca>2014-04-27 17:35:05 +0000
commit11da2cb02557239e1f353cfef62e652b045fec4c (patch)
tree59b03d91baf625380ecb53f80b45d98d84343ca1
parent0c26b5ce3179b7458c3235d2460035aba95f4e28 (diff)
downloadgcc-49-11da2cb02557239e1f353cfef62e652b045fec4c.tar.gz
* Install only versioned gcc-ar gcc-nm gcc-ranlib binaries for the hppa64
cross compiler. Addresses: #745967. git-svn-id: svn://svn.debian.org/svn/gcccvs/branches/sid/gcc-4.9@7319 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca
-rw-r--r--debian/changelog2
-rw-r--r--debian/rules26
2 files changed, 6 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog
index fa11aaf..c319357 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,8 @@ gcc-4.9 (4.9.0-2) UNRELEASED; urgency=medium
* Fix libgcc-dev dependency on gcc, when not building libgcc.
* Fix gnat for snapshot builds on ppc64el.
* Disable the libsanitizer build on sparc, still fails to build.
+ * Install only versioned gcc-ar gcc-nm gcc-ranlib binaries for the hppa64
+ cross compiler. Addresses: #745967.
-- Matthias Klose <doko@debian.org> Fri, 25 Apr 2014 11:45:58 +0200
diff --git a/debian/rules2 b/debian/rules2
index 572587a..d868aa0 100644
--- a/debian/rules2
+++ b/debian/rules2
@@ -2210,8 +2210,10 @@ $(install_hppa64_stamp): $(build_hppa64_stamp)
install
ifeq ($(versioned_packages),yes)
- mv $(d_hppa64)/$(PF)/bin/hppa64-linux-gnu-cpp \
- $(d_hppa64)/$(PF)/bin/hppa64-linux-gnu-cpp$(pkg_ver)
+ for i in cpp gcc-ar gcc-nm gcc-ranlib; do \
+ mv -f $(d_hppa64)/$(PF)/bin/hppa64-linux-gnu-$$i \
+ $(d_hppa64)/$(PF)/bin/hppa64-linux-gnu-$$i$(pkg_ver); \
+ done
endif
ifneq ($(single_package),yes)