Skip to content

build: Remove spurious dollar sign. Fixes #7189.#7604

Merged
laanwj merged 1 commit intobitcoin:masterfrom
dooglus:fix_qt4_failback
Feb 29, 2016
Merged

build: Remove spurious dollar sign. Fixes #7189.#7604
laanwj merged 1 commit intobitcoin:masterfrom
dooglus:fix_qt4_failback

Conversation

@dooglus
Copy link
Contributor

@dooglus dooglus commented Feb 26, 2016

Fixes #7189.

@paveljanik
Copy link
Contributor

paveljanik commented Feb 26, 2016

ACK

@paveljanik
Copy link
Contributor

paveljanik commented Feb 26, 2016

It is there starting from 2014-01-10...

@jonasschnelli
Copy link
Contributor

jonasschnelli commented Feb 26, 2016

Nice catch!
utACK.

@fanquake
Copy link
Member

fanquake commented Feb 27, 2016

utACK dooglus@3d19193

@dooglus
Copy link
Contributor Author

dooglus commented Feb 27, 2016

Here's the limited testing I did, showing that it uses Qt4 if Qt5 isn't available:

$ alias show4='sudo mv /usr/lib/x86_64-linux-gnu/pkgconfig/QtCore.pc{.hide,}'
$ alias hide4='sudo mv /usr/lib/x86_64-linux-gnu/pkgconfig/QtCore.pc{,.hide}'
$ alias show5='sudo mv /usr/lib/x86_64-linux-gnu/pkgconfig/Qt5Core.pc{.hide,}'
$ alias hide5='sudo mv /usr/lib/x86_64-linux-gnu/pkgconfig/Qt5Core.pc{,.hide}'

# before applying the fix

$ hide4; hide5; ./configure --with-incompatible-bdb 2>&1 | grep 'GUI.*Qt' # no QT4 or QT5
checking whether to build Bitcoin Core GUI... no (Qt5)

$ show4; ./configure --with-incompatible-bdb 2>&1 | grep 'GUI.*Qt' # QT4 only
checking whether to build Bitcoin Core GUI... no (Qt5)

$ hide4; show5; ./configure --with-incompatible-bdb 2>&1 | grep 'GUI.*Qt' # QT5 only
checking whether to build Bitcoin Core GUI... yes (Qt5)

$ show4; ./configure --with-incompatible-bdb 2>&1 | grep 'GUI.*Qt' # QT4 and QT5
checking whether to build Bitcoin Core GUI... yes (Qt5)


# apply the fix and re-run autogen.sh:
$ sed -i -e 's/x[$]qt5/xqt5/' build-aux/m4/bitcoin_qt.m4
$ ./autogen.sh > /dev/null 2>&1


# after applying the fix
$ hide5; hide4; ./configure --with-incompatible-bdb 2>&1 | grep 'GUI.*Qt' # no QT4 or QT5
checking whether to build Bitcoin Core GUI... no (Qt5)

$ show4; ./configure --with-incompatible-bdb 2>&1 | grep 'GUI.*Qt' # QT4 only
checking whether to build Bitcoin Core GUI... yes (Qt4) # we have QT4 and not QT5. 4 is used

$ hide4; show5; ./configure --with-incompatible-bdb 2>&1 | grep 'GUI.*Qt' # QT5 only
checking whether to build Bitcoin Core GUI... yes (Qt5)

$ show4; ./configure --with-incompatible-bdb 2>&1 | grep 'GUI.*Qt' # QT4 and QT5
checking whether to build Bitcoin Core GUI... yes (Qt5)

@laanwj
Copy link
Member

laanwj commented Feb 29, 2016

utACK 3d19193

@laanwj laanwj changed the title Remove spurious dollar sign. Fixes #7189. build: Remove spurious dollar sign. Fixes #7189. Feb 29, 2016
@laanwj laanwj merged commit 3d19193 into bitcoin:master Feb 29, 2016
laanwj added a commit that referenced this pull request Feb 29, 2016
@laanwj
Merge #7604: build: Remove spurious dollar sign. Fixes #7189.
354b03d 
3d19193 Remove spurious dollar sign. Fixes #7189. (Chris Moore)
@maflcko
Copy link
Member

maflcko commented Jun 9, 2016

Backported as part of #7938. Removing label 'Needs backport'.

@bitcoin bitcoin locked as resolved and limited conversation to collaborators Sep 8, 2021
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Reviewers

No reviews

Assignees

No one assigned

Labels

GUI

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

Bitcoin GUI is not built when only qt4 is installed

6 participants

@dooglus @paveljanik @jonasschnelli @fanquake @laanwj @maflcko