DEB_DEPENDS += libssl-dev
DEB_DEPENDS += libelf-dev # for libbpf (af_xdp)
DEB_DEPENDS += iperf3 # for 'make test TEST=vcl'
+DEB_DEPENDS += nasm
LIBFFI=libffi6 # works on all but 20.04 and debian-testing
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
@rm -rf $(B) $(I)
.PHONY: install
-install: $(if $(ARCH_X86_64), nasm-install ipsec-mb-install) dpdk-install rdma-core-install quicly-install libbpf-install
+install: $(if $(ARCH_X86_64), ipsec-mb-install) dpdk-install rdma-core-install quicly-install libbpf-install
.PHONY: config
-config: $(if $(ARCH_X86_64), nasm-config ipsec-mb-config) dpdk-config rdma-core-config quicly-build
+config: $(if $(ARCH_X86_64), ipsec-mb-config) dpdk-config rdma-core-config quicly-build
##############################################################################
# .deb packaging
ipsec-mb_tarball_md5sum := $(ipsec-mb_tarball_md5sum_$(ipsec-mb_version))
ipsec-mb_tarball_strip_dirs := 1
ipsec-mb_url := http://github.com/01org/intel-ipsec-mb/archive/$(ipsec-mb_tarball)
-ipsec-mb_depends := nasm
define ipsec-mb_config_cmds
@true
SAFE_LOOKUP=n \
SAFE_DATA=n \
PREFIX=$(ipsec-mb_install_dir) \
- NASM=$(ipsec-mb_install_dir)/bin/nasm \
EXTRA_CFLAGS="-g -msse4.2" > $(ipsec-mb_build_log)
endef
+++ /dev/null
-# Copyright (c) 2018 Cisco and/or its affiliates.
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at:
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-nasm_version := 2.14.02
-nasm_tarball := nasm-$(nasm_version).tar.xz
-nasm_tarball_md5sum := 6390bd67b07ff1df9fe628b6929c0353
-nasm_tarball_strip_dirs := 1
-nasm_url := https://ftp.osuosl.org/pub/blfs/conglomeration/nasm/$(nasm_tarball)
-nasm_cflags := -Wno-implicit-fallthrough -std=c11
-
-$(eval $(call package,nasm))
+++ /dev/null
-diff --git a/Makefile b/Makefile
-index 329da9f..c7fa8ad 100644
---- a/Makefile
-+++ b/Makefile
-@@ -51,7 +51,7 @@ YASM ?= yasm
- NASM ?= nasm
-
- # Detect NASM version (minimum version required: 2.14)
--NASM_VERSION = $(shell nasm -v | cut -d " " -f 3)
-+NASM_VERSION = $(shell $(NASM) -v | cut -d " " -f 3)
-
- NASM_MAJOR_REQ = 2
- NASM_MINOR_REQ = 14
+++ /dev/null
-diff --git a/lib/Makefile b/lib/Makefile
-index 3831172..9ce6f4c 100644
---- a/lib/Makefile
-+++ b/lib/Makefile
-@@ -51,7 +51,7 @@ YASM ?= yasm
- NASM ?= nasm
-
- # Detect NASM version (minimum version required: 2.14)
--NASM_VERSION = $(shell nasm -v | cut -d " " -f 3)
-+NASM_VERSION = $(shell $(NASM) -v | cut -d " " -f 3)
-
- NASM_MAJOR_REQ = 2
- NASM_MINOR_REQ = 14