[depends] Qt 5.7.1 #9469

fanquake · 2017-01-04T13:28:14Z

This updates the depends system to use Qt 5.7.1. One improvement includes:

Starting with Qt 5.7, we will require a C++11 compliant compiler to build and use Qt. 
This allows us to use many of the new features in Qt itself, and renew our codebase 
using features such as constexpr, move semantics, range-for and auto. These efforts 
are well under way and will continue throughout the next versions.

See #8237 for some more discussion. However it's worth noting that build-related improvements likely won't make it into 0.14.0.

We can drop the configure-xcoderun patch, as it's been fixed in src.
The other patches have been updated to apply cleanly.

-c++11 and -no-nis have been removed as they are now invalid options.

There is currently an lrelease/translations related issue, and one other on linux.

compiling ../shared/qmakeevaluator.cpp
compiling ../shared/qmakebuiltins.cpp
compiling ../shared/profileevaluator.cpp
linking ../../../bin/lrelease
make[1]: Leaving directory `/home/travis/build/bitcoin/bitcoin/depends/work/build/x86_64-unknown-linux-gnu/qt/5.7.1-b0275a68b64/qttools/src/linguist/lrelease'
make[1]: Entering directory `/home/travis/build/bitcoin/bitcoin/depends/work/build/x86_64-unknown-linux-gnu/qt/5.7.1-b0275a68b64/qttranslations'
cd translations/ && ( test -e Makefile || /home/travis/build/bitcoin/bitcoin/depends/work/build/x86_64-unknown-linux-gnu/qt/5.7.1-b0275a68b64/qtbase/bin/qmake /home/travis/build/bitcoin/bitcoin/depends/work/build/x86_64-unknown-linux-gnu/qt/5.7.1-b0275a68b64/qttranslations/translations/translations.pro -o Makefile ) && make -f Makefile 
make[2]: Entering directory `/home/travis/build/bitcoin/bitcoin/depends/work/build/x86_64-unknown-linux-gnu/qt/5.7.1-b0275a68b64/qttranslations/translations'
make[2]: *** No rule to make target `/home/travis/build/bitcoin/bitcoin/depends/x86_64-unknown-linux-gnu/native/bin/lrelease', needed by `assistant_cs.qm'.  Stop.

cc @theuni
Closes #8237

paveljanik · 2017-01-08T11:00:52Z

depends/patches/qt/fix_qt_pkgconfig.patch

--- old/qtbase/mkspecs/features/qt_module.prf 2016-03-17 02:06:42.705930685 +0000
-+++ new/qtbase/mkspecs/features/qt_module.prf 2016-03-17 02:06:42.705930685 +0000
-@@ -244,7 +244,7 @@
+--- old/qtbase/mkspecs/features/qt_module.prf


Why so many diff-only related changes here?

The code stayed the same but the lines moved.

We already clarified this with @fanquake. He re-did the diffs to apply cleanly.

theuni · 2017-01-10T03:11:30Z

@fanquake Thanks, having a look.

theuni · 2017-01-10T21:21:15Z

@fanquake Seems the xcoderun issue still exists. Did you see something upstream that looked like a fix?

I remember fixing up some of those issues in my unfinished branch, which was an attempt to split up the monolithic build into smaller chunks: theuni@b00b202. It's obviously not worth trying to do all that now, but it may be helpful to pick some of the changes out.

IIRC the lrelease problem was caused by something assuming that lrelease was already built, forcing it to build earlier should do the trick.

jtimon · 2017-01-11T23:03:51Z

Concept ACK

fanquake · 2017-01-11T23:33:29Z

@theuni I thought it only affected the 5.6 branch https://codereview.qt-project.org/#/c/164673.
Homebrew also dropped their patch for the same issue when moving to 5.7.1, see this commit.

theuni · 2017-01-11T23:49:25Z

@fanquake That's a different issue. Our problem is that it assumes that builds for osx are done on osx. Our patch fixes the cross build.

theuni · 2017-01-13T23:33:33Z

@fanquake My apologies, you were right about that patch. I had something different in mind (a sed we do in the .mk).

Mind putting that back the way you had it, then grabbing the top two commits here: https://github.com/theuni/bitcoin/tree/qt-5.7new ?

I think that may be enough to get this working.

theuni · 2017-01-13T23:41:00Z

@fanquake Also, rather than dropping the "-c++11" option, let's change it to "-c++std c++11". Otherwise, it'll pick up c++14/c++17 and potentially end up with a confused abi.

fanquake · 2017-01-14T03:12:33Z

