Skip to content

Commit ffdc3d6

Browse files
committed
Merge bitcoin#30754: misc: Autotools -> CMake changes
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
2 parents 1e48238 + a865494 commit ffdc3d6

File tree

3 files changed

+3
-5
lines changed

3 files changed

+3
-5
lines changed

CONTRIBUTING.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ the pull request affects. Valid areas as:
153153
- `test`, `qa` or `ci` for changes to the unit tests, QA tests or CI code
154154
- `util` or `lib` for changes to the utils or libraries
155155
- `wallet` for changes to the wallet code
156-
- `build` for changes to the GNU Autotools or MSVC builds
156+
- `build` for changes to CMake
157157
- `guix` for changes to the GUIX reproducible builds
158158

159159
Examples:

ci/lint/04_install.sh

+1-2
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,10 @@ pushd "/"
1212

1313
${CI_RETRY_EXE} apt-get update
1414
# Lint dependencies:
15-
# - automake pkg-config libtool (for lint_includes_build_config)
1615
# - curl/xz-utils (to install shellcheck)
1716
# - git (used in many lint scripts)
1817
# - gpg (used by verify-commits)
19-
${CI_RETRY_EXE} apt-get install -y automake pkg-config libtool curl xz-utils git gpg
18+
${CI_RETRY_EXE} apt-get install -y curl xz-utils git gpg
2019

2120
PYTHON_PATH="/python_build"
2221
if [ ! -d "${PYTHON_PATH}/bin" ]; then

doc/dependencies.md

+1-2
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,8 @@ You can find installation instructions in the `build-*.md` file for your platfor
66

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

0 commit comments

Comments
 (0)