This script finally built all compilers. I had to remove the 'enable-java-awt=gtk' or java and gnat would fail

1 files changed, 22 insertions, 10 deletions

diff --git a/current/gcc/gcc-multilib.SlackBuild b/current/gcc/gcc-multilib.SlackBuild
index 9154baf..089c305 100755
--- a/current/gcc/gcc-multilib.SlackBuild
+++ b/current/gcc/gcc-multilib.SlackBuild
@@ -49,10 +49,10 @@ VERSION=${VERSION:-$(echo $PKGNAM-*.tar.xz | rev | cut -f 3- -d . | cut -f 1 -d
 BUILD=${BUILD:-1alien}
 
 # How many jobs to run in parallel:
-NUMJOBS=" -j 7 "
+NUMJOBS=" -j7 "
 
 # What do we want to build
-LANGS=${LANGS:-'c,c++,ada,fortran,go,java,lto,objc'}
+LANGS=${LANGS:-'ada,c,c++,fortran,go,java,lto,objc'}
 
 echo "Building these compilers: $LANGS"; sleep 5
 
@@ -70,39 +70,47 @@ fi
 
 if [ "$ARCH" = "i386" ]; then
   SLKCFLAGS="-O2 -march=i386 -mcpu=i686"
+  SLKLDFLAGS=""
   LIBDIRSUFFIX=""
   LIB_ARCH=i386
 elif [ "$ARCH" = "i486" ]; then
   SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  SLKLDFLAGS=""
   LIBDIRSUFFIX=""
   LIB_ARCH=i386
 elif [ "$ARCH" = "i586" ]; then
   SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+  SLKLDFLAGS=""
   LIBDIRSUFFIX=""
   LIB_ARCH=i386
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686"
+  SLKLDFLAGS=""
   LIBDIRSUFFIX=""
   LIB_ARCH=i386
 elif [ "$ARCH" = "s390" ]; then
   SLKCFLAGS="-O2"
+  SLKLDFLAGS=""
   LIBDIRSUFFIX=""
   LIB_ARCH=s390
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
+  SLKLDFLAGS="-L/usr/lib64"
   LIBDIRSUFFIX="64"
   LIB_ARCH=amd64
 elif [ "$ARCH" = "armv7hl" ]; then
   SLKCFLAGS="-O3 -march=armv7-a -mfpu=vfpv3-d16"
+  SLKLDFLAGS=""
   LIBDIRSUFFIX=""
   LIB_ARCH=armv7hl
 else
   SLKCFLAGS="-O2"
+  SLKLDFLAGS=""
   LIBDIRSUFFIX=""
   LIB_ARCH=$ARCH
 fi
 
-case "ARCH" in
+case "$ARCH" in
     arm*) TARGET=$ARCH-slackware-linux-gnueabi ;;
     *)    TARGET=$ARCH-slackware-linux ;;
 esac
@@ -231,13 +239,13 @@ ANTLJAR=$(echo $CWD/antlr-*.jar | tail -1)
     mkdir -p $PKG8/usr/doc/gcc-${VERSION}/gcc/go
     ( cd go
       if [ -r ChangeLog ]; then
-        cat ChangeLog | head -n 1000 > $PKG6/usr/doc/gcc-${VERSION}/gcc/go/ChangeLog
-        touch -r ChangeLog $PKG6/usr/doc/gcc-${VERSION}/gcc/go/ChangeLog
+        cat ChangeLog | head -n 1000 > $PKG8/usr/doc/gcc-${VERSION}/gcc/go/ChangeLog
+        touch -r ChangeLog $PKG8/usr/doc/gcc-${VERSION}/gcc/go/ChangeLog
       fi
       cp -a \
         README* THREADS* \
         gofrontend/{LICENSE,PATENTS,README} \
-      $PKG6/usr/doc/gcc-${VERSION}/gcc/go
+      $PKG8/usr/doc/gcc-${VERSION}/gcc/go
     )
 
   ) || exit 1
@@ -340,6 +348,7 @@ ANTLJAR=$(echo $CWD/antlr-*.jar | tail -1)
   for patch in $CWD/fastjar-patches/*.gz ; do
     zcat $patch | patch -p1 --verbose || exit 1
   done
+  LDFLAGS="$SLKLDFLAGS" \
   CFLAGS="$SLKCFLAGS" \
   CXXFLAGS="$SLKCFLAGS" \
   ./configure \
@@ -411,8 +420,9 @@ ANTLJAR=$(echo $CWD/antlr-*.jar | tail -1)
      # First run: use
      # LANGS="all" to just build c,c++,fortran,java,objc
      # Second run: use
-     # LANGS="c,c++,ada,fortran,java,objc"
+     # LANGS="ada,c,c++,fortran,go,java,objc"
 
+  LDFLAGS="$SLKLDFLAGS" \
   CFLAGS="$SLKCFLAGS" \
   CXXFLAGS="$SLKCFLAGS" \
   ../gcc-$VERSION/configure \
@@ -440,12 +450,12 @@ ANTLJAR=$(echo $CWD/antlr-*.jar | tail -1)
      --with-jvm-jar-dir=/usr/lib$LIBDIRSUFFIX/jvm/jvm-exports \
      --with-arch-directory=$LIB_ARCH \
      --with-antlr-jar=$ANTLJAR \
-     --enable-java-awt=gtk \
-     --disable-gtktest \
      $GCC_ARCHOPTS \
      --target=${TARGET} \
      --build=${TARGET} \
      --host=${TARGET} || exit 1
+     #--enable-java-awt=gtk \
+     #--disable-gtktest \
 
   # Start the build:
 
@@ -458,10 +468,11 @@ ANTLJAR=$(echo $CWD/antlr-*.jar | tail -1)
   fi
 
   ( cd gcc
-    make $NUMJOBS gnatlib GNATLIBCFLAGS="$SLKCFLAGS"
+    make $NUMJOBS gnatlib GNATLIBCFLAGS="$SLKCFLAGS" GNATLIBLDFLAGS="$SLKLDFLAGS"
     # This wants a shared -ladd2line?
     #make gnatlib-shared
     
+    LDFLAGS="$SLKLDFLAGS" \
     CFLAGS="$SLKCFLAGS" \
     CXXFLAGS="$SLKCFLAGS" \
     make $NUMJOBS gnattools
@@ -599,6 +610,7 @@ rm -f $PKG1/usr/lib/libiberty.a # catch-all
     mv $PKG1/usr/lib/libgfortran* usr/lib
     mkdir -p usr/lib/gcc/$TARGET/$VERSION
     mv $PKG1/usr/lib/gcc/$TARGET/$VERSION/finclude usr/lib/gcc/$TARGET/$VERSION
+    mv $PKG1/usr/lib${LIBDIRSUFFIX}/gcc/$TARGET/$VERSION/32/libgfortran* usr/lib${LIBDIRSUFFIX}/gcc/$TARGET/$VERSION
   fi
   mkdir -p usr/libexec/gcc/$TARGET/$VERSION
   mv $PKG1/usr/libexec/gcc/$TARGET/$VERSION/f951 usr/libexec/gcc/$TARGET/$VERSION/f951