Rebased, so this is now on top of the other depends changes.
Updated to use -c++std c++11 instead of just dropping -c++11.
Re-dropped the xcrun configure patch.
Pull in two commits from @theuni.

fanquake · 2017-01-14T06:11:57Z

After discussion with theuni on IRC, have just pushed a fix for the c++ issue with the OSX build.

If this works, make sure to split out the config.site.in change into a separate commit, as it could be backported.

cfields: fanquake only reason i mention is that i had a theory at one point that it was the cause of the 10.7 back-compat breakage. Since it's responsible for intoducing c++03 abi objects into the 0.13 build.

https://github.com/bitcoin/bitcoin/blob/master/configure.ac#L62

Their buildsystem insists on using the installed ltranslate, but gets confused about how to find it. Since we manually control the build order, just drop the dependency.

maflcko · 2017-01-14T10:14:32Z

Concept ACK.

laanwj · 2017-01-15T05:43:00Z

utACK bb077fa, looks good to me, good to see this is passing now.

bb077fa [depends] Remove OBJCXX define from config.site.in (fanquake) c37ea4d depends: fix qt translations build (Cory Fields) 2b32dea depends: use new variable layout for qt sdk (Cory Fields) 02fcb29 [depends] Qt 5.7.1 (fanquake)

maflcko · 2017-01-15T12:55:35Z

If this works, make sure to split out the config.site.in change into a separate commit, as it could be backported.

Tagging for backport

bb077fa [depends] Remove OBJCXX define from config.site.in (fanquake) c37ea4d depends: fix qt translations build (Cory Fields) 2b32dea depends: use new variable layout for qt sdk (Cory Fields) 02fcb29 [depends] Qt 5.7.1 (fanquake)

@codablock

…dablock committed on Jan 20, 2018 Use version 2 blocks for miner_tests … @codablock codablock committed on Jan 20, 2018 Merge bitcoin#7871: Manual block file pruning. … @laanwj @codablock laanwj authored and codablock committed on Jan 11, 2017 Merge bitcoin#9507: Fix use-after-free in CTxMemPool::removeConflicts() … @sipa @codablock sipa authored and codablock committed on Jan 11, 2017 Merge bitcoin#9297: Various RPC help outputs updated … @MarcoFalke @codablock MarcoFalke authored and codablock committed on Jan 12, 2017 Merge bitcoin#9416: travis: make distdir before make … @MarcoFalke @codablock MarcoFalke authored and codablock committed on Jan 12, 2017 Merge bitcoin#9520: Deprecate non-txindex getrawtransaction and bette… … @MarcoFalke @codablock MarcoFalke authored and codablock committed on Jan 12, 2017 Merge bitcoin#9518: Return height of last block pruned by pruneblockc… … @MarcoFalke @codablock MarcoFalke authored and codablock committed on Jan 12, 2017 Merge bitcoin#9472: Disentangle progress estimation from checkpoints … … @laanwj @codablock laanwj authored and codablock committed on Jan 12, 2017 Merge bitcoin#8883: Add all standard TXO types to bitcoin-tx … @laanwj @codablock laanwj authored and codablock committed on Jan 12, 2017 Merge bitcoin#9261: Add unstored orphans with rejected parents to rec… … @laanwj @codablock laanwj authored and codablock committed on Jan 12, 2017 Merge bitcoin#9468: [Depends] Dependency updates for 0.14.0 … @laanwj @codablock laanwj authored and codablock committed on Jan 12, 2017 Merge bitcoin#9222: Add 'subtractFeeFromAmount' option to 'fundrawtra… … @laanwj @codablock laanwj authored and codablock committed on Jan 12, 2017 Merge bitcoin#9490: Replace FindLatestBefore used by importmuti with … … @sipa @codablock sipa authored and codablock committed on Jan 13, 2017 Merge bitcoin#9469: [depends] Qt 5.7.1 … @laanwj @codablock laanwj authored and codablock committed on Jan 15, 2017 Merge bitcoin#9380: Separate different uses of minimum fees … @laanwj @codablock laanwj authored and codablock committed on Jan 16, 2017 Remove SegWit related code in dash-tx @codablock codablock committed on Sep 21, 2017 Merge bitcoin#9561: Wake message handling thread when we receive a ne… … @sipa @codablock sipa authored and codablock committed on Jan 17, 2017 Merge bitcoin#9508: Remove unused Python imports … @MarcoFalke @codablock MarcoFalke authored and codablock committed on Jan 18, 2017 Merge bitcoin#9512: Fix various things -fsanitize complains about

