New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 1 commit into from Feb 29, 2016

Conversation

Projects
None yet
6 participants
@dooglus
Contributor

dooglus commented Feb 26, 2016

Fixes #7189.

@paveljanik

This comment has been minimized.

Show comment
Hide comment
@paveljanik

paveljanik Feb 26, 2016

Contributor

ACK

Contributor

paveljanik commented Feb 26, 2016

ACK

@paveljanik

This comment has been minimized.

Show comment
Hide comment
@paveljanik

paveljanik Feb 26, 2016

Contributor

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

Contributor

paveljanik commented Feb 26, 2016

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

@jonasschnelli

This comment has been minimized.

Show comment
Hide comment
@jonasschnelli

jonasschnelli Feb 26, 2016

Member

Nice catch!
utACK.

Member

jonasschnelli commented Feb 26, 2016

Nice catch!
utACK.

@jonasschnelli jonasschnelli added the GUI label Feb 26, 2016

@fanquake

This comment has been minimized.

Show comment
Hide comment
@fanquake
Member

fanquake commented Feb 27, 2016

@dooglus

This comment has been minimized.

Show comment
Hide comment
@dooglus

dooglus Feb 27, 2016

Contributor

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)
Contributor

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

This comment has been minimized.

Show comment
Hide comment
@laanwj

laanwj Feb 29, 2016

Member

utACK 3d19193

Member

laanwj commented Feb 29, 2016

utACK 3d19193

@laanwj laanwj changed the title from Remove spurious dollar sign. Fixes #7189. to build: Remove spurious dollar sign. Fixes #7189. Feb 29, 2016

@laanwj laanwj merged commit 3d19193 into bitcoin:master Feb 29, 2016

1 check passed

continuous-integration/travis-ci/pr The Travis CI build passed
Details

laanwj added a commit that referenced this pull request Feb 29, 2016

Merge #7604: build: Remove spurious dollar sign. Fixes #7189.
3d19193 Remove spurious dollar sign. Fixes #7189. (Chris Moore)
@MarcoFalke

This comment has been minimized.

Show comment
Hide comment
@MarcoFalke

MarcoFalke Jun 9, 2016

Member

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

Member

MarcoFalke commented Jun 9, 2016

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment