X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=build%2Fexternal%2FMakefile;h=55443b0c6c9da86e922d917f1926fc10d97c6140;hb=c06d660aba34fc9c309af3204fe2cf2fa6619134;hp=e5dff3c43e5efd84553feac83eb715207700ae1a;hpb=b25284832656dc8671fa8e1dc62ce78bb50f7394;p=vpp.git diff --git a/build/external/Makefile b/build/external/Makefile index e5dff3c43e5..55443b0c6c9 100644 --- a/build/external/Makefile +++ b/build/external/Makefile @@ -33,22 +33,25 @@ else CMAKE?=cmake endif +ARCH_X86_64=$(filter x86_64,$(shell uname -m)) + include packages.mk include packages/nasm.mk include packages/ipsec-mb.mk include packages/quicly.mk include packages/dpdk.mk include packages/rdma-core.mk +include packages/libbpf.mk .PHONY: clean clean: @rm -rf $(B) $(I) .PHONY: install -install: dpdk-install rdma-core-install quicly-install +install: $(if $(ARCH_X86_64), nasm-install ipsec-mb-install) dpdk-install rdma-core-install quicly-install libbpf-install .PHONY: config -config: dpdk-config rdma-core-config +config: $(if $(ARCH_X86_64), nasm-config ipsec-mb-config) dpdk-config rdma-core-config quicly-build ############################################################################## # .deb packaging @@ -103,7 +106,7 @@ endif RPM_VER := $(PKG_VERSION) RPM_ARCH=$(shell rpm --eval "%{_arch}" 2> /dev/null) DEV_RPM=vpp-ext-deps-$(RPM_VER)-$(PKG_SUFFIX).$(RPM_ARCH).rpm -INSTALLED_RPM_VER=$(shell rpm -q --queryformat '%{VERSION}-%{RELEASE}' vpp-ext-deps 2> /dev/null | grep -v "not inst") +INSTALLED_RPM_VER=$(shell rpm -q --queryformat '%{VERSION}-%{RELEASE}' vpp-ext-deps 2> /dev/null | grep -v "vpp-ext-deps") .PHONY: build-rpm install-rpm check-rpm