diff options
| author | doko <doko@6ca36cf4-e1d1-0310-8c6f-e303bb2178ca> | 2014-04-27 18:12:39 +0000 |
|---|---|---|
| committer | doko <doko@6ca36cf4-e1d1-0310-8c6f-e303bb2178ca> | 2014-04-27 18:12:39 +0000 |
| commit | 4c36e10ab7200a98aafb0bf69b65a87e0a0dd975 (patch) | |
| tree | 3787734cfe18e6bd6ff61fefe7430bd95f44e5be | |
| parent | d616e039d9111c7cd7c9a1872893ddf74f52bd9e (diff) | |
| download | gcc-48-4c36e10ab7200a98aafb0bf69b65a87e0a0dd975.tar.gz | |
* Install only versioned gcc-ar gcc-nm gcc-ranlib binaries for the hppa64
cross compiler, update hppa64 alternatives. Closes: #745967.
git-svn-id: svn://svn.debian.org/svn/gcccvs/branches/sid/gcc-4.8@7323 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca
| -rw-r--r-- | debian/changelog | 2 | ||||
| -rw-r--r-- | debian/gcc-BV-hppa64.postinst | 10 | ||||
| -rw-r--r-- | debian/gcc-BV-hppa64.prerm | 6 |
3 files changed, 11 insertions, 7 deletions
diff --git a/debian/changelog b/debian/changelog index 09cf8a7..6a328af 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,7 +2,7 @@ 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. + cross compiler, update hppa64 alternatives. 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/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# |