diff options
| author | B. Watson <yalhcru@gmail.com> | 2022-03-23 00:53:38 -0400 |
|---|---|---|
| committer | Willy Sudiarto Raharjo <willysr@slackbuilds.org> | 2022-03-26 01:20:10 +0700 |
| commit | 41648713e36a04cf0b8ce532db675978ac1ad537 (patch) | |
| tree | d371d146dba4969313cd354fce63471264226f34 /audio | |
| parent | b0459f13551035b5796af6fb02f525ccb356da38 (diff) | |
| download | slackbuilds-41648713e36a04cf0b8ce532db675978ac1ad537.tar.gz | |
audio/deadbeef: Fix 32-bit build.
Signed-off-by: B. Watson <yalhcru@gmail.com>
Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
Diffstat (limited to 'audio')
| -rw-r--r-- | audio/deadbeef/deadbeef.SlackBuild | 26 |
1 files changed, 17 insertions, 9 deletions
diff --git a/audio/deadbeef/deadbeef.SlackBuild b/audio/deadbeef/deadbeef.SlackBuild index 0b072f13df..7306ab440e 100644 --- a/audio/deadbeef/deadbeef.SlackBuild +++ b/audio/deadbeef/deadbeef.SlackBuild @@ -22,6 +22,8 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# 20220323 bkw: Modified by SlackBuilds.org: fix 32-bit build. + cd $(dirname $0) ; CWD=$(pwd) PRGNAM=deadbeef @@ -32,15 +34,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 @@ -51,8 +50,8 @@ PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} -if [ "$ARCH" = "i486" ]; then - SLKCFLAGS="-O2 -march=i486 -mtune=i686" +if [ "$ARCH" = "i586" ]; then + SLKCFLAGS="-O2 -march=i586 -mtune=i686" LIBDIRSUFFIX="" elif [ "$ARCH" = "i686" ]; then SLKCFLAGS="-O2 -march=i686 -mtune=i686" @@ -76,13 +75,22 @@ 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 {} \+ export CC=${CC:-clang} export CXX=${CXX:-clang++} +# 20220323 bkw: the configure script always adds this anyway, if the +# compiler supports it. trouble is, it doesn't properly pass it to +# the subprojects it builds, specifically soundtouch, which makes the +# build fail. putting it in our flags fixes it. +# Note: if you're on an older CPU that really doesn't support SSE2, +# deadbeef will likely compile and fail to run (Illegal instruction). +# Me adding -msse2 here doesn't change that, for better or worse. +SLKCFLAGS+=" -msse2" + CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ @@ -93,7 +101,7 @@ CXXFLAGS="$SLKCFLAGS" \ --disable-gtk2 \ --build=$ARCH-slackware-linux -make +make V=1 make install DESTDIR=$PKG find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ |