diff options
| author | B. Watson <yalhcru@gmail.com> | 2022-03-12 12:36:49 -0500 |
|---|---|---|
| committer | B. Watson <yalhcru@gmail.com> | 2022-03-12 12:36:49 -0500 |
| commit | f62b40474f8862aa527bce93750ad49e7befd3ad (patch) | |
| tree | 045261b4a4e0527be9fb10ee308d24ffc0d49d83 /development | |
| parent | 3e57b70657a0e8831953842a7596702254155e57 (diff) | |
development/gcc5: Fix sbolint nitpicks.
Signed-off-by: B. Watson <yalhcru@gmail.com>
Diffstat (limited to 'development')
| -rw-r--r-- | development/gcc5/gcc5.SlackBuild | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/development/gcc5/gcc5.SlackBuild b/development/gcc5/gcc5.SlackBuild index 6aa368d36c1cf..0e49e8aee389c 100644 --- a/development/gcc5/gcc5.SlackBuild +++ b/development/gcc5/gcc5.SlackBuild @@ -62,12 +62,10 @@ BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} -# Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$(uname -m)" in i?86) ARCH=i586 ;; arm*) readelf /usr/bin/file -A | egrep -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7hl ;; - # Unless $ARCH is already set, use uname -m for all other archs: *) ARCH=$(uname -m) ;; esac export ARCH @@ -583,10 +581,11 @@ cat $CWD/libgcj-5.pc \ # Remove localizations overlapping with Slackware's gcc rm -rf $PKG/usr/share/locale -( cd $PKG - if [ ${MULTILIB} = "YES" ]; then - /sbin/makepkg -l y -c n $OUTPUT/${PRGNAM}-${VERSION}_multilib-$ARCH-$BUILD$TAG.$PKGTYPE - else - /sbin/makepkg -l y -c n $OUTPUT/${PRGNAM}-${VERSION}-$ARCH-$BUILD$TAG.$PKGTYPE - fi -) +if [ ${MULTILIB} = "YES" ]; then + PKGVER="${VERSION}_multilib" +else + PKGVER="${VERSION}" +fi + +cd $PKG +/sbin/makepkg -l y -c n "$OUTPUT/${PRGNAM}-${PKGVER}-$ARCH-$BUILD$TAG.$PKGTYPE" |