fanquake added Build system GUI labels Jan 4, 2017

fanquake added this to the 0.14.0 milestone Jan 4, 2017

fanquake requested a review from theuni January 4, 2017 13:28

paveljanik reviewed Jan 8, 2017

View reviewed changes

fanquake force-pushed the depends-0-14-0-qt branch from e664a93 to b8c2e61 Compare January 11, 2017 23:58

fanquake and others added 2 commits January 14, 2017 11:01

[depends] Qt 5.7.1

02fcb29

depends: use new variable layout for qt sdk

2b32dea

fanquake force-pushed the depends-0-14-0-qt branch from b8c2e61 to 3d50cfa Compare January 14, 2017 03:09

fanquake changed the title ~~[WIP][depends] Qt 5.7.1~~ [depends] Qt 5.7.1 Jan 14, 2017

fanquake force-pushed the depends-0-14-0-qt branch from 3d50cfa to c010a4d Compare January 14, 2017 06:02

theuni and others added 2 commits January 14, 2017 14:23

depends: fix qt translations build

c37ea4d

Their buildsystem insists on using the installed ltranslate, but gets confused about how to find it. Since we manually control the build order, just drop the dependency.

[depends] Remove OBJCXX define from config.site.in

bb077fa

fanquake force-pushed the depends-0-14-0-qt branch from c010a4d to bb077fa Compare January 14, 2017 06:26

laanwj merged commit bb077fa into bitcoin:master Jan 15, 2017

fanquake deleted the depends-0-14-0-qt branch January 15, 2017 06:02

maflcko added the Needs backport label Jan 15, 2017

maflcko modified the milestones: 0.13.3, 0.14.0 Jan 15, 2017

fanquake removed the request for review from theuni January 16, 2017 13:40

fanquake removed the Needs backport label Mar 7, 2018

sickpig mentioned this pull request Jun 5, 2018

[PORT] Depends cherries BitcoinUnlimited/BitcoinUnlimited#1120

Merged

CryptoCentric pushed a commit to absolute-community/absolute that referenced this pull request Feb 27, 2019

Merge bitcoin#9469: [depends] Qt 5.7.1

0363e9f

bitcoin locked as resolved and limited conversation to collaborators Sep 8, 2021

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

[depends] Qt 5.7.1 #9469

[depends] Qt 5.7.1 #9469

Uh oh!

fanquake commented Jan 4, 2017 •

edited

Loading

Uh oh!

paveljanik Jan 8, 2017 •

edited

Loading

Uh oh!

laanwj Jan 10, 2017

Uh oh!

paveljanik Jan 10, 2017

Uh oh!

theuni commented Jan 10, 2017

Uh oh!

theuni commented Jan 10, 2017

Uh oh!

jtimon commented Jan 11, 2017

Uh oh!

fanquake commented Jan 11, 2017

Uh oh!

theuni commented Jan 11, 2017

Uh oh!

theuni commented Jan 13, 2017

Uh oh!

theuni commented Jan 13, 2017

Uh oh!

fanquake commented Jan 14, 2017

Uh oh!

fanquake commented Jan 14, 2017

Uh oh!

maflcko commented Jan 14, 2017

Uh oh!

laanwj commented Jan 15, 2017

Uh oh!

maflcko commented Jan 15, 2017

Uh oh!

Uh oh!

[depends] Qt 5.7.1 #9469

[depends] Qt 5.7.1 #9469

Uh oh!

Conversation

fanquake commented Jan 4, 2017 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

paveljanik Jan 8, 2017 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

laanwj Jan 10, 2017

Choose a reason for hiding this comment

Uh oh!

paveljanik Jan 10, 2017

Choose a reason for hiding this comment

Uh oh!

theuni commented Jan 10, 2017

Uh oh!

theuni commented Jan 10, 2017

Uh oh!

jtimon commented Jan 11, 2017

Uh oh!

fanquake commented Jan 11, 2017

Uh oh!

theuni commented Jan 11, 2017

Uh oh!

theuni commented Jan 13, 2017

Uh oh!

theuni commented Jan 13, 2017

Uh oh!

fanquake commented Jan 14, 2017

Uh oh!

fanquake commented Jan 14, 2017

Uh oh!

maflcko commented Jan 14, 2017

Uh oh!

laanwj commented Jan 15, 2017

Uh oh!

maflcko commented Jan 15, 2017

Uh oh!

Uh oh!

fanquake commented Jan 4, 2017 •

edited

Loading

paveljanik Jan 8, 2017 •

edited

Loading