diff options
| -rw-r--r-- | debian/changelog | 3 | ||||
| -rw-r--r-- | debian/rules.d/binary-hppa64.mk | 4 | ||||
| -rw-r--r-- | debian/rules2 | 6 |
3 files changed, 9 insertions, 4 deletions
diff --git a/debian/changelog b/debian/changelog index 53eb134..09cf8a7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,9 @@ gcc-4.8 (4.8.2-22) UNRELEASED; urgency=medium * 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. Closes: #745967. + * Fix the as and ld symlinks for the hppa64 cross compiler. -- Matthias Klose <doko@debian.org> Sun, 27 Apr 2014 12:43:30 +0200 diff --git a/debian/rules.d/binary-hppa64.mk b/debian/rules.d/binary-hppa64.mk index b7be9bc..62864cb 100644 --- a/debian/rules.d/binary-hppa64.mk +++ b/debian/rules.d/binary-hppa64.mk @@ -13,9 +13,9 @@ $(binary_stamp)-hppa64: $(install_hppa64_stamp) : # provide as and ld links dh_link -p $(p_hppa64) \ /usr/bin/hppa64-linux-gnu-as \ - /$(hppa64libexecdir)/gcc/hppa64-linux-gnu/$(GCC_VERSION)/as \ + /$(hppa64libexecdir)/gcc/hppa64-linux-gnu/$(versiondir)/as \ /usr/bin/hppa64-linux-gnu-ld \ - /$(hppa64libexecdir)/gcc/hppa64-linux-gnu/$(GCC_VERSION)/ld + /$(hppa64libexecdir)/gcc/hppa64-linux-gnu/$(versiondir)/ld debian/dh_doclink -p$(p_hppa64) $(p_xbase) debian/dh_rmemptydirs -p$(p_hppa64) diff --git a/debian/rules2 b/debian/rules2 index d588b34..0befd10 100644 --- a/debian/rules2 +++ b/debian/rules2 @@ -2189,8 +2189,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) |