diff options
| author | Luke Dashjr <luke-jr+git@utopios.org> | 2012-03-17 19:54:22 -0400 |
|---|---|---|
| committer | Luke Dashjr <luke-jr+git@utopios.org> | 2012-03-22 12:46:47 -0400 |
| commit | 49e1501b5dbccdea03561684cc5aeccfac4e5e5a (patch) | |
| tree | 448e67804ff4ba2f2df6ef5b3e21bb049daa5b4e /contrib | |
| parent | 44b69cf25e73ff164e15c9ca2027c5b871151e32 (diff) | |
| download | bitcoin-49e1501b5dbccdea03561684cc5aeccfac4e5e5a.tar.xz | |
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
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/gitian-descriptors/qt-win32.yml | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/contrib/gitian-descriptors/qt-win32.yml b/contrib/gitian-descriptors/qt-win32.yml index adccebbb91..6eb76b2170 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 |