Use && and fix linux-mingw, please wait for pull-tester output here. Also upgrade to qt 4.8.3 because 4.8.2 isnt on the version archive anymore (dont see any mentions as to why, but we might as well upgrade so that everyone can build).
Build script fixes #1966
pull TheBlueMatt wants to merge 4 commits into bitcoin:master from TheBlueMatt:leveldbmakefile changing 9 files +17 −16-
TheBlueMatt commented at 9:50 PM on October 28, 2012: member
-
sipa commented at 10:29 PM on October 28, 2012: member
ACK; tested on gitian
-
BitcoinPullTester commented at 12:29 AM on October 29, 2012: none
Automatic sanity-testing: FAILED BUILD/TEST, see http://jenkins.bluematt.me/pull-tester/51600d0ab9ae88c7f2fac8423cf0a8bcc483f969 for binaries and test log.
This could happen for one of several reasons:
- It chanages paths in makefile.linux-mingw or otherwise changes build scripts in a way that made them incompatible with the automated testing scripts
- It does not build on either Linux i386 or Win32 (via MinGW cross compile)
- The test suite fails on either Linux i386 or Win32
- The block test-cases failed (lookup the first bNN identifier which failed in https://github.com/TheBlueMatt/test-scripts/blob/master/FullBlockTestGenerator.java)
-
Diapolo commented at 7:06 AM on October 29, 2012: none
AFAIK there were problems with Qt 4.8.3 at least when using it on Windows due to problems with ressource-files and qmake, I hope they fixed that.
And I'm missing an updated download link for the updated Qt in: https://github.com/bitcoin/bitcoin/blob/master/contrib/gitian-descriptors/README#L34 https://github.com/bitcoin/bitcoin/blob/master/doc/release-process.txt#L33 https://github.com/bitcoin/bitcoin/blob/master/doc/release-process.txt#L38
-
sipa commented at 10:30 AM on October 29, 2012: member
It seems gitian works with this (and already worked) because it first builds Bitcoin-Qt, which has some magic in its .pro file to build leveldb, and that leveldb built gets reused for the bitcoind build. That is fine of course, but we should make sure that building bitcoind separately also works, which probably means adding the ranlib magic to makefile.linux-mingw.
-
TheBlueMatt commented at 3:02 PM on October 29, 2012: member
@Diapolo So should we downgrade to 0.8.1 then?
-
laanwj commented at 3:34 PM on October 29, 2012: member
I don't know what's wrong with 4.8.3. Is it documented anywhere?
-
Diapolo commented at 4:00 PM on October 29, 2012: none
I'm fine with 4.8.3 if it compiles just fine with Gitian, I only wanted to mention it is causing some trouble on Windows, when trying to build a project with that version. As this doesn't touch our builds don't weighten that info too much, as it was perhaps a missleading information, sorry then.
See: https://bugreports.qt-project.org/browse/QTBUG-27424
Edit: It seems 4.8.4 is near, too http://qt.digia.com/Release-Notes/Release-Notes-Qt-484/
-
TheBlueMatt commented at 6:26 PM on October 29, 2012: member
It compiled fine in gitian for me
-
Diapolo commented at 6:47 PM on October 29, 2012: none
Okay, then if you update the 3 missing references to Qt 4.8.3, too, I'm fine with that commit :).
https://github.com/bitcoin/bitcoin/blob/master/contrib/gitian-descriptors/README#L34 https://github.com/bitcoin/bitcoin/blob/master/doc/release-process.txt#L33 https://github.com/bitcoin/bitcoin/blob/master/doc/release-process.txt#L38
-
BitcoinPullTester commented at 7:37 PM on October 29, 2012: none
Automatic sanity-testing: PASSED, see http://jenkins.bluematt.me/pull-tester/7bf7047b879a3903bbc8646cb5e1dd7ea8aff539 for binaries and test log.
-
Use && instead of ; in leveldb calls to makefile. 3b4f8ad71d
-
Fix linux-mingw makefile's leveldb build by setting CXX. f53b125507
-
Upgrade to Qt 4.8.3 (because 4.8.2 was removed from qt repos?) 325a064c68
-
Add missing calls to ranlib in Windows makefiles 38fe2e6a68
-
TheBlueMatt commented at 7:43 PM on October 29, 2012: member
OK, updated with the missing 4.8.3 updates, should be good to pull now.
-
gmaxwell commented at 7:48 PM on October 29, 2012: contributor
ACK (untested but looks sane)
- gmaxwell referenced this in commit 155bdd90b9 on Oct 29, 2012
- gmaxwell merged this on Oct 29, 2012
- gmaxwell closed this on Oct 29, 2012
- laudney referenced this in commit e45343402e on Mar 19, 2014
- KolbyML referenced this in commit 0ad68a3dbe on Dec 5, 2020
- DrahtBot locked this on Sep 8, 2021