Move QMAKE_LIBS_QT_ENTRY adjustment to bitcoin side of build #946

pull luke-jr wants to merge 1 commits into bitcoin:master from luke-jr:bugfix_rm_mingw changing 2 files +13 −3

luke-jr commented at 12:07 AM on March 18, 2012: member

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.
luke-jr commented at 4:10 PM on March 20, 2012: member

This should also take care of the issue for non-gitian users.
gavinandresen commented at 4:11 PM on March 20, 2012: contributor

Can I get an ACK from Matt?
TheBlueMatt commented at 4:31 PM on March 20, 2012: member

ACK if @laanjw says it doesnt break anything when built on Win32.
laanwj commented at 7:43 PM on March 21, 2012: member

Shouldn't we actually pass MINGW_THREAD_BUGFIX to qmake somewhere in the gitian file?
TheBlueMatt commented at 7:47 PM on March 21, 2012: member

Its on by default, so it doesnt matter...
laanwj commented at 8:25 PM on March 21, 2012: member
```
QMAKE_LIBS_QT_ENTRY -= -lmingw32
```
This causes an undefined reference to Winmain@16 when building in Qt Creator in Windows.

Any specific reason why are you subtracting it? Is mingwthrd supposed to be a full replacement for mingw32? (I don't think so)
luke-jr commented at 8:26 PM on March 21, 2012: member

What if we add -lmingw32 onto the end of LIBS (after -lmingwthrd)?
laanwj commented at 8:39 PM on March 21, 2012: member

I've tried it. Same problem...

luke-jr commented at 8:44 PM on March 21, 2012: member

How about:

QMAKE_LIBS_QT_ENTRY -= -lmingw32
QMAKE_LIBS_QT_ENTRY += -lmingwthrd -lmingw32
DEFINES += _MT

laanwj commented at 8:58 PM on March 21, 2012: member

Also tried. Same problem.

Every time I add the -= -lmingw32 line it fails...
luke-jr commented at 9:13 PM on March 21, 2012: member

What link command is it trying to use, with the last 3 lines I posted?

laanwj commented at 9:18 PM on March 21, 2012: member

I've got a working one:

QMAKE_LIBS_QT_ENTRY -= -lmingw32 -lqtmain
QMAKE_LIBS_QT_ENTRY += -lmingwthrd -lmingw32 -lqtmain

luke-jr commented at 9:26 PM on March 21, 2012: member

Aha, great. Really too bad qmake doesn't have a prefix operator, though.

Can anyone test that this creates a secure build when cross-compiling? (Otherwise, I can do it when 0.4 rc is done building)
luke-jr commented at 11:14 PM on March 21, 2012: member

Found a way to do a prefix. @laanwj, please test on native Windows. I'm doing a cross-gitian build now.
TheBlueMatt commented at 12:26 AM on March 22, 2012: member

ACK, the build @luke-jr gave me to test worked fine.
gavinandresen commented at 4:40 PM on March 22, 2012: contributor

Rebase into one commit? And a final ACK from @laanwj ?
luke-jr commented at 4:44 PM on March 22, 2012: member

Done

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

49e1501b5d

laanwj commented at 6:08 PM on March 22, 2012: member

ACK, this works
gavinandresen referenced this in commit 4a17e3e6b9 on Mar 22, 2012
gavinandresen merged this on Mar 22, 2012
gavinandresen closed this on Mar 22, 2012
coblee referenced this in commit dfa90cb1b1 on Jul 17, 2012
suprnurd referenced this in commit 66de5b082a on Dec 5, 2017
sanch0panza referenced this in commit 156e7ef346 on May 17, 2018
Bushstar referenced this in commit 25cf55d515 on Jul 30, 2019
DrahtBot locked this on Sep 8, 2021

Contributors