summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Spencer <baildon.research@googlemail.com>2015-09-18 23:23:24 +0100
committerWilly Sudiarto Raharjo <willysr@slackbuilds.org>2016-01-17 09:40:16 +0700
commitde3e3d65535db59590465bc603666cec94e808ee (patch)
treea4117644d4771af1f5a3d2c7729ec5326d8bd93c
parent898db43886f4e17192b38dd8dbfd91192d2e971d (diff)
downloadslackbuilds-de3e3d65535db59590465bc603666cec94e808ee.tar.gz
development/libbitcoin: Patched SlackBuild.
Fixes build failure on -current. Signed-off-by: David Spencer <baildon.research@googlemail.com> Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
-rw-r--r--development/libbitcoin/libbitcoin-2.0_mnemonic.cpp.patch16
-rw-r--r--development/libbitcoin/libbitcoin.SlackBuild10
2 files changed, 24 insertions, 2 deletions
diff --git a/development/libbitcoin/libbitcoin-2.0_mnemonic.cpp.patch b/development/libbitcoin/libbitcoin-2.0_mnemonic.cpp.patch
new file mode 100644
index 0000000000..359ba81d7c
--- /dev/null
+++ b/development/libbitcoin/libbitcoin-2.0_mnemonic.cpp.patch
@@ -0,0 +1,16 @@
+Description: Fix FTBFS due to unknown std::cout
+Author: Martin Pitt <martin.pitt@ubuntu.com>
+Forwarded: No, file is gone in latest upstream
+
+Index: libbitcoin-2.0/src/utility/mnemonic.cpp
+===================================================================
+--- libbitcoin-2.0.orig/src/utility/mnemonic.cpp
++++ libbitcoin-2.0/src/utility/mnemonic.cpp
+@@ -21,6 +21,7 @@
+
+ #include <algorithm>
+ #include <sstream>
++#include <iostream>
+ #include <bitcoin/utility/assert.hpp>
+
+ namespace libbitcoin {
diff --git a/development/libbitcoin/libbitcoin.SlackBuild b/development/libbitcoin/libbitcoin.SlackBuild
index f51deaf1ca..a48a495ded 100644
--- a/development/libbitcoin/libbitcoin.SlackBuild
+++ b/development/libbitcoin/libbitcoin.SlackBuild
@@ -60,21 +60,27 @@ rm -rf $PKG
mkdir -p $TMP $PKG $OUTPUT
cd $TMP
rm -rf $PRGNAM-$VERSION
-tar xjf $CWD/$PRGNAM-$VERSION.tar.bz2
+tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
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 \
\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+# Fix missing include (thanks to Debian)
+# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=791092;msg=12
+patch -p1 < $CWD/libbitcoin-2.0_mnemonic.cpp.patch
+
autoreconf -i
+
if [ -e /usr/include/leveldb/db.h ]; then
export LEVELDB_FLAG=--enable-leveldb
else
export LEVELDB_FLAG=
fi
+
CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \
./configure \