system/efitools: Fixed build with gcc-5.3.0.

Signed-off-by: David Spencer <baildon.research@googlemail.com>
Signed-off-by: Robby Workman <rworkman@slackbuilds.org>
This commit is contained in:
David Spencer 2015-12-29 21:42:10 +00:00 committed by Willy Sudiarto Raharjo
parent e8b02597b1
commit 6cd5febaf7

View file

@ -45,14 +45,21 @@ OUTPUT=${OUTPUT:-/tmp}
# It's not safe to specify build flags since some EFI programs are built. # It's not safe to specify build flags since some EFI programs are built.
if [ "$ARCH" = "i486" ]; then if [ "$ARCH" = "i486" ]; then
SLKCFLAGS="-O2 -march=i486 -mtune=i686"
LIBDIRSUFFIX="" LIBDIRSUFFIX=""
EFI_ARCH=ia32 EFI_ARCH=ia32
elif [ "$ARCH" = "i686" ]; then elif [ "$ARCH" = "i686" ]; then
SLKCFLAGS="-O2 -march=i686 -mtune=i686"
LIBDIRSUFFIX="" LIBDIRSUFFIX=""
EFI_ARCH=ia32 EFI_ARCH=ia32
elif [ "$ARCH" = "x86_64" ]; then elif [ "$ARCH" = "x86_64" ]; then
SLKCFLAGS="-O2 -fPIC"
LIBDIRSUFFIX="64" LIBDIRSUFFIX="64"
EFI_ARCH=x86_64 EFI_ARCH=x86_64
else
SLKCFLAGS="-O2"
LIBDIRSUFFIX=""
EFI_ARCH="$ARCH"
fi fi
set -e set -e
@ -84,7 +91,13 @@ find -L . \
\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
make CRTPATH=/usr/lib${LIBDIRSUFFIX}/gnuefi MYGUID=${MYGUID} ARCH=$EFI_ARCH unset ARCH
make \
CRTPATH=/usr/lib${LIBDIRSUFFIX}/gnuefi \
MYGUID=${MYGUID} \
ARCH=$EFI_ARCH \
CFLAGS="-std=gnu89 $SLKCFLAGS"
make install DESTDIR=$PKG MANDIR=$PKG/usr/man/man1 ARCH=$EFI_ARCH make install DESTDIR=$PKG MANDIR=$PKG/usr/man/man1 ARCH=$EFI_ARCH
# Delete the private keys in $TMP. Especially important if the user doesn't # Delete the private keys in $TMP. Especially important if the user doesn't