diff options
| author | B. Watson <yalhcru@gmail.com> | 2022-03-23 04:17:19 -0400 |
|---|---|---|
| committer | Willy Sudiarto Raharjo <willysr@slackbuilds.org> | 2022-03-26 01:20:11 +0700 |
| commit | 2485399468e22b35a492c99e8147a974306be0e8 (patch) | |
| tree | 45834e5a3d29367ca593e21927f9d82c2a540f3f | |
| parent | d89ddd0975c6d350c7c3756aa1c8677bef614432 (diff) | |
audio/helm: Fix 32-bit build.
Signed-off-by: B. Watson <yalhcru@gmail.com>
Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
| -rw-r--r-- | audio/helm/helm.SlackBuild | 28 |
1 files changed, 16 insertions, 12 deletions
diff --git a/audio/helm/helm.SlackBuild b/audio/helm/helm.SlackBuild index 4d17d48a361f5..6f77f709ababc 100644 --- a/audio/helm/helm.SlackBuild +++ b/audio/helm/helm.SlackBuild @@ -4,6 +4,8 @@ # Written by Zbigniew Baniewski, <Zbigniew [dot] Baniewski [at] gmail [dot] com> +# 20220323 bkw: Modified by SlackBuilds.org: fix 32-bit build. + cd $(dirname $0) ; CWD=$(pwd) PRGNAM=helm @@ -14,15 +16,12 @@ PKGTYPE=${PKGTYPE:-tgz} if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) ARCH=i486 ;; + i?86) ARCH=i586 ;; arm*) ARCH=arm ;; *) ARCH=$( uname -m ) ;; 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 @@ -32,8 +31,12 @@ TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} -if [ "$ARCH" = "i486" ]; then - SLKCFLAGS="-O2 -march=i486 -mtune=i686" +# 20220323 bkw: This is a lie: nothing actually uses SLKCFLAGS +# or LIBDIRSUFFIX, after they get set here. Leaving in case the +# maintainer wants to apply the flags (if not, please delete this +# whole stanza). +if [ "$ARCH" = "i586" ]; then + SLKCFLAGS="-O2 -march=i586 -mtune=i686" LIBDIRSUFFIX="" elif [ "$ARCH" = "i686" ]; then SLKCFLAGS="-O2 -march=i686 -mtune=i686" @@ -57,19 +60,20 @@ 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 {} \; - -# CFLAGS="$SLKCFLAGS" \ -# CXXFLAGS="$SLKCFLAGS" \ -# ./configure + -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+ patch -p1 < $CWD/helm-0.9.0-gcc91.patch # No need for /usr/doc/helm cat $CWD/0001-doc-fix.patch | patch -p1 || exit 1 +# 20220323 bkw: 32-bit build needs this. +[ "$ARCH" != "x86_64" ] && \ + sed -i 's,__sigemptyset,sigemptyset,' \ + JUCE/modules/juce_audio_formats/codecs/flac/libFLAC/cpu.c + make make install DESTDIR=$PKG |