Skip to content
Permalink
Browse files

Merge ppa_updates-0.16

  • Loading branch information...
luke-jr committed Jul 21, 2018
2 parents 08f6cce + 94f46ba commit 7810c2d1d3d8787cb3d7e52a8e79ed5a32918782
Showing with 13 additions and 0 deletions.
  1. +1 −0 contrib/debian/bitcoin-qt.desktop
  2. +1 −0 contrib/debian/control
  3. +11 −0 contrib/debian/rules
@@ -1,4 +1,5 @@
[Desktop Entry]
Encoding=UTF-8
Version=1.0
Name=Bitcoin Core
Comment=Connect to the Bitcoin P2P Network
@@ -20,6 +20,7 @@ Build-Depends: debhelper,
libboost-chrono1.48-dev | libboost-chrono-dev (>> 1.47),
libminiupnpc8-dev | libminiupnpc-dev,
qt4-qmake, libqt4-dev,
xvfb,
qttools5-dev-tools, qttools5-dev,
libqrencode-dev,
libprotobuf-dev, protobuf-compiler,
@@ -13,11 +13,22 @@ override_dh_auto_clean:
rm -rf Makefile.in aclocal.m4 configure src/Makefile.in src/bitcoin-config.h.in src/build-aux src/qt/Makefile.in src/qt/test/Makefile.in src/test/Makefile.in

QT=$(shell dpkg-vendor --derives-from Ubuntu && echo qt4 || echo qt5)
# qt4 is very broken on arm
ifeq ($(findstring arm,$(shell uname -m)),arm)
QT=qt5
endif
ifeq ($(findstring aarch64,$(shell uname -m)),aarch64)
QT=qt5
endif

# Yea, autogen should be run on the source archive, but I like doing git archive
override_dh_auto_configure:
./autogen.sh
./configure --with-gui=$(QT)

override_dh_auto_test:
ifeq ($(QT), qt4)
xvfb-run -n 99 -l make check
else
make check
endif

0 comments on commit 7810c2d

Please sign in to comment.
You can’t perform that action at this time.