Skip to content
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.

Sign up for GitHub

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

Jump to bottom

cmake: Regular rebasing of the cmake-staging branch #85

Closed
wants to merge 54 commits into from
Closed

cmake: Regular rebasing of the cmake-staging branch #85

wants to merge 54 commits into from

Conversation

hebasto
Copy link
Owner

@hebasto hebasto commented Jan 26, 2024 •
edited
Loading

This is the cmake-staging branch rebased on the recent bitcoin/master one with the squashed "!fixup" commits.

Steps to reproduce:

  1. Apply the git rebase -i --autosquash fa2bcf627b8866031cd62d0a2d3ced57b17442a8 command (there is a conflict, which can be resolved by removing the .github/workflows/ci.yml file).
  2. Reorder the recent commit to bury Qt stuff deeper and pop up CI one.

A note regarding bitcoin#28875. No extra steps for backporting that PR are needed. As it was pointed earlier, it "just works":

$ cmake -B build -DFUZZ=ON -DSANITIZERS=fuzzer -DCMAKE_C_COMPILER=clang-13 -DCMAKE_CXX_COMPILER=clang++-13 -DWITH_GUI=OFF
$ cmake --build build -j $(nproc)
$ objdump --disassemble=secp256k1_xonly_pubkey_serialize build/src/test/fuzz/fuzz | grep __sanitizer_cov
  da33a1:	e8 1a b9 b7 ff       	call   91ecc0 <__sanitizer_cov_trace_const_cmp8>
  da351e:	e8 ad b6 b7 ff       	call   91ebd0 <__sanitizer_cov_trace_pc_indir>
  da3548:	e8 83 b6 b7 ff       	call   91ebd0 <__sanitizer_cov_trace_pc_indir>
  da3576:	e8 55 b6 b7 ff       	call   91ebd0 <__sanitizer_cov_trace_pc_indir>

Known Bugs

Unfortunately, due to a silent conflict between #43 and #77, providing -DFUZZ=ON does not disable the bitcoin-qt target. It will be fixed shortly after pushing this branch.

