Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

depends: only use D-Bus with Qt on linux #17521

Merged
merged 1 commit into from Dec 1, 2019
Merged

Conversation

@fanquake
Copy link
Member

fanquake commented Nov 19, 2019

Since #8210 we've been passing -dbus-runtime when configuring Qt, however D-Bus isn't used on macOS or Windows. So rather than blanket passing -dbus-runtime, only use D-Bus when building for linux, and disable it for Windows and macOS. This also saves some time building qt in depends (for windows or macOS).

This gist contains a diff of the symbols in a macOS bitcoin-qt after applying this change: https://gist.github.com/fanquake/317e5c9c7d1b5e37a0c1ce8001af18c4.

Copy link
Member

hebasto left a comment

Concept ACK

@laanwj

This comment has been minimized.

Copy link
Member

laanwj commented Nov 20, 2019

Concept ACK.

Not even all Linux kernel-using OSes use D-bus, could also disable it for Android.

@DrahtBot

This comment has been minimized.

Copy link
Contributor

DrahtBot commented Nov 20, 2019

Gitian builds

File commit b4a1da9
(master)
commit fa93a17
(master and this pull)
bitcoin-0.19.99-osx-unsigned.dmg 2aac9afb80675e6b... fc2ae7baf88652a6...
bitcoin-0.19.99-osx64.tar.gz fca5c093497da768... 2c1ad9e17c853e33...
bitcoin-0.19.99-win64-debug.zip 7a0b53fcba538c85... a4244e9620624cc2...
bitcoin-0.19.99-win64-setup-unsigned.exe 0dcf41e68351b5d3... 60bde2c9b2decf62...
bitcoin-0.19.99-win64.zip c8d229696feb714f... 733677bdfda23227...
bitcoin-0.19.99.tar.gz 0fbc1c4e20f88988... e5804cf22a4acfd9...
bitcoin-core-osx-0.20-res.yml a1bd02b0758e2e04... 62e3d678f9306b11...
bitcoin-core-win-0.20-res.yml 6dba0dd84407549e... bba6babed6d4a831...
linux-build.log d1ee3974fc3a4437... 30d703d7b3e8258d...
osx-build.log 0ea76b9d6b91529b... ea088208653e1754...
win-build.log c66e143a3b0cf570... 784deb926028deb9...
bitcoin-core-osx-0.20-res.yml.diff 671ba16e3ed16a09...
bitcoin-core-win-0.20-res.yml.diff ceec0b22ca9d16f2...
linux-build.log.diff 932a125cf2eef362...
osx-build.log.diff 52196f9e4cf2321c...
win-build.log.diff ab44643aa9da138e...
@fanquake fanquake force-pushed the fanquake:no_dbus_macos branch from 7d882e1 to 6fdf5da Nov 20, 2019
@fanquake

This comment has been minimized.

Copy link
Member Author

fanquake commented Nov 20, 2019

could also disable it for Android.

Done.

@DrahtBot

This comment has been minimized.

Copy link
Contributor

DrahtBot commented Nov 27, 2019

Gitian builds

