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: qt: avoid system harfbuzz and bz2 #14385

Merged
merged 1 commit into from Oct 8, 2018

Conversation

Projects
None yet
6 participants
@theuni
Copy link
Member

commented Oct 3, 2018

Should fix #14367.

Gitian builds end up with this config implicitly due to missing harfbuzz system lib, this change explicitly disables the use of the lib completely, even if present.

We may eventually want to break out harfbuzz and build it in depends, but for now just ensure that runtime dependencies don't depend on whether or not harfbuzz was present on the builder.

@real-or-random Can you confirm that this fixes your issue?

depends: qt: avoid system harfbuzz and bz2
We may eventually want to break out harfbuzz and build it in depends, but
for now just ensure that runtime dependencies don't depend on whether or not
harfbuzz was present on the builder.
@DrahtBot

This comment has been minimized.

Copy link
Contributor

commented Oct 4, 2018

Coverage Change (pull 14385) Reference (master)
Lines +0.0419 % 86.9985 %
Functions -0.0154 % 84.1902 %
Branches +0.0398 % 51.5024 %
@real-or-random

This comment has been minimized.

Copy link
Contributor

commented Oct 4, 2018

Thanks, this fixes the build for me. 👍

(But I can't judge how bad this affects users for which harfbuzz works currently.)

@DrahtBot

This comment has been minimized.

Copy link
Contributor

commented Oct 4, 2018

Gitian builds for commit 1f59c6f (master):

Gitian builds for commit afaea21ac6980fb09750e76cb327430a84899355 (master and this pull):

@bitcoin bitcoin deleted a comment from STALININST Oct 4, 2018

@ken2812221

This comment has been minimized.

Copy link
Member

commented Oct 6, 2018

utACK f149e31

@fanquake

This comment has been minimized.

Copy link
Member

commented Oct 8, 2018

utACK f149e31

This upstream ticket also partially explains what happened (I haven't tracked down the actual commit). Basically, from 5.8.0, Qt overhauled its build system, and now defaults to -system-harfbuzz.

Also discussed with @theuni, and in any case we definitely don't want to be pulling in system harfbuzz, so making this explicit is better.

@MarcoFalke MarcoFalke merged commit f149e31 into bitcoin:master Oct 8, 2018

2 checks passed

continuous-integration/appveyor/pr AppVeyor build succeeded
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details

MarcoFalke added a commit that referenced this pull request Oct 8, 2018

Merge #14385: depends: qt: avoid system harfbuzz and bz2
f149e31 depends: qt: avoid system harfbuzz and bz2 (Cory Fields)

Pull request description:

  Should fix #14367.

  Gitian builds end up with this config implicitly due to missing harfbuzz system lib, this change explicitly disables the use of the lib completely, even if present.

  We may eventually want to break out harfbuzz and build it in depends, but for now just ensure that runtime dependencies don't depend on whether or not harfbuzz was present on the builder.

  @real-or-random Can you confirm that this fixes your issue?

Tree-SHA512: 1ad3dd572c1f2004ec80ebaf3b6831327b0267fb3dc1895e77bd04785cd6e32bafc931932195462bbae807289bc565f0ea740f4050d26f0233ddcd62bfdb0685

@bitcoin bitcoin deleted a comment from STALININST Oct 13, 2018

UdjinM6 added a commit to dashpay/dash that referenced this pull request Mar 1, 2019

Backport bitcoin#14385: qt: avoid system harfbuzz and bz2 (#2732)
We may eventually want to break out harfbuzz and build it in depends, but
for now just ensure that runtime dependencies don't depend on whether or not
harfbuzz was present on the builder.

PastaPastaPasta added a commit to PastaPastaPasta/dash that referenced this pull request Mar 10, 2019

Backport bitcoin#14385: qt: avoid system harfbuzz and bz2 (dashpay#2732)
We may eventually want to break out harfbuzz and build it in depends, but
for now just ensure that runtime dependencies don't depend on whether or not
harfbuzz was present on the builder.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.