development/gcc5: Fix sbolint nitpicks.
Signed-off-by: B. Watson <yalhcru@gmail.com>
This commit is contained in:
parent
3e57b70657
commit
f62b40474f
|
@ -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"
|
||||
|
|
Loading…
Reference in New Issue