Skip to content

Commit

Permalink
Merge bitcoin#30754: misc: Autotools -> CMake changes
Browse files Browse the repository at this point in the history
a865494 lint: remove autotools packages (fanquake)
b02f29e doc: replace Autotools with CMake (fanquake)

Pull request description:

  These don't seem to be included in, i.e bitcoin#30664.

ACKs for top commit:
  maflcko:
    lgtm ACK a865494
  hebasto:
    re-ACK a865494.

Tree-SHA512: bafa2675d7c819478fb9b3f44f557ec767acb8fa3c4a191b1b8a1e47352a4cb6cebbb3138d961058d846926359f5451241a8badcbe3edd7e067d69ecfc45df93
  • Loading branch information
fanquake committed Aug 29, 2024
2 parents 1e48238 + a865494 commit ffdc3d6
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 5 deletions.
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ the pull request affects. Valid areas as:
- `test`, `qa` or `ci` for changes to the unit tests, QA tests or CI code
- `util` or `lib` for changes to the utils or libraries
- `wallet` for changes to the wallet code
- `build` for changes to the GNU Autotools or MSVC builds
- `build` for changes to CMake
- `guix` for changes to the GUIX reproducible builds

Examples:
Expand Down
3 changes: 1 addition & 2 deletions ci/lint/04_install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,10 @@ pushd "/"

${CI_RETRY_EXE} apt-get update
# Lint dependencies:
# - automake pkg-config libtool (for lint_includes_build_config)
# - curl/xz-utils (to install shellcheck)
# - git (used in many lint scripts)
# - gpg (used by verify-commits)
${CI_RETRY_EXE} apt-get install -y automake pkg-config libtool curl xz-utils git gpg
${CI_RETRY_EXE} apt-get install -y curl xz-utils git gpg

PYTHON_PATH="/python_build"
if [ ! -d "${PYTHON_PATH}/bin" ]; then
Expand Down
3 changes: 1 addition & 2 deletions doc/dependencies.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,8 @@ You can find installation instructions in the `build-*.md` file for your platfor

| Dependency | Minimum required |
| --- | --- |
| [Autoconf](https://www.gnu.org/software/autoconf/) | [2.69](https://github.com/bitcoin/bitcoin/pull/17769) |
| [Automake](https://www.gnu.org/software/automake/) | [1.13](https://github.com/bitcoin/bitcoin/pull/18290) |
| [Clang](https://clang.llvm.org) | [16.0](https://github.com/bitcoin/bitcoin/pull/30263) |
| [CMake](https://cmake.org/) | [3.22](https://github.com/bitcoin/bitcoin/pull/30454) |
| [GCC](https://gcc.gnu.org) | [11.1](https://github.com/bitcoin/bitcoin/pull/29091) |
| [Python](https://www.python.org) (scripts, tests) | [3.9](https://github.com/bitcoin/bitcoin/pull/28211) |
| [systemtap](https://sourceware.org/systemtap/) ([tracing](tracing.md))| N/A |
Expand Down

0 comments on commit ffdc3d6

Please sign in to comment.