From 37f81333f74286adfe76ea53c2b701b0117e0776 Mon Sep 17 00:00:00 2001
From: Matteo Bernardini
Date: Sat, 30 Mar 2019 08:53:10 +0100
Subject: 20190330.1 global branch merge.

Signed-off-by: Matteo Bernardini <ponce@slackbuilds.org>
---
 development/avr-gcc/avr-gcc.SlackBuild | 48 ++++++++++++++++++++--------------
 1 file changed, 28 insertions(+), 20 deletions(-)

(limited to 'development/avr-gcc/avr-gcc.SlackBuild')

diff --git a/development/avr-gcc/avr-gcc.SlackBuild b/development/avr-gcc/avr-gcc.SlackBuild
index a91986fe8c..ba8b2d314f 100644
--- a/development/avr-gcc/avr-gcc.SlackBuild
+++ b/development/avr-gcc/avr-gcc.SlackBuild
@@ -8,13 +8,14 @@
 # This file is placed in the public domain.
 
 PRGNAM=avr-gcc
-VERSION=${VERSION:-4.9.2}
+VERSION=${VERSION:-8.2.0}
+ISLVERSION=${ISLVERSION:-0.19}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
@@ -25,8 +26,8 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -42,21 +43,25 @@ fi
 set -e
 
 rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf gcc-$VERSION avr-gcc-build-$VERSION
-tar xvf $CWD/gcc-$VERSION.tar.bz2 || exit 1
-mkdir avr-gcc-build-$VERSION
-cd avr-gcc-build-$VERSION || exit 1
-chown -R root:root .
+mkdir -p $TMP/$PRGNAM $PKG $OUTPUT
+cd $TMP/$PRGNAM
+rm -rf $TMP/$PRGNAM/*
+tar xvf $CWD/gcc-$VERSION.tar.xz
+tar xvf $CWD/isl-$ISLVERSION.tar.bz2
 find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
- -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+cd gcc-$VERSION
+ln -s ../isl-$ISLVERSION isl
+
+mkdir ../avr-gcc-build-$VERSION
+cd ../avr-gcc-build-$VERSION
+
+export CFLAGS_FOR_TARGET="$SLKCFLAGS"
+export CXXFLAGS_FOR_TARGET="$SLKCFLAGS"
 
-CFLAGS_FOR_BUILD="$SLKCFLAGS" \
-CXXFLAGS_FOR_BUILD="$SLKCFLAGS" \
 ../gcc-$VERSION/configure \
   --prefix=/usr \
   --libdir=/usr/lib${LIBDIRSUFFIX} \
@@ -71,11 +76,12 @@ CXXFLAGS_FOR_BUILD="$SLKCFLAGS" \
   --disable-linker-build-id \
   --disable-nls \
   --disable-werror \
-  --enable-__cxa_atexit \
+  --disable-__cxa_atexit \
   --enable-checking=release \
   --enable-clocale=gnu \
   --enable-cloog-backend=isl \
   --enable-gnu-unique-object \
+  --enable-gnu-indirect-function \
   --enable-gold \
   --enable-languages=c,c++ \
   --enable-ld=default \
@@ -90,22 +96,24 @@ CXXFLAGS_FOR_BUILD="$SLKCFLAGS" \
   --with-plugin-ld=ld.gold \
   --with-system-zlib \
   --with-dwarf2 \
+  --with-isl \
   --program-prefix="avr-" \
   --program-suffix="" \
   --build=$ARCH-slackware-linux
 
 make || exit 1
-make install DESTDIR=$PKG || exit 1
+make -j1 install DESTDIR=$PKG || exit 1
 
 # Remove useless stuff
 rm -rf $PKG/usr/lib${LIBDIRSUFFIX}/libiberty.a
+rm -rf $PKG/usr/lib${LIBDIRSUFFIX}/libcc1.*
 rm -rf $PKG/usr/info
 rm -rf $PKG/usr/include
 rm -rf $PKG/usr/share
 rm -rf $PKG/usr/man/man7
 rm -rf $PKG/usr/libexec/gcc/avr/$VERSION/install-tools
 
-find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
 find $PKG/usr/man -type f -exec gzip -9 {} \;
-- 
cgit v1.2.3