From 2860e1eb565d28016cd0bfdc6e71fb513762f818 Mon Sep 17 00:00:00 2001 From: doko Date: Sun, 27 Apr 2014 18:13:46 +0000 Subject: * Install only versioned gcc-ar gcc-nm gcc-ranlib binaries for the hppa64 cross compiler. Install hppa64 alternatives. Addresses: #745967. git-svn-id: svn://svn.debian.org/svn/gcccvs/branches/sid/gcc-4.9@7324 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca --- debian/changelog | 2 +- debian/gcc-BV-hppa64.postinst | 10 ++++++---- debian/gcc-BV-hppa64.prerm | 6 ++++-- 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/debian/changelog b/debian/changelog index 7bebd2d..c1b946f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,7 +7,7 @@ gcc-4.9 (4.9.0-2) UNRELEASED; urgency=medium * 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. + cross compiler. Install hppa64 alternatives. Addresses: #745967. * Fix the as and ld symlinks for the hppa64 cross compiler. -- Matthias Klose Fri, 25 Apr 2014 11:45:58 +0200 diff --git a/debian/gcc-BV-hppa64.postinst b/debian/gcc-BV-hppa64.postinst index ed5d095..a70af39 100644 --- a/debian/gcc-BV-hppa64.postinst +++ b/debian/gcc-BV-hppa64.postinst @@ -2,11 +2,13 @@ prio=$(echo @BV@ | sed 's/\.//g') -update-alternatives --quiet \ - --install /usr/bin/hppa64-linux-gnu-gcc \ - hppa64-linux-gnu-gcc \ - /usr/bin/hppa64-linux-gnu-gcc-@BV@ \ +for i in cpp gcc gcc-ar gcc-nm gcc-ranlib; do + update-alternatives --quiet \ + --install /usr/bin/hppa64-linux-gnu-$i \ + hppa64-linux-gnu-$i \ + /usr/bin/hppa64-linux-gnu-$i-@BV@ \ $prio +done #DEBHELPER# diff --git a/debian/gcc-BV-hppa64.prerm b/debian/gcc-BV-hppa64.prerm index 88aa45b..d4ca7a4 100644 --- a/debian/gcc-BV-hppa64.prerm +++ b/debian/gcc-BV-hppa64.prerm @@ -1,8 +1,10 @@ #! /bin/sh -e if [ "$1" != "upgrade" ]; then - update-alternatives --quiet \ - --remove hppa64-linux-gcc /usr/bin/hppa64-linux-gnu-gcc-@BV@ + for i in cpp gcc gcc-ar gcc-nm gcc-ranlib; do + update-alternatives --quiet \ + --remove hppa64-linux-gcc /usr/bin/hppa64-linux-gnu-gcc-@BV@ + done fi #DEBHELPER# -- cgit v1.2.3