From b23616eba7a39e2f3541735656762e7a047f5e15 Mon Sep 17 00:00:00 2001
From: "B. Watson" <urchlay@slackware.uk>
Date: Sat, 20 May 2023 05:27:06 -0400
Subject: development/fpc: ARCH=i586 on x86.

Signed-off-by: B. Watson <urchlay@slackware.uk>

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
---
 development/fpc/fpc.SlackBuild | 40 +++++++++++++++++++++++-----------------
 1 file changed, 23 insertions(+), 17 deletions(-)

diff --git a/development/fpc/fpc.SlackBuild b/development/fpc/fpc.SlackBuild
index 8d76064d0f..218465203e 100644
--- a/development/fpc/fpc.SlackBuild
+++ b/development/fpc/fpc.SlackBuild
@@ -23,6 +23,11 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# 20230520 bkw: ARCH is now i586, use separate SRCARCH for the i386
+# in the source filenames. I severely doubt this would run on a 386
+# anyway. i586 is the minimum *Slackware supported* ARCH this will run
+# on. Not bumping BUILD because the package contents don't change.
+
 # 20220415 bkw: BUILD=2
 # - remove *.rsj files from /usr/bin.
 
@@ -51,20 +56,12 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
-  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
-  exit 0
-fi
-
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
 case "$ARCH" in
-  i?86)   ARCH="i386"
+  i?86)   ARCH="i586"
+          SRCARCH="i386"
           LIBDIRSUFFIX=""
           ;;
-  x86_64) ARCH="x86_64"
+  x86_64) SRCARCH="x86_64"
           LIBDIRSUFFIX="64"
           ;;
   *)      printf "$ARCH is not supported...\n"
@@ -72,6 +69,15 @@ case "$ARCH" in
           ;;
 esac
 
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
 set -e
 
 rm -rf $PKG
@@ -80,7 +86,7 @@ cd $TMP
 rm -rf $PRGNAM-$BINVER ${PRGNAM}build-$VERSION
 mkdir $PRGNAM-$BINVER ${PRGNAM}build-$VERSION
 cd $TMP/$PRGNAM-$BINVER
-tar xvf $CWD/$PRGNAM-$BINVER.$ARCH-linux.tar --strip-components=1
+tar xvf $CWD/$PRGNAM-$BINVER.$SRCARCH-linux.tar --strip-components=1
 cd $TMP/${PRGNAM}build-$VERSION
 tar xvf $CWD/${PRGNAM}build-$VERSION.tar.gz
 
@@ -89,14 +95,14 @@ tar xvf $CWD/${PRGNAM}build-$VERSION.tar.gz
 (
   mkdir -p $TMP/$PRGNAM-$BINVER/binary
   cd $TMP/$PRGNAM-$BINVER/binary
-  tar xvf $TMP/$PRGNAM-$BINVER/binary.$ARCH-linux.tar
+  tar xvf $TMP/$PRGNAM-$BINVER/binary.$SRCARCH-linux.tar
 
   cd  $TMP/$PRGNAM-$BINVER
-  tar xvf $TMP/$PRGNAM-$BINVER/binary/base.$ARCH-linux.tar.gz
-  tar xvf $TMP/$PRGNAM-$BINVER/binary/utils.$ARCH-linux.tar.gz
+  tar xvf $TMP/$PRGNAM-$BINVER/binary/base.$SRCARCH-linux.tar.gz
+  tar xvf $TMP/$PRGNAM-$BINVER/binary/utils.$SRCARCH-linux.tar.gz
 
   cd $TMP/$PRGNAM-$BINVER/bin
-  if [ "$ARCH" = "x86_64" ]; then
+  if [ "$SRCARCH" = "x86_64" ]; then
     ln -s ../lib/fpc/$BINVER/ppcx64
   else
     ln -s ../lib/fpc/$BINVER/ppc386
@@ -128,7 +134,7 @@ make -j1 NOGDB=1 PREFIX=$PKG/usr install
 [ "$LIBDIRSUFFIX" = "64" ] && mv $PKG/usr/lib $PKG/usr/lib${LIBDIRSUFFIX}
 
 cd $PKG/usr/bin
-if [ "$ARCH" = "x86_64" ]; then
+if [ "$SRCARCH" = "x86_64" ]; then
   ln -s ../lib$LIBDIRSUFFIX/fpc/$VERSION/ppcx64
 else
   ln -s ../lib$LIBDIRSUFFIX/fpc/$VERSION/ppc386
-- 
cgit v1.2.3-65-gdbad