Skip to content

Conversation

@codablock
Copy link

#1692 contains two fixes not covered by the previous backports. This PR has these cherry-picked.

Setting PKG_CONFIG_SYSROOT_DIR environment variable to "/"
for building Qt makes pkgconf behave strange
(remove "/" prefix instead of adding it).

And it makes no sense to set this variable for old pkgconfig anyway.

Signed-off-by: Oleg Girko <ol@infoserver.lv>
3498a8d depends: fix fontconfig with newer glibc (Cory Fields)

Pull request description:

  Fixes build with newer gcc.

  Without this, depends builds fail with gcc7, maybe gcc6.

Tree-SHA512: 3cfcebdb137c3e368c69d25012ceb32809890e67521aaa8b074f2092f847e3e7ae82ac9050b4600ba18f443d2a8fe1f8523c808d77642a1e7782d558cbad4a74
@codablock codablock force-pushed the pr_missing_commits_from_1692 branch from 034e499 to 8ee652f Compare January 30, 2018 07:47
@UdjinM6 UdjinM6 added this to the 12.3 milestone Jan 31, 2018
Copy link

@UdjinM6 UdjinM6 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

utACK

@UdjinM6 UdjinM6 changed the title Missing commits from #1692 Fix qt and fontconfig depends Jan 31, 2018
@UdjinM6 UdjinM6 merged commit e30009c into dashpay:develop Jan 31, 2018
@codablock codablock deleted the pr_missing_commits_from_1692 branch January 31, 2018 11:07
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants