diff options
| author |   Dave Wallace <dwallacelf@gmail.com> | 2021-11-12 18:25:32 -0500 |
|---|---|---|
| committer |   Andrew Yourtchenko <ayourtch@gmail.com> | 2021-11-16 18:16:12 +0000 |
| commit | 719d5602080cdf9839d4699d8e22c6968aac8adf (patch) | |
| tree | fe1bbf220b810dc6cd1b8419d11eb5ba247f3d8f | |
| parent | ae5609721b5eaf245f3f0b797ef45459320088c6 (diff) | |
build: upgrade to enchant-2
- Remove enchant from RPM builds since docs are
generated on ubuntu-20.04 in CI jobs.
- Clean up DEB_DEPENDS copy-pasta
- Add clang-11 for newest Ubuntu/Debian OS
variants
Type: docs
Signed-off-by: Dave Wallace <dwallacelf@gmail.com>
Change-Id: I802f0b356bd412dbc23ee98d209f7cc3ab24ba4c
| -rw-r--r-- | Makefile | 18 |
1 files changed, 9 insertions, 9 deletions
@@ -73,6 +73,9 @@ DEB_DEPENDS += python3-venv # ensurepip DEB_DEPENDS += python3-dev # needed for python3 -m pip install psutil DEB_DEPENDS += libnl-3-dev libnl-route-3-dev DEB_DEPENDS += enchant # for docs +DEB_DEPENDS += python3-virtualenv +DEB_DEPENDS += libssl-dev +DEB_DEPENDS += libelf-dev # for libbpf (af_xdp) LIBFFI=libffi6 # works on all but 20.04 and debian-testing @@ -84,22 +87,20 @@ ifeq ($(OS_VERSION_ID),20.04) # when clang-format-10 is removed DEB_DEPENDS += clang-11 clang-format-11 clang-format-10 LIBFFI=libffi7 + DEB_DEPENDS += enchant-2 # for docs else ifeq ($(OS_VERSION_ID),20.10) - DEB_DEPENDS += python3-virtualenv - DEB_DEPENDS += libssl-dev - DEB_DEPENDS += libelf-dev # for libbpf (af_xdp) # TODO: change CLANG_FORMAT_VER default in extras/scripts/checkstyle.sh # when clang-format-10 is removed DEB_DEPENDS += clang-11 clang-format-11 clang-format-10 LIBFFI=libffi8ubuntu1 else ifeq ($(OS_ID)-$(OS_VERSION_ID),debian-10) - DEB_DEPENDS += python3-virtualenv virtualenv - DEB_DEPENDS += libssl-dev - DEB_DEPENDS += libelf-dev # for libbpf (af_xdp) + DEB_DEPENDS += virtualenv else - DEB_DEPENDS += libssl-dev - DEB_DEPENDS += libelf-dev # for libbpf (af_xdp) + # TODO: change CLANG_FORMAT_VER default in extras/scripts/checkstyle.sh + # when clang-format-10 is removed + DEB_DEPENDS += clang-11 clang-format-11 clang-format-10 LIBFFI=libffi7 + DEB_DEPENDS += enchant-2 # for docs endif DEB_DEPENDS += $(LIBFFI) @@ -116,7 +117,6 @@ RPM_DEPENDS += ccache RPM_DEPENDS += xmlto RPM_DEPENDS += elfutils-libelf-devel RPM_DEPENDS += libnl3-devel -RPM_DEPENDS += enchant # for docs ifeq ($(OS_ID),fedora) RPM_DEPENDS += dnf-utils |