From 494e05b3263012c10ae5e4eb09e52014c7c6d0e9 Mon Sep 17 00:00:00 2001 From: Geza Lore Date: Sun, 17 Mar 2024 12:10:13 +0000 Subject: [PATCH] Fix install instructions for attribute checks, do the same in CI (#4995) On Ubuntu 22.04, pip install clang picks up a mismatched version by default. There are 'apt' packages with correct dependencies, so use those instead. --- ci/ci-install.bash | 5 ++--- docs/guide/install.rst | 4 ++-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/ci/ci-install.bash b/ci/ci-install.bash index 92be51a80..98adb30b3 100755 --- a/ci/ci-install.bash +++ b/ci/ci-install.bash @@ -96,9 +96,8 @@ elif [ "$CI_BUILD_STAGE_NAME" = "test" ]; then sudo apt-get install gdb gtkwave lcov libfl-dev ccache # Required for test_regress/t/t_dist_attributes.pl if [ "$CI_RUNS_ON" = "ubuntu-22.04" ]; then - sudo apt-get install libclang-dev mold || - sudo apt-get install libclang-dev mold - pip3 install clang==14.0 + sudo apt-get install python3-clang mold || + sudo apt-get install python3-clang mold fi if [ "$CI_RUNS_ON" = "ubuntu-20.04" ] || [ "$CI_RUNS_ON" = "ubuntu-22.04" ]; then sudo apt-get install libsystemc-dev || diff --git a/docs/guide/install.rst b/docs/guide/install.rst index d1518e6d7..7b8d3f834 100644 --- a/docs/guide/install.rst +++ b/docs/guide/install.rst @@ -126,8 +126,8 @@ Those developing Verilator itself may also want these (see internals.rst): :: sudo apt-get install clang clang-format-14 cmake gdb gprof graphviz lcov - sudo apt-get install libclang-dev yapf3 bear - sudo pip3 install clang sphinx sphinx_rtd_theme sphinxcontrib-spelling breathe ruff + sudo apt-get install python3-clang yapf3 bear + sudo pip3 install sphinx sphinx_rtd_theme sphinxcontrib-spelling breathe ruff cpan install Pod::Perldoc cpan install Parallel::Forker