build: Fix behavior when ALLOW_HOST_PACKAGES unset #18051

pull hebasto wants to merge 1 commits into bitcoin:master from hebasto:20200201-fix-allowhostpackages changing 1 files +1 −1

hebasto commented at 11:36 AM on February 1, 2020: member

On master (f05c1ac444e0c893516535bfdf07c5c8cd9bce16) during building with depends host packages are always considered by pkg-config regardless of ALLOW_HOST_PACKAGES environment variable. This causes issues like #18042.

This is an alternative to #18042 and #18045.

On master:

$ make HOST=x86_64-apple-darwin16 -C depends
$ CONFIG_SITE=$PWD/depends/x86_64-apple-darwin16/share/config.site ./configure
...
checking for QT_DBUS... yes
...
checking whether to build GUI with support for D-Bus... yes
...

With this PR:

ALLOW_HOST_PACKAGES unset

$ make HOST=x86_64-apple-darwin16 -C depends
$ CONFIG_SITE=$PWD/depends/x86_64-apple-darwin16/share/config.site ./configure
...
checking for QT_DBUS... no
...
checking whether to build GUI with support for D-Bus... no
...

ALLOW_HOST_PACKAGES=1

$ make HOST=x86_64-apple-darwin16 ALLOW_HOST_PACKAGES=1 -C depends
$ CONFIG_SITE=$PWD/depends/x86_64-apple-darwin16/share/config.site ./configure
...
checking for QT_DBUS... yes
...
checking whether to build GUI with support for D-Bus... yes
...

build: Fix behavior when ALLOW_HOST_PACKAGES unset 0e519fe284
fanquake added the label Build system on Feb 1, 2020
fanquake added the label Needs gitian build on Feb 1, 2020
hebasto renamed this:
~~[WIP] build: Fix behavior when ALLOW_HOST_PACKAGES unset~~
build: Fix behavior when ALLOW_HOST_PACKAGES unset
on Feb 1, 2020
hebasto marked this as ready for review on Feb 1, 2020
hebasto requested review from fanquake on Feb 1, 2020
hebasto requested review from jonasschnelli on Feb 1, 2020

DrahtBot commented at 5:52 AM on February 2, 2020: member

Gitian builds

File	commit f05c1ac444e0c893516535bfdf07c5c8cd9bce16<br>(master)	commit f3f4724109775bb4c517bc506091953574affa1a<br>(master and this pull)
bitcoin-0.19.99-aarch64-linux-gnu-debug.tar.gz	`d6c82894ddf31725...`	`e018ed18573f43a9...`
bitcoin-0.19.99-aarch64-linux-gnu.tar.gz	`2a8e573c11e42c44...`	`3e271cea7ea98837...`
bitcoin-0.19.99-arm-linux-gnueabihf-debug.tar.gz	`775171db94f98b68...`	`2b99cd7fc50da049...`
bitcoin-0.19.99-arm-linux-gnueabihf.tar.gz	`aaf441a318a0300a...`	`dc40deb7fe19af85...`
bitcoin-0.19.99-i686-pc-linux-gnu-debug.tar.gz	`d4e18249b531a7b0...`	`5cb1c713f84088f8...`
bitcoin-0.19.99-i686-pc-linux-gnu.tar.gz	`9bbc346e0654f362...`	`63d3c10111691eee...`
bitcoin-0.19.99-osx-unsigned.dmg	`0aa449b424af4f82...`	`8198cc42b0b697ed...`
bitcoin-0.19.99-osx64.tar.gz	`a4abe4f7b59931dd...`	`79d25426c91a5f7a...`
bitcoin-0.19.99-riscv64-linux-gnu-debug.tar.gz	`7c77bbe1f3e9f89e...`	`0921c1d88a282edd...`
bitcoin-0.19.99-riscv64-linux-gnu.tar.gz	`b8c760deb12156d9...`	`9091e1a412dbd796...`
bitcoin-0.19.99-win64-debug.zip	`d3e3f50b4bead7c9...`	`ffc38be5c7750f61...`
bitcoin-0.19.99-win64-setup-unsigned.exe	`893a640540754c61...`	`72fd3d80054df566...`
bitcoin-0.19.99-win64.zip	`e221701eda9414cd...`	`2ba390086fe722ef...`
bitcoin-0.19.99-x86_64-linux-gnu-debug.tar.gz	`185867724297a934...`	`8ad3c02c2ae8c2b0...`
bitcoin-0.19.99-x86_64-linux-gnu.tar.gz	`31a24026cc1270bc...`	`e541a521c4f626ed...`
bitcoin-0.19.99.tar.gz	`e8251875c9a95f10...`	`e63f0cebf15bf46a...`
bitcoin-core-linux-0.20-res.yml	`8e6727161b93e06c...`	`2b150e3fa0adc9f9...`
bitcoin-core-osx-0.20-res.yml	`60255e92aa9deed9...`	`88ffc47cf5e4a87a...`
bitcoin-core-win-0.20-res.yml	`6de443dcb0971f6a...`	`c027e4f5e6dfa812...`
linux-build.log	`50950fe65a49bdd0...`	`8af1a47e252e11fc...`
osx-build.log	`374486cebd622ef6...`	`aadaaee01673c4f1...`
win-build.log	`c64999f58db4fad9...`	`5ddc93681f2abcdb...`
bitcoin-core-linux-0.20-res.yml.diff		`ed6b688299d5b8b1...`
bitcoin-core-osx-0.20-res.yml.diff		`04e1d9e2c491ea79...`
bitcoin-core-win-0.20-res.yml.diff		`42e923bd007e2273...`
linux-build.log.diff		`566fa849cd8fedab...`
osx-build.log.diff		`3fb0bcccb95b85db...`
win-build.log.diff		`7ab28c2f3e7796b1...`

DrahtBot removed the label Needs gitian build on Feb 2, 2020
jonasschnelli approved
jonasschnelli commented at 10:51 AM on February 8, 2020: contributor

Tested ACK 0e519fe28425b0148fe0d026bd084ecd244f5669 - After this PR (and after a make clean & make HOST=x86_64-apple-darwin16 in depends), the macOS depends build on a Debian machine with qt as host package worked (it fails on master due to ENABLE_DBUS=1).
laanwj referenced this in commit 646f0ada02 on Feb 10, 2020
laanwj merged this on Feb 10, 2020
laanwj closed this on Feb 10, 2020
hebasto deleted the branch on Feb 10, 2020
sidhujag referenced this in commit 47fe769fc5 on Feb 18, 2020
MarkLTZ referenced this in commit 8823f65197 on Apr 7, 2020
MarkLTZ referenced this in commit 0a1571d657 on Apr 7, 2020
sidhujag referenced this in commit e9ea7cd6e6 on Nov 10, 2020
furszy referenced this in commit 816f42d7ac on May 25, 2021
DrahtBot locked this on Feb 15, 2022

Contributors

hebasto

DrahtBot

jonasschnelli

Review Requested
fanquake

Labels

Build system

Linked (view graph)

#18042 Don't check for DBUS notification on macOS #18045 build: Do not use QtDBus for macOS builds