From e6ea9fb8bdd85fd2c1e63cfd13de6ccb77c6e03d Mon Sep 17 00:00:00 2001
From: Eric Hameleers <alien@slackware.com>
Date: Fri, 21 Dec 2012 22:44:38 +0000
Subject: Updated for gcc-4.7.2

---
 current/gcc/gcc-multilib.SlackBuild | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

(limited to 'current')

diff --git a/current/gcc/gcc-multilib.SlackBuild b/current/gcc/gcc-multilib.SlackBuild
index f6dc248..2f8a715 100755
--- a/current/gcc/gcc-multilib.SlackBuild
+++ b/current/gcc/gcc-multilib.SlackBuild
@@ -46,7 +46,7 @@
 
 PKGNAM=gcc
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.xz | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-1fix1_alien}
+BUILD=${BUILD:-1_alien}
 
 # How many jobs to run in parallel:
 NUMJOBS=" -j7 "
@@ -160,11 +160,6 @@ cp $CWD/ecj-4.5.jar gcc-$VERSION/ecj.jar
 #https://oss.sonatype.org/content/repositories/releases/org/antlr/antlr-runtime/
 ANTLJAR=$(echo $CWD/antlr-*.jar | tail -1)
 
-# Upstream -fPIC fix for gnat build:
-cd gcc-$VERSION
-  zcat $CWD/gcc-4.7.1.adalib.pic.diff.gz | patch -p1 --verbose || exit 1
-cd ..
-
 # install docs
 ( cd gcc-$VERSION
   # Smite the fixincludes:
@@ -666,6 +661,7 @@ mv $PKG1/usr/bin/gnative2ascii $PKG5/usr/bin
   mv $PKG1/usr/bin/gij usr/bin
   mv $PKG1/usr/bin/gjar usr/bin
   mv $PKG1/usr/bin/gjarsigner usr/bin
+  mv $PKG1/usr/bin/gjdoc usr/bin
   mv $PKG1/usr/bin/gkeytool usr/bin
   mv $PKG1/usr/bin/grepjar usr/bin
   mv $PKG1/usr/bin/grmid usr/bin
@@ -805,7 +801,7 @@ mv $PKG1/usr/bin/gnative2ascii $PKG5/usr/bin
   mv $PKG1/usr/info/gccgo.info.gz usr/info
   mkdir -p usr/lib${LIBDIRSUFFIX}
   mv $PKG1/usr/lib${LIBDIRSUFFIX}/go usr/lib${LIBDIRSUFFIX}
-  mv $PKG1/usr/lib${LIBDIRSUFFIX}/{libgo.la,libgo.so.0.*,libgobegin.a} usr/lib${LIBDIRSUFFIX} || exit 1
+  mv $PKG1/usr/lib${LIBDIRSUFFIX}/{libgo.la,libgo.so*,libgobegin.a} usr/lib${LIBDIRSUFFIX} || exit 1
   # Ordinarily Slackware doesn't package static libraries, but in this case
   # it is useful for deploying compiled binaries on machines that do not yet
   # have libgo.so.0.0.0.
@@ -813,7 +809,7 @@ mv $PKG1/usr/bin/gnative2ascii $PKG5/usr/bin
   if [ "$ARCH" = "x86_64" ]; then
     mkdir -p usr/lib
     mv $PKG1/usr/lib/go usr/lib
-    mv $PKG1/usr/lib/{libgo.la,libgo.so.0.*,libgobegin.a} usr/lib || exit 1
+    mv $PKG1/usr/lib/{libgo.la,libgo.so*,libgobegin.a} usr/lib || exit 1
     mv $PKG1/usr/lib/libgo.a usr/lib
   fi
   mkdir -p usr/man/man1
-- 
cgit v1.2.3