From 5acc84cb36d5436a0ca44fde25d7b029c7a23938 Mon Sep 17 00:00:00 2001
From: Eric Hameleers <alien@slackware.com>
Date: Mon, 30 Jul 2012 15:07:47 +0000
Subject: Fix a bug in gfortran packaging - a 32-bit library overwrote a 64-bit
 library

---
 14.0/gcc/gcc-multilib.SlackBuild    | 4 ++--
 14.1/gcc/gcc-multilib.SlackBuild    | 4 ++--
 current/gcc/gcc-multilib.SlackBuild | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/14.0/gcc/gcc-multilib.SlackBuild b/14.0/gcc/gcc-multilib.SlackBuild
index 7238b17..f6dc248 100755
--- a/14.0/gcc/gcc-multilib.SlackBuild
+++ b/14.0/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:-1alien}
+BUILD=${BUILD:-1fix1_alien}
 
 # How many jobs to run in parallel:
 NUMJOBS=" -j7 "
@@ -618,7 +618,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
+    mv $PKG1/usr/lib${LIBDIRSUFFIX}/gcc/$TARGET/$VERSION/32/libgfortran* usr/lib/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
diff --git a/14.1/gcc/gcc-multilib.SlackBuild b/14.1/gcc/gcc-multilib.SlackBuild
index 7238b17..f6dc248 100755
--- a/14.1/gcc/gcc-multilib.SlackBuild
+++ b/14.1/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:-1alien}
+BUILD=${BUILD:-1fix1_alien}
 
 # How many jobs to run in parallel:
 NUMJOBS=" -j7 "
@@ -618,7 +618,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
+    mv $PKG1/usr/lib${LIBDIRSUFFIX}/gcc/$TARGET/$VERSION/32/libgfortran* usr/lib/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
diff --git a/current/gcc/gcc-multilib.SlackBuild b/current/gcc/gcc-multilib.SlackBuild
index 7238b17..f6dc248 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:-1alien}
+BUILD=${BUILD:-1fix1_alien}
 
 # How many jobs to run in parallel:
 NUMJOBS=" -j7 "
@@ -618,7 +618,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
+    mv $PKG1/usr/lib${LIBDIRSUFFIX}/gcc/$TARGET/$VERSION/32/libgfortran* usr/lib/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
-- 
cgit v1.2.3-65-gdbad