Skip to content

Conversation

hebasto
Copy link
Member

@hebasto hebasto commented Mar 9, 2020

This PR:

Ref: #17768

@DrahtBot
Copy link
Contributor

DrahtBot commented Mar 9, 2020

The following sections might be updated with supplementary metadata relevant to reviewers and maintainers.

Conflicts

No conflicts as of last run.

@laanwj
Copy link
Member

laanwj commented Mar 10, 2020

I like this idea, especially the simplification of the autoconf scripts. Concept ACK.

@hebasto hebasto force-pushed the 20200309-pkgconfig branch from 284418a to b3b769a Compare March 16, 2020 11:58
@hebasto
Copy link
Member Author

hebasto commented Mar 16, 2020

@theuni
Copy link
Member

theuni commented Mar 19, 2020

Concept ACK, thanks for working on this. Will review the chain.

laanwj added a commit that referenced this pull request Apr 20, 2020
b68e717 build: Set libevent minimum version to 2.0.21 (Hennadii Stepanov)

Pull request description:

  The non-`pkg-config` path is ignored as there is a hope to get rid of all of them in #18307.

  As xenial has [libevent 2.0.21](https://packages.ubuntu.com/xenial-updates/libevent-2.0-5) only, the default bionic Docker image is used in the _"[no depends, only system libs, sanitizers: thread (TSan), no wallet]"_ CI test.

ACKs for top commit:
  theStack:
    utACK b68e717
  laanwj:
    ACK b68e717

Tree-SHA512: 9825c42aeb166165e99fe5eaf74dbb47c2b51aecdbe53c5ae949fe126e1b8e8b6fe8d228fdde4e8daa4243e5907954202f42eb23c71629e4b2b92a7d4eb892e4
sidhujag pushed a commit to syscoin/syscoin that referenced this pull request Apr 20, 2020
…re script

b68e717 build: Set libevent minimum version to 2.0.21 (Hennadii Stepanov)

Pull request description:

  The non-`pkg-config` path is ignored as there is a hope to get rid of all of them in bitcoin#18307.

  As xenial has [libevent 2.0.21](https://packages.ubuntu.com/xenial-updates/libevent-2.0-5) only, the default bionic Docker image is used in the _"[no depends, only system libs, sanitizers: thread (TSan), no wallet]"_ CI test.

ACKs for top commit:
  theStack:
    utACK bitcoin@b68e717
  laanwj:
    ACK b68e717

Tree-SHA512: 9825c42aeb166165e99fe5eaf74dbb47c2b51aecdbe53c5ae949fe126e1b8e8b6fe8d228fdde4e8daa4243e5907954202f42eb23c71629e4b2b92a7d4eb892e4
@hebasto hebasto force-pushed the 20200309-pkgconfig branch from b3b769a to a4535bf Compare June 13, 2020 17:41
@hebasto
Copy link
Member Author

hebasto commented Jun 13, 2020

Rebased b3b769a -> a4535bf (pr18307.02 -> pr18307.03) due to the merging of #18297.

@hebasto
Copy link
Member Author

hebasto commented Jun 13, 2020

@fanquake
May I ask "Needs gitian build" and "Needs Guix build" labels for this PR?

@DrahtBot
Copy link
Contributor

Gitian builds

File commit 1c86ed4
(master)
commit db27fee
(master and this pull)
*-aarch64-linux-gnu-debug.tar.gz 71f5654816f5a35c... d6e9bf66bba2782a...
*-aarch64-linux-gnu.tar.gz adb533108bc2de95... fe1bcad678950199...
*-arm-linux-gnueabihf-debug.tar.gz 975c9daeb62030b8... 4d064396ed266782...
*-arm-linux-gnueabihf.tar.gz e902ba09e1e9d51f... 68fb0c1fc4859885...
*-osx-unsigned.dmg dfcaf365fc46dabe... 6248290d52b7aac3...
*-osx64.tar.gz 7acbc6e831f8696f... 6912f3b083c18fda...
*-riscv64-linux-gnu-debug.tar.gz 201b5104da680bd4... af88d2ba34d0761e...
*-riscv64-linux-gnu.tar.gz f6f2294a3650d92c... ce431a06ccd6793b...
*-win64-debug.zip ae3961bf135bd458... dd69215a5c60c7c4...
*-win64-setup-unsigned.exe 67c888daf491beab... f886ee5140125b52...
*-win64.zip 837bd14c2e565cd5... 1d464977ea0198ea...
*-x86_64-linux-gnu-debug.tar.gz 32a4f05bd453974d... 6f99c5c686efa1e6...
*-x86_64-linux-gnu.tar.gz 57b5eaa2a09d25d5... df983e8167f8d643...
*.tar.gz 489c730a2311c3f9... 80cfb4e43f9532c1...
bitcoin-core-linux-0.21-res.yml 45c3b3d0f9edc6d7... 8dfdaa4f298ee6b8...
bitcoin-core-osx-0.21-res.yml c99a9d11f924f29a... 1168a4646f934eaf...
bitcoin-core-win-0.21-res.yml 77d208b4495b2806... 2a251996dfe25bc5...
linux-build.log 4f98f1d15c29efc1... edd8ad7ae56bf013...
osx-build.log 1b6e936377d5a5c8... 80b1b997ae2974ab...
win-build.log 204d319b4778596d... 97d1133acdacc518...
bitcoin-core-linux-0.21-res.yml.diff f7ca16512de62a3e...
bitcoin-core-osx-0.21-res.yml.diff afe94d217e9e0c87...
bitcoin-core-win-0.21-res.yml.diff 34bb8bbb058865b2...
linux-build.log.diff 6f3806aaa0f72089...
osx-build.log.diff 307335e3a59c6a20...
win-build.log.diff 5f7f0cf0e3e515bb...

@DrahtBot
Copy link
Contributor

Guix builds

File commit 39bd9dd
(master)
commit 4a67939
(master and this pull)
*-aarch64-linux-gnu-debug.tar.gz 4c1912c153974f87... 80f66912b5ed6d0b...
*-aarch64-linux-gnu.tar.gz 780c7f167a960754... a3062f046bce4a3b...
*-arm-linux-gnueabihf-debug.tar.gz 0cad6f3a3133faba... ea095d61062726f2...
*-arm-linux-gnueabihf.tar.gz 71702256e8ce3156... ed937ccbc2c386a2...
*-riscv64-linux-gnu-debug.tar.gz 56187e8f441798f7... dd7a495aa5a1724e...
*-riscv64-linux-gnu.tar.gz 0a1f2929cdadfce6... b1bd43cb1b2af06f...
*-win-unsigned.tar.gz dec92daf0b4d95f8... 4593275b2fb8d1e4...
*-win64-debug.zip 162f8fa6a60ef9d8... 2926c1b73d89860c...
*-win64-setup-unsigned.exe a344b796ddbe540b... 535f30749a1d8fde...
*-win64.zip 105d545a9a68e769... 5e24aed0064fbee2...
*-x86_64-linux-gnu-debug.tar.gz 200b108338af6d7d... 7ac7f205be947fcf...
*-x86_64-linux-gnu.tar.gz b15858c60bc28da6... 896ab8283795b1bc...
*.tar.gz 309c9ce47a261345... 255eeac41c15256b...
guix_build.log 6e58047db2c64199... 8540516d3cfccac1...
guix_build.log.diff 84589bbbf1e90ee9...

Copy link
Member

@fanquake fanquake left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Concept ACK - This looks pretty good, and is a nice simplification. This should be a no-op for most platforms, besides some reordering of package checks in configure. Obviously Windows is different, and after this PR, should be full pkg-config. This is the main difference I'm seeing in config.log:

# libevent
-EVENT_CFLAGS=''
-EVENT_LIBS='-levent'
+EVENT_CFLAGS='-I/bitcoin/depends/x86_64-w64-mingw32/include'
+EVENT_LIBS='-L/bitcoin/depends/x86_64-w64-mingw32/lib -levent -lws2_32'
# qrencode
-QR_CFLAGS=''
-QR_LIBS='-lqrencode'
+QR_CFLAGS='-I/bitcoin/depends/x86_64-w64-mingw32/include'
+QR_LIBS='-L/bitcoin/depends/x86_64-w64-mingw32/lib -lqrencode -lpthread'
# zeromq
-ZMQ_CFLAGS=' -DZMQ_STATIC'
-ZMQ_LIBS='-lzmq'
+ZMQ_CFLAGS='-I/bitcoin/depends/x86_64-w64-mingw32/include -DZMQ_STATIC'
+ZMQ_LIBS='-L/bitcoin/depends/x86_64-w64-mingw32/lib -lzmq -liphlpapi -lpthread'

liphlpapi was added to libzmqs PKGCFG_LIBS_PRIVATE, when static linking, in zeromq/libzmq#2787.

@hebasto hebasto force-pushed the 20200309-pkgconfig branch from a4535bf to 5bfb563 Compare June 22, 2020 08:24
@hebasto hebasto force-pushed the 20200309-pkgconfig branch from 5bfb563 to 4e006b6 Compare June 22, 2020 08:33
@hebasto
Copy link
Member Author

hebasto commented Jun 22, 2020

Updated a4535bf -> 4e006b6 (pr18307.03 -> pr18307.05, diff):

Was removing the version checking for libevent_pthreads intentional?

@hebasto hebasto closed this Jun 22, 2020
@hebasto hebasto reopened this Jun 22, 2020
@hebasto hebasto force-pushed the 20200309-pkgconfig branch from 4e006b6 to 92bc268 Compare June 23, 2020 06:04
@hebasto
Copy link
Member Author

hebasto commented Jun 23, 2020

Updated 4e006b6 -> 92bc268 (pr18307.05 -> pr18307.06, diff):

@laanwj
Copy link
Member

laanwj commented Jul 2, 2020

ACK 92bc268
Changes look correct, and I checked that there are no remaining matches for use_pkgconfig after this.

if test "x$use_zmq" = xyes; then
dnl Assume libzmq was built for static linking
case $host in
*mingw*)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's somewhat unfortunate that this mingw-specific workaround is still ncessary, that the required flag is not passed in through the pkgconfig file in the case of a static build. But I suppose this is an upstream issue.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Related to #8238.

Copy link
Member

@fanquake fanquake left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ACK 92bc268. I re-gitian-built. There are a couple follow-ups that I'll PR shortly. Thanks for addressing my feedback above. I took too long to get back to this.

@fanquake fanquake merged commit 7d9008f into bitcoin:master Jul 3, 2020
@hebasto hebasto deleted the 20200309-pkgconfig branch July 3, 2020 08:27
@bitcoin bitcoin locked as resolved and limited conversation to collaborators Feb 15, 2022
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants