aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorB. Watson <yalhcru@gmail.com>2022-03-17 13:01:54 -0400
committerB. Watson <yalhcru@gmail.com>2022-03-17 13:23:08 -0400
commit138c7001b520c0f8f5c2e99bbf46071269e84e1d (patch)
treef02d8995d3fd5035e9739b02f3ffe2e1e5f5abc6
parent6c204873b0bbf7f93dae5135eb03f65aae4ce644 (diff)
audio/tta: Fix 32-bit build.
Signed-off-by: B. Watson <yalhcru@gmail.com>
-rw-r--r--audio/tta/tta.SlackBuild23
1 files changed, 13 insertions, 10 deletions
diff --git a/audio/tta/tta.SlackBuild b/audio/tta/tta.SlackBuild
index a6300e006f5b..0c91c26fd9b0 100644
--- a/audio/tta/tta.SlackBuild
+++ b/audio/tta/tta.SlackBuild
@@ -24,6 +24,10 @@
# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# 20220317 bkw: Modified by SlackBuilds.org:
+# - fix build on 32-bit (hardcoded lib64 in script).
+# - actually use SLKCFLAGS.
+
cd $(dirname $0) ; CWD=$(pwd)
PRGNAM=tta
@@ -41,9 +45,6 @@ if [ -z "$ARCH" ]; then
esac
fi
-# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
-# the name of the created package would be, and then exit. This information
-# could be useful to other scripts.
if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
exit 0
@@ -79,11 +80,12 @@ cd $PRGNAM-$VERSION
chown -R root:root .
find -L . \
\( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
- -o -perm 511 \) -exec chmod 755 {} \; -o \
+ -o -perm 511 \) -exec chmod 755 {} \+ -o \
\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+
+
+# 20220317 bkw: this configure script ignores CFLAGS from the env...
-CFLAGS="$SLKCFLAGS" \
./configure \
--prefix=/usr \
--libdir=/usr/lib${LIBDIRSUFFIX} \
@@ -93,11 +95,12 @@ CFLAGS="$SLKCFLAGS" \
--docdir=/usr/doc/$PRGNAM-$VERSION \
--build=$ARCH-slackware-linux
+# 20220317 bkw: ...do this to use our flags:
+sed -i "s,-O2,$SLKCFLAGS," Makefile
+
make
-make install DESTDIR=$PKG
-rm -fv $PKG/usr/lib64/libtta.a
-rmdir -v $PKG/usr/lib64
-strip --strip-unneeded $PKG/usr/bin/tta
+make install-strip DESTDIR=$PKG
+rm -rf $PKG/usr/lib*
mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
cp -a COPYING README $DOCS $PKG/usr/doc/$PRGNAM-$VERSION