summaryrefslogtreecommitdiffstats
path: root/libraries/libmusicbrainz/libmusicbrainz.SlackBuild
diff options
context:
space:
mode:
Diffstat (limited to 'libraries/libmusicbrainz/libmusicbrainz.SlackBuild')
-rw-r--r--libraries/libmusicbrainz/libmusicbrainz.SlackBuild12
1 files changed, 7 insertions, 5 deletions
diff --git a/libraries/libmusicbrainz/libmusicbrainz.SlackBuild b/libraries/libmusicbrainz/libmusicbrainz.SlackBuild
index 6d2ce1125b..d41559af86 100644
--- a/libraries/libmusicbrainz/libmusicbrainz.SlackBuild
+++ b/libraries/libmusicbrainz/libmusicbrainz.SlackBuild
@@ -6,13 +6,13 @@ cd $(dirname $0) ; CWD=$(pwd)
PRGNAM=libmusicbrainz
VERSION=${VERSION:-2.1.5}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
TAG=${TAG:-_SBo}
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
@@ -30,8 +30,8 @@ TMP=${TMP:-/tmp/SBo}
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"
@@ -62,7 +62,7 @@ find -L . \
patch -p1 < $CWD/libmusicbrainz-2.1.5-include_stringh.patch
CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS -Wno-narrowing" \
+CXXFLAGS="$SLKCFLAGS -std=gnu++14 -Wno-narrowing" \
./configure \
--prefix=/usr \
--libdir=/usr/lib${LIBDIRSUFFIX} \
@@ -83,6 +83,8 @@ cp -a \
$PKG/usr/doc/$PRGNAM-$VERSION
cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+rm -f $PKG/usr/lib*/*.la
+
mkdir -p $PKG/install
cat $CWD/slack-desc > $PKG/install/slack-desc