diff options
| author | Jonas Schnelli <dev@jonasschnelli.ch> | 2016-06-18 13:51:45 +0200 |
|---|---|---|
| committer | Jonas Schnelli <dev@jonasschnelli.ch> | 2016-06-18 13:51:45 +0200 |
| commit | 59d063d07660d6e8d53ed8aa1eb8b0747ea6767c (patch) | |
| tree | 1205faf2ff9cde7211f86449b0ba01628baca85c | |
| parent | 6194d9a501901f9fa7b20d2a4c34b31357a6441d (diff) | |
| download | bitcoin-59d063d07660d6e8d53ed8aa1eb8b0747ea6767c.tar.xz | |
Use runtime linking of QT libdbus, use custom/temp. SDK URL
| -rw-r--r-- | .travis.yml | 2 | ||||
| -rwxr-xr-x | contrib/devtools/symbol-check.py | 1 | ||||
| -rw-r--r-- | depends/packages/qt.mk | 3 |
3 files changed, 3 insertions, 3 deletions
diff --git a/.travis.yml b/.travis.yml index a6c51753b6..af9c476dc1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -22,7 +22,7 @@ env: - CCACHE_TEMPDIR=/tmp/.ccache-temp - CCACHE_COMPRESS=1 - BASE_OUTDIR=$TRAVIS_BUILD_DIR/out - - SDK_URL=https://bitcoincore.org/depends-sources/sdks + - SDK_URL=https://bitcoin.jonasschnelli.ch/sdks - PYTHON_DEBUG=1 - WINEDEBUG=fixme-all matrix: diff --git a/contrib/devtools/symbol-check.py b/contrib/devtools/symbol-check.py index 037b342121..e26c0fbb94 100755 --- a/contrib/devtools/symbol-check.py +++ b/contrib/devtools/symbol-check.py @@ -68,7 +68,6 @@ b'libX11.so.6', # part of X11 b'libxcb.so.1', # part of X11 b'libfontconfig.so.1', # font support b'libfreetype.so.6', # font parsing -b'libdbus-1.so.3', # inter process communication (notification system) b'libdl.so.2' # programming interface to dynamic linker } diff --git a/depends/packages/qt.mk b/depends/packages/qt.mk index c452823a95..d41d0b9ea5 100644 --- a/depends/packages/qt.mk +++ b/depends/packages/qt.mk @@ -5,7 +5,7 @@ $(package)_suffix=opensource-src-$($(package)_version).tar.gz $(package)_file_name=qtbase-$($(package)_suffix) $(package)_sha256_hash=0ac67cf8d66d52b995f96c31c4b48117a1afb3db99eaa93e20ccd8f7f55f7fde $(package)_dependencies=openssl -$(package)_linux_dependencies=freetype fontconfig dbus libxcb libX11 xproto libXext +$(package)_linux_dependencies=freetype fontconfig libxcb libX11 xproto libXext $(package)_build_subdir=qtbase $(package)_qt_libs=corelib network widgets gui plugins testlib $(package)_patches=mac-qmake.conf mingw-uuidof.patch pidlist_absolute.patch fix-xcb-include-order.patch fix_qt_pkgconfig.patch @@ -26,6 +26,7 @@ $(package)_config_opts_debug = -debug $(package)_config_opts += -bindir $(build_prefix)/bin $(package)_config_opts += -c++11 $(package)_config_opts += -confirm-license +$(package)_config_opts += -dbus-runtime $(package)_config_opts += -hostprefix $(build_prefix) $(package)_config_opts += -no-alsa $(package)_config_opts += -no-audio-backend |