From 7ad185bd2d8fe579a2a8f288a911298e9b022c39 Mon Sep 17 00:00:00 2001
From: Patrick J Volkerding <volkerdi@slackware.com>
Date: Wed, 23 Jan 2019 22:02:34 +0000
Subject: Wed Jan 23 22:02:34 UTC 2019

a/bash-5.0.002-x86_64-2.txz:  Rebuilt.
  Rebuilt with --libdir=/usr/lib${LIBDIRSUFFIX}. Thanks to RandomTroll.
a/btrfs-progs-4.20.1-x86_64-1.txz:  Upgraded.
a/mkinitrd-1.4.11-x86_64-9.txz:  Rebuilt.
  Automatically generate an initial ramdisk from the installer.
  Added 'geninitrd' script to generate an initial ramdisk for the kernel that
  /boot/vmlinuz-generic (and/or /boot/vmlinuz-generic-smp) points to.
ap/man-db-2.8.5-x86_64-2.txz:  Rebuilt.
  Comment out all the options in /etc/profile.d/man-db.{csh,sh} and let the
  user decide whether or not to choose anything.
d/python-pip-19.0.1-x86_64-1.txz:  Upgraded.
l/mozilla-nss-3.41.1-x86_64-1.txz:  Upgraded.
n/dhcpcd-7.1.0-x86_64-1.txz:  Upgraded.
---
 source/a/bash/bash.SlackBuild | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

(limited to 'source/a/bash')

diff --git a/source/a/bash/bash.SlackBuild b/source/a/bash/bash.SlackBuild
index b058dd81..0233e6ac 100755
--- a/source/a/bash/bash.SlackBuild
+++ b/source/a/bash/bash.SlackBuild
@@ -31,7 +31,7 @@ PKG=$TMP/package-bash
 
 PKGNAM=bash
 VERSION=${VERSION:-$(echo bash-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 
 # Automatically determine the architecture we're building on:
 MARCH=$( uname -m )
@@ -49,16 +49,22 @@ NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
 
 if [ "$ARCH" = "i486" ]; then
   SLKCFLAGS="-O2 -march=i486 -mcpu=i686"
+  LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i586" ]; then
   SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+  LIBDIRSUFFIX=""
 elif [ "$ARCH" = "s390" ]; then
   SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
 elif [ "$ARCH" = "armv7hl" ]; then
   SLKCFLAGS="-O2 -march=armv7-a -mfpu=vfpv3-d16"
+  LIBDIRSUFFIX=""
 else
   SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
 fi
 
 case "$ARCH" in
@@ -109,6 +115,7 @@ fi
 CFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
   --mandir=/usr/man \
   --infodir=/usr/info \
   --docdir=/usr/doc/bash-$VERSION \
-- 
cgit v1.2.3