File commit 2c1c437
(master)
commit e9bb45a
(master and this pull)
bitcoin-0.19.99-aarch64-linux-gnu-debug.tar.gz 38cbfb45b6a7086d... 3c2fff5ab701f6e1...
bitcoin-0.19.99-aarch64-linux-gnu.tar.gz da5cf67a007aed08... ac700c49e874fbac...
bitcoin-0.19.99-arm-linux-gnueabihf-debug.tar.gz 184e8ce64969a801... fce07079bbb8a342...
bitcoin-0.19.99-arm-linux-gnueabihf.tar.gz 281f743a1af9f788... 2a7a9dac254f4cf5...
bitcoin-0.19.99-i686-pc-linux-gnu-debug.tar.gz 094e8232c0b5fc1e... e002c9170c883bc0...
bitcoin-0.19.99-i686-pc-linux-gnu.tar.gz ab4deb19e22c2e9c... 8ea563f9dc622fc0...
bitcoin-0.19.99-osx-unsigned.dmg bd9ae85f63baebb0... 5b1829bafe4c0750...
bitcoin-0.19.99-osx64.tar.gz 61305776c2b32f02... db46c8e659795bf8...
bitcoin-0.19.99-riscv64-linux-gnu-debug.tar.gz 9c9b077e4c62ca11... 3c3faeb9bdc35e3d...
bitcoin-0.19.99-riscv64-linux-gnu.tar.gz b33148372a530635... 5467d251ba2ea1f5...
bitcoin-0.19.99-win64-debug.zip 20a7fd94fde51027... a378deeabfed0c16...
bitcoin-0.19.99-win64-setup-unsigned.exe 94be28f0f2a7d072... 630bf709df4ef445...
bitcoin-0.19.99-win64.zip 77303c3b0e4d270b... 6b8b241ed1b962f8...
bitcoin-0.19.99-x86_64-linux-gnu-debug.tar.gz 41dec10c82bf5058... 6ceb63063666c627...
bitcoin-0.19.99-x86_64-linux-gnu.tar.gz ee561a8a74b45caa... fcf5653dd5ae474c...
bitcoin-0.19.99.tar.gz a2c202a483d1f9e1... fd8f5d3a25e881bf...
bitcoin-core-linux-0.20-res.yml 5d71778589f1dbbe... a6e7a2989f376cb2...
bitcoin-core-osx-0.20-res.yml fefe01def2f61fe3... 28e5b9fb1f2a7cf7...
bitcoin-core-win-0.20-res.yml c6d1798223f3d9aa... dfc22dd9f195c329...
linux-build.log 7babaa31c8e7e008... 317eff41d11fbf5a...
osx-build.log 44cec8cec24a7204... b19b81b27e5ce73a...
win-build.log 11636a6fb5df52aa... aca821ed16e871d6...
bitcoin-core-linux-0.20-res.yml.diff 9d905377d5658572...
bitcoin-core-osx-0.20-res.yml.diff 9525afc10d2db541...
bitcoin-core-win-0.20-res.yml.diff 2a6d1e3b0faec156...
linux-build.log.diff 77d2a85588c5cb47...
osx-build.log.diff 3edf455fcffb53c6...
win-build.log.diff 711f063e9074febd...
@laanwj

This comment has been minimized.

Copy link
Member

laanwj commented Nov 28, 2019

ACK 6fdf5da

@fanquake

This comment has been minimized.

Copy link
Member Author

fanquake commented Nov 28, 2019

Note that this also reduces the macOS bitcoin-qt size by ~1.5% when I compare with a depends built master (114e89e). 29798952 bytes vs 29373472.

fanquake added a commit that referenced this pull request Dec 1, 2019
6fdf5da depends: only use dbus with qt on linux (fanquake)

Pull request description:

  Since #8210 we've been passing `-dbus-runtime` when configuring Qt, however D-Bus isn't used on macOS or Windows. So rather than blanket passing `-dbus-runtime`, only use D-Bus when building for linux, and disable it for Windows and macOS. This also saves some time building qt in depends (for windows or macOS).

  This gist contains a diff of the symbols in a macOS bitcoin-qt after applying this change: https://gist.github.com/fanquake/317e5c9c7d1b5e37a0c1ce8001af18c4.

ACKs for top commit:
  laanwj:
    ACK 6fdf5da

Tree-SHA512: 7c7df6036f27dae6adb807edf94cd26b4dafa3728976d219a68f7388b6477777b35acebd507320e4469c9f2fcf016b311c82e0b12d50546cb5ab66a1e955e464
@fanquake fanquake merged commit 6fdf5da into bitcoin:master Dec 1, 2019
2 checks passed
2 checks passed
continuous-integration/appveyor/pr AppVeyor build succeeded
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
@fanquake fanquake deleted the fanquake:no_dbus_macos branch Dec 1, 2019
sidhujag added a commit to syscoin/syscoin that referenced this pull request Dec 1, 2019
6fdf5da depends: only use dbus with qt on linux (fanquake)

Pull request description:

  Since bitcoin#8210 we've been passing `-dbus-runtime` when configuring Qt, however D-Bus isn't used on macOS or Windows. So rather than blanket passing `-dbus-runtime`, only use D-Bus when building for linux, and disable it for Windows and macOS. This also saves some time building qt in depends (for windows or macOS).

  This gist contains a diff of the symbols in a macOS bitcoin-qt after applying this change: https://gist.github.com/fanquake/317e5c9c7d1b5e37a0c1ce8001af18c4.

ACKs for top commit:
  laanwj:
    ACK 6fdf5da

Tree-SHA512: 7c7df6036f27dae6adb807edf94cd26b4dafa3728976d219a68f7388b6477777b35acebd507320e4469c9f2fcf016b311c82e0b12d50546cb5ab66a1e955e464
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
5 participants
You can’t perform that action at this time.