diff options
| author | Luke Dashjr <[email protected]> | 2012-03-17 19:54:22 -0400 |
|---|---|---|
| committer | Luke Dashjr <[email protected]> | 2012-03-22 12:46:47 -0400 |
| commit | 49e1501b5dbccdea03561684cc5aeccfac4e5e5a (patch) | |
| tree | 448e67804ff4ba2f2df6ef5b3e21bb049daa5b4e | |
| parent | Bump CLIENT_VERSION for rc4 release (diff) | |
| download | discoin-49e1501b5dbccdea03561684cc5aeccfac4e5e5a.tar.xz discoin-49e1501b5dbccdea03561684cc5aeccfac4e5e5a.zip | |
Move QMAKE_LIBS_QT_ENTRY adjustment to bitcoin side of build
It could just as well be on either part of the gitian build, but to safely put it on the Qt side would require bumping the filename, and every gitian user rebuilding it.
v0.5.3.1 put it on the Bitcoin side, and this is easier to work with and keep safe, so I'm moving it.
Use `qmake MINGW_THREAD_BUGFIX=0` to disable
| -rw-r--r-- | bitcoin-qt.pro | 15 | ||||
| -rw-r--r-- | contrib/gitian-descriptors/qt-win32.yml | 1 |
2 files changed, 13 insertions, 3 deletions
diff --git a/bitcoin-qt.pro b/bitcoin-qt.pro index 9fb92afd0..bd4e083be 100644 --- a/bitcoin-qt.pro +++ b/bitcoin-qt.pro @@ -291,10 +291,21 @@ isEmpty(BOOST_INCLUDE_PATH) { macx:BOOST_INCLUDE_PATH = /opt/local/include } -windows:LIBS += -lmingwthrd -lws2_32 -lshlwapi -windows:DEFINES += _MT WIN32 +windows:LIBS += -lws2_32 -lshlwapi +windows:DEFINES += WIN32 windows:RC_FILE = src/qt/res/bitcoin-qt.rc +windows:!contains(MINGW_THREAD_BUGFIX, 0) { + # At least qmake's win32-g++-cross profile is missing the -lmingwthrd + # thread-safety flag. GCC has -mthreads to enable this, but it doesn't + # work with static linking. -lmingwthrd must come BEFORE -lmingw, so + # it is prepended to QMAKE_LIBS_QT_ENTRY. + # It can be turned off with MINGW_THREAD_BUGFIX=0, just in case it causes + # any problems on some untested qmake profile now or in the future. + DEFINES += _MT + QMAKE_LIBS_QT_ENTRY = -lmingwthrd $$QMAKE_LIBS_QT_ENTRY +} + !windows:!mac { DEFINES += LINUX LIBS += -lrt diff --git a/contrib/gitian-descriptors/qt-win32.yml b/contrib/gitian-descriptors/qt-win32.yml index adccebbb9..6eb76b217 100644 --- a/contrib/gitian-descriptors/qt-win32.yml +++ b/contrib/gitian-descriptors/qt-win32.yml @@ -47,7 +47,6 @@ script: | cp -a bin $SRCDIR/ cd $INSTDIR find . -name *.prl | xargs -l sed 's|/$||' -i - sed 's/QMAKE_LIBS_QT_ENTRY = -lmingw32 -lqtmain/QMAKE_LIBS_QT_ENTRY = -lqtmain/' -i mkspecs/unsupported/win32-g++-cross/qmake.conf #sed 's|QMAKE_PRL_LIBS.*|QMAKE_PRL_LIBS = -lQtDeclarative -lQtScript -lQtSvg -lQtSql -lQtXmlPatterns -lQtGui -lgdi32 -lcomdlg32 -loleaut32 -limm32 -lwinmm -lwinspool -lmsimg32 -lQtNetwork -lQtCore -lole32 -luuid -lws2_32 -ladvapi32 -lshell32 -luser32 -lkernel32|' -i imports/Qt/labs/particles/qmlparticlesplugin.prl # as zip stores file timestamps, use faketime to intercept stat calls to set dates for all files to reference date |