New build system

1 files changed, 28 insertions, 32 deletions

diff --git a/bitcoin/build/bitcoin.SlackBuild b/bitcoin/build/bitcoin.SlackBuild
index 8f90f232..1fb3a1df 100755
--- a/bitcoin/build/bitcoin.SlackBuild
+++ b/bitcoin/build/bitcoin.SlackBuild
@@ -28,7 +28,7 @@
 # For:         bitcoin
 # Descr:       GUI and daemon for the Bitcoin crypto-currency
 # URL:         http://www.bitcoin.org
-# Build needs: qrencode
+# Build needs: protobuf,qrencode
 # Needs:       
 # Changelog:   
 # 0.8.6-1:     16/Mar/2014 by Eric Hameleers <alien@slackware.com>
@@ -55,7 +55,8 @@ TAG=${TAG:-alien}
 SRCDIR=$(cd $(dirname $0); pwd)
 
 DOCS="COPYING README.md \
-      doc/assets-attribution.txt doc/readme-qt.rst doc/release-notes.md $SRCDIR/README.1st"
+      doc/assets-attribution.md doc/build-unix.md doc/release-notes.md \
+      doc/tor.md $SRCDIR/README.1st"
 
 # Place to build (TMP) package (PKG) and output (OUTPUT) the program:
 TMP=${TMP:-/tmp/build}
@@ -159,42 +160,36 @@ echo "++"
 cd $TMP/tmp-$PRGNAM 
 echo "Extracting the source archive(s) for $PRGNAM..."
 tar -xvf ${SOURCE}
-chown -R root:root *
-chmod -R u+w,go+r-w,a+rX-st *
-cd ${PRGNAM}-${VERSION}-linux/src
+cd ${PRGNAM}-${VERSION}
+chown -R root:root .
+chmod -R u+w,go+r-w,a+rX-st .
 
 echo Building ...
 export LDFLAGS="$SLKLDFLAGS"
 export CXXFLAGS="$SLKCFLAGS"
 export CFLAGS="$SLKCFLAGS"
-# Explicitly disable the use of UPnP:
-export BTC_OPTS="USE_DBUS=1 USE_QRCODE=1 USE_SSL=1 USE_UPNP=- "
 
-# First, build the GUI client:
-qmake \
-  QMAKE_CFLAGS+="$SLKCFLAGS" \
-  QMAKE_CXXFLAGS+="$SLKCFLAGS" \
-  ${BTC_OPTS} \
-  bitcoin-qt.pro \
-  2>&1 | tee $OUTPUT/qmake-${PRGNAM}.log
+./autogen.sh
+  2>&1 | tee $OUTPUT/configure-${PRGNAM}.log
+echo "** Running ./configure next..." >> $OUTPUT/configure-${PRGNAM}.log
+./configure \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --mandir=/usr/man \
+  --docdir=/usr/doc/$PRGNAM-$VERSION \
+  --localstatedir=/var \
+  --sysconfdir=/etc \
+  --program-prefix= \
+  --program-suffix= \
+  --build=$TARGET \
+  2>&1 | tee -a $OUTPUT/configure-${PRGNAM}.log
 
 make $NUMJOBS 2>&1 | tee $OUTPUT/make-${PRGNAM}.log
+make install DESTDIR=$PKG 2>&1 | tee $OUTPUT/install-${PRGNAM}.log
 
-# Next, compile the bitcoin daemon which forms part of the core network:
-## Disable UPNP support in the bitcoin daemon:
-#sed -i -e 's/USE_UPNP:=0/USE_UPNP:=/g' src/makefile.unix
-# Static linking does not work with Slackware's boost:
-sed -i -e 's/Bstatic/Bdynamic/g' src/makefile.unix
-
-make $NUMJOBS -C src -f makefile.unix \
-  bitcoind \
-  ${BTC_OPTS} \
-  2>&1 | tee $OUTPUT/make-${PRGNAM}.log
-
-# Install the binaries:
-mkdir -p $PKG/usr/bin
-install -m 0755 bitcoin-qt $PKG/usr/bin/
-install -m 0755 src/bitcoind $PKG/usr/bin/
+# Remove the "test" binaries. Alternatively, you can explicitly disable tests
+# by adding "--enable-tests=no" to the above configure command.
+rm $PKG/usr/bin/test*
 
 # Install contribs:
 mkdir -p $PKG/usr/man/man{1,5}
@@ -206,10 +201,11 @@ mkdir -p $PKG/usr/share/{applications,pixmaps}
 install -m 0644 src/qt/res/icons/bitcoin.png $PKG/usr/share/pixmaps/
 cat <<EOT >$PKG/usr/share/applications/bitcoin-qt.desktop
 [Desktop Entry]
-Name=Bitcoin
-GenericName=Bitcoin Qt Client
+Encoding=UTF-8
+Name=Bitcoin Core
+GenericName=Bitcoin Qt Core Client
 Comment=Bitcoin client to send and receive money
-Exec=/usr/bin/bitcoin-qt
+Exec=/usr/bin/bitcoin-qt %u
 Icon=bitcoin
 StartupNotify=true
 Terminal=false