ligang/vpp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

build: fix the build on centos8

Browse Source 
Add missing dependencies and correct the building to support CentOS8

Type: make

Change-Id: Ie15b9b1174fa9b6d5ae02bace36ebc77e17d770c
Signed-off-by: Yichen Wang <yicwang@cisco.com>
This commit is contained in:
Yichen Wang
2020-06-08 17:13:01 -07:00
committed by Benoît Ganne
parent 47ea4c35fe
commit 81355d74a4
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Makefile
View File

@ -105,6 +105,8 @@ RPM_DEPENDS += selinux-policy selinux-policy-devel
RPM_DEPENDS += ninja-build RPM_DEPENDS += ninja-build
RPM_DEPENDS += libuuid-devel RPM_DEPENDS += libuuid-devel
RPM_DEPENDS += mbedtls-devel RPM_DEPENDS += mbedtls-devel
RPM_DEPENDS += ccache
RPM_DEPENDS += xmlto
ifeq ($(OS_ID),fedora) ifeq ($(OS_ID),fedora)
RPM_DEPENDS += dnf-utils RPM_DEPENDS += dnf-utils
@ -118,7 +120,7 @@ ifeq ($(OS_ID),fedora)
else ifeq ($(OS_ID)-$(OS_VERSION_ID),centos-8) else ifeq ($(OS_ID)-$(OS_VERSION_ID),centos-8)
RPM_DEPENDS += yum-utils RPM_DEPENDS += yum-utils
RPM_DEPENDS += compat-openssl10 RPM_DEPENDS += compat-openssl10
RPM_DEPENDS += python36-devel python3-ply RPM_DEPENDS += python2-devel python36-devel python3-ply
RPM_DEPENDS += python3-virtualenv python3-jsonschema RPM_DEPENDS += python3-virtualenv python3-jsonschema
RPM_DEPENDS += cmake RPM_DEPENDS += cmake
RPM_DEPENDS_GROUPS = 'Development Tools' RPM_DEPENDS_GROUPS = 'Development Tools'
@ -318,6 +320,8 @@ ifeq ($(OS_ID),rhel)
@sudo -E yum install $(CONFIRM) $(RPM_DEPENDS) @sudo -E yum install $(CONFIRM) $(RPM_DEPENDS)
@sudo -E debuginfo-install $(CONFIRM) glibc openssl-libs mbedtls-devel zlib @sudo -E debuginfo-install $(CONFIRM) glibc openssl-libs mbedtls-devel zlib
else ifeq ($(OS_ID)-$(OS_VERSION_ID),centos-8) else ifeq ($(OS_ID)-$(OS_VERSION_ID),centos-8)
@sudo -E dnf install $(CONFIRM) epel-release
@sudo -E dnf config-manager --set-enabled PowerTools
@sudo -E dnf groupinstall $(CONFIRM) $(RPM_DEPENDS_GROUPS) @sudo -E dnf groupinstall $(CONFIRM) $(RPM_DEPENDS_GROUPS)
@sudo -E dnf install $(CONFIRM) $(RPM_DEPENDS) @sudo -E dnf install $(CONFIRM) $(RPM_DEPENDS)
else ifeq ($(OS_ID),centos) else ifeq ($(OS_ID),centos)