summaryrefslogtreecommitdiff
path: root/libraries/barry/barry.SlackBuild
diff options
context:
space:
mode:
authorHeinz Wiesinger <pprkut@slackbuilds.org>2016-02-06 22:23:25 +0100
committerWilly Sudiarto Raharjo <willysr@slackbuilds.org>2016-02-07 15:06:56 +0700
commit2de8614619fff4b70366a455899e3136f0b38bef (patch)
tree7284e851ac1d3c64757d922a8a9dad0f67e1d061 /libraries/barry/barry.SlackBuild
parentccea84b9da65c4289468e5d2bc6da0e2729d0cc7 (diff)
downloadslackbuilds-2de8614619fff4b70366a455899e3136f0b38bef.tar.gz
libraries/barry: Fix build on 14.2.
Signed-off-by: Heinz Wiesinger <pprkut@slackbuilds.org>
Diffstat (limited to 'libraries/barry/barry.SlackBuild')
-rw-r--r--libraries/barry/barry.SlackBuild24
1 files changed, 9 insertions, 15 deletions
diff --git a/libraries/barry/barry.SlackBuild b/libraries/barry/barry.SlackBuild
index 589c174854..7948654cda 100644
--- a/libraries/barry/barry.SlackBuild
+++ b/libraries/barry/barry.SlackBuild
@@ -7,16 +7,13 @@
## http://sourceforge.net/projects/barry/
##
## Written by "Vincent Batts <vbatts@batts.mine.nu>"
-##
-## opensync consideration added thanks
-## to "Heinz Wiesinger <HMWiesinger@gmx.at>"
# Modified by Robby Workman <rworkman@slackbuilds.org>
# Modified by Mario Preksavec <mario@slackware.hr>
PRGNAM=barry
VERSION=${VERSION:-0.18.3}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
TAG=${TAG:-_SBo}
if [ -z "$ARCH" ]; then
@@ -37,14 +34,6 @@ OUTPUT=${OUTPUT:-/tmp}
# BARRY_GROUP=barry ./barry.SlackBuild
BARRY_GROUP=${BARRY_GROUP:-plugdev}
-# Enable opensync-plugin?
-OPENSYNC=${OPENSYNC:-no}
-
-case "$OPENSYNC" in
- no) opensync_opt="dis" ;;
- *) opensync_opt="en" ;;
-esac
-
if [ "$ARCH" = "i486" ]; then
SLKCFLAGS="-O2 -march=i486 -mtune=i686"
LIBDIRSUFFIX=""
@@ -77,8 +66,14 @@ find -L . \
\( -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" \
+# Debian fixes
+patch -p1 -i $CWD/fix-sizeof-use.patch
+
+# Fix C++11 compatibilty (taken from Arch)
+patch -p1 -i $CWD/c++11.patch
+
+CFLAGS="$SLKCFLAGS -std=c++11" \
+CXXFLAGS="$SLKCFLAGS -std=c++11" \
./configure \
--prefix=/usr \
--libdir=/usr/lib${LIBDIRSUFFIX} \
@@ -86,7 +81,6 @@ CXXFLAGS="$SLKCFLAGS" \
--disable-static \
--enable-boost \
--enable-gui \
- --${opensync_opt}able-opensync-plugin \
--build=$ARCH-slackware-linux
make