hebasto and others added 30 commits January 26, 2024 20:45
@hebasto
cmake: Add root CMakeLists.txt file
808405b
@hebasto
cmake: Introduce core_interface library to encapsulate common flags
04a5574 
Also add a sanity check for non-encapsulated (directory-wide) build
properties.
@hebasto
cmake: Add config/bitcoin-config.h support
ef46525
@hebasto
cmake: Add cmake/introspection.cmake file
167d636
@hebasto
cmake: Check system headers
46f9976
@hebasto @theuni @vasild
cmake: Check system symbols
4198109 
Co-authored-by: Cory Fields <cory-nospam-@coryfields.com>
Co-authored-by: Vasil Dimov <vd@FreeBSD.org>
@hebasto
cmake: Check compiler features
45e5703
@hebasto
cmake: Add position independent code support
f9b77c2
@hebasto
cmake: Add platform-specific definitions and properties
bf49c00
@hebasto
cmake: Build crc32c static library
a42812d
@hebasto @theuni
cmake: Build leveldb static library
4d7d8ce 
Co-authored-by: Cory Fields <cory-nospam-@coryfields.com>
@hebasto
cmake: Build minisketch static library
645ef5c
@hebasto
cmake: Build secp256k1 static library
2aea4c7
@hebasto
cmake: Build univalue static library
a7d77ce
@hebasto
cmake: Build bitcoin_crypto library
07de39a
@hebasto
cmake: Build bitcoin_util static library
5dc636d
@hebasto
cmake: Build bitcoin_consensus library
ce4704f
@hebasto
cmake: Build bitcoind executable
bab0c4b
@hebasto
build: Generate share/toolchain.cmake in depends
14c8d0c
@hebasto
cmake: Add cross-compiling support
e3343c5 
To configure CMake for cross-compiling, use
`--toolchain depends/${HOST}/share/toolchain.cmake` command-line option.
@hebasto
cmake: Add TristateOption module
139e93f
@hebasto
cmake: Add ccache support
47e8cbb
@hebasto
cmake: Add libnatpmp optional package support
8bf90f1
@hebasto
cmake: Add libminiupnpc optional package support
fe33e45
@hebasto
cmake: Add libzmq optional package support
9cc5aef
@hebasto
cmake: Add systemtap-sdt optional package support
02dfd4f
@hebasto
cmake: Build bitcoin-cli executable
9121b19
@hebasto
cmake: Build bitcoin-tx executable
78a3b07
@hebasto
cmake: Build bitcoin-util executable
b922364
@hebasto
cmake: Add wallet functionality
70d209a
hebasto added 23 commits January 26, 2024 20:45
@hebasto
cmake: Build bench_bitcoin executable
a6832f5
@hebasto
cmake: Build test_bitcoin executable
4f3cfc5
@hebasto
cmake: Include CTest
01a1698
@hebasto
cmake: Add TryAppendCXXFlags module
addd4d0
@hebasto
cmake: Add TryAppendLinkerFlag module
6777841
@hebasto
cmake: Add platform-specific compiler flags
60a8b9b
@hebasto
cmake: Add platform-specific linker flags
0c644e1
@hebasto
cmake: Redefine configuration flags
dc14aeb
@hebasto
cmake: Add general compile options
ba13c30
@hebasto
cmake: Add HARDENING option
009f850
@hebasto
cmake: Add REDUCE_EXPORTS option
f120976
@hebasto
cmake: Add WERROR option
effb7fd
@hebasto
cmake: Implement make install
9ce1918
@hebasto
cmake: Generate obj/build.h header
65fb358
@hebasto
cmake: Add GenerateBuildInfo.cmake script
38d0fa9
@hebasto
Revert "build, qt: Do not install *.prl files"
a2d5167 
This reverts commit 1155978.
@hebasto
cmake: Build bitcoin-qt executable
042ff40
@hebasto
cmake: Add SANITIZERS option
1e6440a
@hebasto
cmake: Add fuzzing options
d16f4a0
@hebasto
cmake: Add Maintenance module
1e3dae6
@hebasto
cmake: Migrate Guix build scripts to CMake
25fb8c4
@hebasto
cmake: Add vcpkg manifest file
a7b61a4
@hebasto
ci: Test CMake edge cases
dacc6f7 
Keep this commit at the top when rebasing.
@hebasto
Copy link
Owner Author

hebasto commented Jan 26, 2024

Friendly ping @TheCharlatan @theuni @pablomartin4btc @m3dwards @stickies-v @vasild :)

TheCharlatan
TheCharlatan approved these changes Jan 27, 2024
View reviewed changes
Copy link

@TheCharlatan TheCharlatan left a comment

Choose a reason for hiding this comment

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

ACK

@hebasto
Copy link
Owner Author

hebasto commented Jan 27, 2024

@TheCharlatan

Thank you for your review!

This branch has been force pushed into the https://github.com/hebasto/bitcoin/tree/cmake-staging.

Closing.

@hebasto hebasto closed this Jan 27, 2024
@hebasto hebasto mentioned this pull request Jan 27, 2024
Merged
hebasto added a commit that referenced this pull request Jan 29, 2024
@hebasto
Merge #87: cmake: Bug fixes
1f41cc3 
63c1bb5 fixup! cmake: Add fuzzing options (Hennadii Stepanov)
d31abc2 fixup! ci: Test CMake edge cases (Hennadii Stepanov)

Pull request description:

  From #85 (comment):
  > **Known Bugs**
  >
  > Unfortunately, due to a silent conflict between #43 and #77, providing `-DFUZZ=ON` does not disable the `bitcoin-qt` target. It will be fixed shortly after pushing this branch.

  Fixed.

ACKs for top commit:
  vasild:
    ACK 63c1bb5

Tree-SHA512: b3cc2889d0239913de64c170880c97b37966a890d8c4e05f9090485a016b7f9cdf4880d770a234f323d3191b9adda8ed0343c29dfa49b5bb99b0b54481d4335e
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@TheCharlatan TheCharlatan TheCharlatan approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@hebasto @TheCharlatan