This change ensures that the GUI is still built even if protobuf is missing unless --enable-bip70 is passed to configure. If protobuf is present bip70 support will be compiled in unless --disable-bip70 is passed.
Adjust configure so that only bip70 is disabled when protobuf is missing instead of the GUI #14564
pull jameshilliard wants to merge 1 commits into bitcoin:master from jameshilliard:bip70-disable-check changing 1 files +20 −10-
jameshilliard commented at 12:43 AM on October 25, 2018: contributor
- fanquake added the label Build system on Oct 25, 2018
- fanquake added this to the milestone 0.18.0 on Oct 25, 2018
-
Sjors commented at 3:53 AM on October 25, 2018: member
tACK 3852aff on macOS 10.14
With protobuf installed: <img width="281" alt="with protobuf" src="https://user-images.githubusercontent.com/10217/47474902-d73c4c00-d84b-11e8-8a46-1ac4a11bfbf5.png">
Without protobuf installed: <img width="273" alt="without" src="https://user-images.githubusercontent.com/10217/47474946-0652bd80-d84c-11e8-9a07-c125d6a7fa09.png">
Without protobuf installed, with
--enable-bip70: <img width="628" alt="schermafbeelding 2018-10-25 om 11 53 26" src="https://user-images.githubusercontent.com/10217/47475070-9c86e380-d84c-11e8-9555-6daf42fc370f.png">(when checking out this branch for the first time, you need a
make (dist?)cleanin order to see the bip70 configure option) -
jameshilliard commented at 3:58 AM on October 25, 2018: contributor
I think
./autogen.shwill also get you the configure option. -
fanquake commented at 3:55 AM on October 26, 2018: member
testing 3852aff:
with protobuf and
./configure:with gui / qt = yes with bip70 = yes with qr = yes with zmq = yeswith protobuf and
./configure --disable-bip70:with gui / qt = yes with bip70 = no with qr = yes with zmq = yeswithout protobuf and
./configure:with gui / qt = yes with bip70 = no with qr = yes with zmq = yeswithout protobuf and
./configure --enable-bip70:checking whether to build test_bitcoin-qt... yes checking whether to build BIP70 support... configure: error: protobuf missing - MarcoFalke added the label Needs gitian build on Oct 26, 2018
-
DrahtBot commented at 4:53 AM on October 27, 2018: member
<!--a722867cd34abeea1fadc8d60700f111-->
Gitian builds for commit f4e4ea1ceecfb978584bd4f43cb6826e44ba86a3 (master):
c3283375b175ffa4fe2dc41ed34687c4...bitcoin-0.17.99-aarch64-linux-gnu-debug.tar.gz577cf07aa8fdf57df94b9d9cfc61d695...bitcoin-0.17.99-aarch64-linux-gnu.tar.gz9da0929c365c6ad70f4851ea1f8770b7...bitcoin-0.17.99-arm-linux-gnueabihf-debug.tar.gz034bedd56bb0402ee9bfdc6216ee197f...bitcoin-0.17.99-arm-linux-gnueabihf.tar.gz9000d1d5a1a9a34bfdf4003d2ad6c0d6...bitcoin-0.17.99-i686-pc-linux-gnu-debug.tar.gz7c0cff58492fefe1417aa02cc744e992...bitcoin-0.17.99-i686-pc-linux-gnu.tar.gz127a7684db5640cbe8d6ccdec3a0ef82...bitcoin-0.17.99-osx-unsigned.dmg50024b1ef4d27b8b9ff58a8d5e9ca402...bitcoin-0.17.99-osx64.tar.gzc05b8a964c53dcad6a35e13f85b765c2...bitcoin-0.17.99-riscv64-linux-gnu-debug.tar.gz1466320884aa4816eeb6fd57d112f2b8...bitcoin-0.17.99-riscv64-linux-gnu.tar.gz8d9e5306fa0ce9cc33040ed10f4b490f...bitcoin-0.17.99-win32-debug.zip3dbc52b482b0df968dd067dbeda592bb...bitcoin-0.17.99-win32-setup-unsigned.exe403cf4b632ba0144738e560088a48e4e...bitcoin-0.17.99-win32.zip98592f8f02ef5a95036ed35c6f8bf4ec...bitcoin-0.17.99-win64-debug.zipd487622eaef272b20592fa44e1311fa0...bitcoin-0.17.99-win64-setup-unsigned.execb57cbc555b12c10f3ec9c5d800ec4ee...bitcoin-0.17.99-win64.zip2fcdde56f8c763c4d10f8bdeca8336e7...bitcoin-0.17.99-x86_64-linux-gnu-debug.tar.gz556e5de6fcec983ff91f1009abed5194...bitcoin-0.17.99-x86_64-linux-gnu.tar.gzdcca2af4d16529c518d1aac034387bcd...bitcoin-0.17.99.tar.gze64dd1c6a68062940cf29c3486265c78...bitcoin-linux-0.18-res.yml46d48631fd71ad5a7732270388432f2c...bitcoin-linux-build.log5b24e121bb6a69bbd382d2f46771ef68...bitcoin-osx-0.18-res.yml34da4ee920b9e9f1683e9915f43f2fbe...bitcoin-osx-build.log6d6a55610bece1c49e1c0c84ff86aae9...bitcoin-win-0.18-res.ymla757cfc5032eba8b7c950868c7479c14...bitcoin-win-build.log
Gitian builds for commit 5d78c857f3117cacaea4275b474c164e3e88bbd2 (master and this pull):
e0b52268200fb877cd98be2b489b613c...bitcoin-0.17.99-aarch64-linux-gnu-debug.tar.gzc46d01e719e6b3ec135136dc6e520542...bitcoin-0.17.99-aarch64-linux-gnu.tar.gz696b2d66f70e4855c460b9b1fab2023b...bitcoin-0.17.99-arm-linux-gnueabihf-debug.tar.gz3ed8d34d5fea5b236612f2b5b2377de7...bitcoin-0.17.99-arm-linux-gnueabihf.tar.gzc1c907037db5de70e139337b01a0660f...bitcoin-0.17.99-i686-pc-linux-gnu-debug.tar.gzd6d6dfeeb623e396b30a32bf2a4e4ed5...bitcoin-0.17.99-i686-pc-linux-gnu.tar.gza69a348b3fdbdfd3b82345e85ad3f2f8...bitcoin-0.17.99-osx-unsigned.dmg54b00462ac95f22fab9977b5bd63b660...bitcoin-0.17.99-osx64.tar.gz3fb27b3cc87f4251603be675ff38cf26...bitcoin-0.17.99-riscv64-linux-gnu-debug.tar.gz353a929b8ce2e90bc5fb4b73c12048ff...bitcoin-0.17.99-riscv64-linux-gnu.tar.gz96a35a9e7c821c82633fdad47112a300...bitcoin-0.17.99-x86_64-linux-gnu-debug.tar.gz3c3a54733efb160569827ae38ff9f39c...bitcoin-0.17.99-x86_64-linux-gnu.tar.gzc166e83ce935812c50ebe3ed024a9662...bitcoin-0.17.99.tar.gz28c7645ed1b06943d67fe7b94beaec66...bitcoin-linux-0.18-res.yml6d9cf1d418437fe1fcc76b7c8e64b5e0...bitcoin-linux-build.log6c988317fe96f947edefcc87cb150549...bitcoin-osx-0.18-res.yml3a4e36b457ec964cebaa46b71646448f...bitcoin-osx-build.logf33b638737ff7c2189913b6f45f7c929...bitcoin-win-build.log
- DrahtBot removed the label Needs gitian build on Oct 27, 2018
-
MarcoFalke commented at 11:00 AM on October 27, 2018: member
Gitian fails with
CXXLD test/test_bitcoin.exe GEN qt/forms/ui_addressbookpage.h GEN qt/forms/ui_askpassphrasedialog.h GEN qt/forms/ui_coincontroldialog.h GEN qt/forms/ui_editaddressdialog.h GEN qt/forms/ui_helpmessagedialog.h GEN qt/forms/ui_intro.h GEN qt/forms/ui_modaloverlay.h GEN qt/forms/ui_openuridialog.h GEN qt/forms/ui_optionsdialog.h GEN qt/forms/ui_overviewpage.h GEN qt/forms/ui_receivecoinsdialog.h GEN qt/forms/ui_receiverequestdialog.h GEN qt/forms/ui_debugwindow.h GEN qt/forms/ui_sendcoinsdialog.h GEN qt/forms/ui_sendcoinsentry.h GEN qt/forms/ui_signverifymessagedialog.h GEN qt/forms/ui_transactiondescdialog.h GEN qt/paymentrequest.pb.h /bin/bash: --cpp_out=qt: command not found Makefile:10790: recipe for target 'qt/paymentrequest.pb.h' failed make[2]: *** [qt/paymentrequest.pb.h] Error 127 make[2]: Leaving directory '/home/ubuntu/build/bitcoin/distsrc-i686-w64-mingw32/src' Makefile:10248: recipe for target 'all-recursive' failed make[1]: *** [all-recursive] Error 1 make[1]: Leaving directory '/home/ubuntu/build/bitcoin/distsrc-i686-w64-mingw32/src' Makefile:774: recipe for target 'all-recursive' failed make: *** [all-recursive] Error 1 - MarcoFalke closed this on Oct 27, 2018
- MarcoFalke reopened this on Oct 27, 2018
-
MarcoFalke commented at 11:25 AM on October 27, 2018: member
Travis failure:
In file included from ./qt/paymentserver.h:40:0, from qt/bitcoin.cpp:25: ./qt/paymentrequestplus.h:10:10: fatal error: qt/paymentrequest.pb.h: No such file or directory #include <qt/paymentrequest.pb.h> ^~~~~~~~~~~~~~~~~~~~~~~~ compilation terminated. Makefile:8804: recipe for target 'qt/qt_bitcoin_qt-bitcoin.o' failed make[2]: *** [qt/qt_bitcoin_qt-bitcoin.o] Error 1 make[2]: Leaving directory '/home/travis/build/bitcoin/bitcoin/build/bitcoin-i686-w64-mingw32/src' Makefile:10248: recipe for target 'all-recursive' failed make[1]: Leaving directory '/home/travis/build/bitcoin/bitcoin/build/bitcoin-i686-w64-mingw32/src' make[1]: *** [all-recursive] Error 1 make: *** [all-recursive] Error 1 Makefile:774: recipe for target 'all-recursive' failed -
jameshilliard commented at 7:27 PM on October 27, 2018: contributor
@ken2812221 does this seem to be a similar issue to #14568?
-
DrahtBot commented at 11:54 PM on November 1, 2018: member
<!--e57a25ab6845829454e8d69fc972939a-->
The following sections might be updated with supplementary metadata relevant to reviewers and maintainers.
<!--174a7506f384e20aa4161008e828411d-->
Conflicts
Reviewers, this pull request conflicts with the following ones:
- #10102 ([experimental] Multiprocess bitcoin by ryanofsky)
If you consider this pull request important, please also help to review the conflicting pull requests. Ideally, start with the one that should be merged first.
- jameshilliard force-pushed on Nov 10, 2018
-
Adjust configure so that only bip70 is disabled when protobuf is missing instead of the GUI 58c5cc9ce7
- jameshilliard force-pushed on Nov 10, 2018
-
in configure.ac:1233 in 58c5cc9ce7
1228 | @@ -1229,8 +1229,10 @@ AM_CONDITIONAL([EMBEDDED_UNIVALUE],[test x$need_bundled_univalue = xyes]) 1229 | AC_SUBST(UNIVALUE_CFLAGS) 1230 | AC_SUBST(UNIVALUE_LIBS) 1231 | 1232 | -if test x$enable_bip70 != xno; then 1233 | -BITCOIN_QT_PATH_PROGS([PROTOC], [protoc],$protoc_bin_path) 1234 | + 1235 | +if test x$have_protobuf != xno &&
jameshilliard commented at 10:00 PM on November 10, 2018:I changed this from
test x$have_protobuf = xyeswhich fixes builds without pkg-config sincehave_protobuf=yesis not set when protobuf is present on non-pkg-config builds.jameshilliard commented at 10:35 PM on November 10, 2018: contributorThis should be fixed now, can we trigger a new gitian test build?
MarcoFalke added the label Needs gitian build on Nov 11, 2018DrahtBot commented at 6:12 AM on November 12, 2018: member<!--a722867cd34abeea1fadc8d60700f111-->
Gitian builds for commit edc715240cb6738262ae96dea476544052eb5351 (master):
d61d95b92816125048596aca6f4bc824...bitcoin-0.17.99-aarch64-linux-gnu-debug.tar.gz2a85ae3ecace4fac752443616c0470d3...bitcoin-0.17.99-aarch64-linux-gnu.tar.gzad2a2e0f705407fec8163421c073fda5...bitcoin-0.17.99-arm-linux-gnueabihf-debug.tar.gze8b3615deec572a8eff209c1d07162af...bitcoin-0.17.99-arm-linux-gnueabihf.tar.gzb6e90bf43f31648e344d8bac9a2ade45...bitcoin-0.17.99-i686-pc-linux-gnu-debug.tar.gzc62f7bead6ca7c97340ae94ed6ddbc0f...bitcoin-0.17.99-i686-pc-linux-gnu.tar.gz0f34f70185c5e5121f79be452c2188ce...bitcoin-0.17.99-osx-unsigned.dmg3bc41993921e7e431a01b3215d2a4228...bitcoin-0.17.99-osx64.tar.gz32bad3555cdab2baa981166b6663e04b...bitcoin-0.17.99-riscv64-linux-gnu-debug.tar.gzabd21d8b864af957ed99c556f3d705ed...bitcoin-0.17.99-riscv64-linux-gnu.tar.gzdea7bc35cd8465804420fb4478eb2975...bitcoin-0.17.99-win32-debug.zip7cefdffa08d9ae2945215787423a26e1...bitcoin-0.17.99-win32-setup-unsigned.exee50fea3f030fae2c8ac38606d54c277c...bitcoin-0.17.99-win32.zipeb99398306deb9e53c094c34fe20df6f...bitcoin-0.17.99-win64-debug.zipf4cd3382baa35b7dd09c09008e9f109e...bitcoin-0.17.99-win64-setup-unsigned.exedb89efb713672f4b9c046e49815cd53a...bitcoin-0.17.99-win64.zip1075c310344d43b2c0dc1c852cb5514b...bitcoin-0.17.99-x86_64-linux-gnu-debug.tar.gz0a16b01fc2e266eebb02fafc5d331540...bitcoin-0.17.99-x86_64-linux-gnu.tar.gzb03575bb032993b4e35b99c762cfc385...bitcoin-0.17.99.tar.gz43168956446f2b7b1340929039d3d553...bitcoin-linux-0.18-res.yml1544f2c2fc071c05f5b8cbe4e90c73da...bitcoin-linux-build.log9d3853238b31e643768f5d46fa7e059a...bitcoin-osx-0.18-res.ymlf3c7a4e6c87ef4f1ff9922f7e8e53795...bitcoin-osx-build.logb9803744657742c1d56e250abefd55ef...bitcoin-win-0.18-res.ymldc28e567fd558a33459fb91432bba50c...bitcoin-win-build.log
Gitian builds for commit 8ba6b08d0066e507298f5f1f2261d2f7ffd0e588 (master and this pull):
f032d624bdfcf816cc5d13a6b5b22d74...bitcoin-0.17.99-aarch64-linux-gnu-debug.tar.gzfa99f7e7425eefb85805feacfc0879dd...bitcoin-0.17.99-aarch64-linux-gnu.tar.gz45b15f67363bf03da8e6d0f7c8490c35...bitcoin-0.17.99-arm-linux-gnueabihf-debug.tar.gz60205bea6fc8434f9aeb78c80d14e203...bitcoin-0.17.99-arm-linux-gnueabihf.tar.gz6a61c76246857187a4dde242012268b6...bitcoin-0.17.99-i686-pc-linux-gnu-debug.tar.gz2009e8f5a193557c57f0fcb1ec17724e...bitcoin-0.17.99-i686-pc-linux-gnu.tar.gza79bf6e028a3ab6372a28e0bbcdb8e4b...bitcoin-0.17.99-osx-unsigned.dmged1869054c83e41da807208c3543cecc...bitcoin-0.17.99-osx64.tar.gz6953fa59cf6e02276110c4f5357d6815...bitcoin-0.17.99-riscv64-linux-gnu-debug.tar.gza2ede8ddff8b51e8b1007b8220754451...bitcoin-0.17.99-riscv64-linux-gnu.tar.gzc2c5c9b6ba413e5f6891c9aa473a4998...bitcoin-0.17.99-win32-debug.zip9d6c67332294252ca7a0d755ffadba15...bitcoin-0.17.99-win32-setup-unsigned.exe523407c01f48f83318aff55038ac8f7b...bitcoin-0.17.99-win32.zip5574a8ee41056a9940a712d47e0d5767...bitcoin-0.17.99-win64-debug.zip37d55c62b6ea894d9cd3c93eb455b952...bitcoin-0.17.99-win64-setup-unsigned.exe526e6700f4e4d42163f09ffe82d20822...bitcoin-0.17.99-win64.zip41c005bc3c18d97ace8e247c13e2889a...bitcoin-0.17.99-x86_64-linux-gnu-debug.tar.gzee931bde9ba797eb305a1f5457541d1b...bitcoin-0.17.99-x86_64-linux-gnu.tar.gz62864ec9b9ed241d32311bb00d532104...bitcoin-0.17.99.tar.gze75e5876638ec68ac83257bbb288f0ba...bitcoin-linux-0.18-res.ymled9a67d191bc47b5a3e6050a0186620a...bitcoin-linux-build.log2bf454bde188a21a8ee6f2698992e01a...bitcoin-osx-0.18-res.ymld8bd7e1a1f9012153d12dd361064f74f...bitcoin-osx-build.logbcecb1e887c559def50e4a5dcbc9dfc4...bitcoin-win-0.18-res.yml2c9562942e8221904d89787f5667ef28...bitcoin-win-build.log
DrahtBot removed the label Needs gitian build on Nov 12, 2018gmaxwell commented at 7:35 PM on November 21, 2018: contributorutACK
MarcoFalke merged this on Dec 6, 2018MarcoFalke closed this on Dec 6, 2018MarcoFalke referenced this in commit 23a1fa0248 on Dec 6, 2018luke-jr referenced this in commit f18325304b on Dec 21, 2018luke-jr referenced this in commit 292362856b on Dec 24, 2018dzutto referenced this in commit 360a0dd854 on Aug 18, 2021dzutto referenced this in commit f3407c73c3 on Aug 19, 2021dzutto referenced this in commit 396c16e85b on Aug 19, 2021dzutto referenced this in commit 1563480000 on Aug 23, 2021dzutto referenced this in commit 15e367a1c0 on Aug 26, 2021dzutto referenced this in commit d073a176f4 on Aug 26, 2021dzutto referenced this in commit 58e9b9cc4d on Aug 27, 2021PastaPastaPasta referenced this in commit b9df9815ba on Aug 29, 2021DrahtBot locked this on Sep 8, 2021LabelsMilestone
0.18.0
This is a metadata mirror of the GitHub repository bitcoin/bitcoin. This site is not affiliated with GitHub. Content is generated from a GitHub metadata backup.
generated: 2026-04-13 21:15 UTC
More mirrored repositories can be found on mirror.b10c.me