Code Review
/
vpp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
VCL: Add SET_KEEPALIVE, SET_TCP_KEEPIDLE, and SET_TCP_KEEPINTVL
[vpp.git]
/
Makefile
diff --git
a/Makefile
b/Makefile
index
dbd2fc2
..
aef879c
100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-58,24
+58,35
@@
endif
# +libganglia1-dev if building the gmond plugin
# +libganglia1-dev if building the gmond plugin
-DEB_DEPENDS = curl build-essential autoconf automake bison
libssl-dev
ccache
+DEB_DEPENDS = curl build-essential autoconf automake bison ccache
DEB_DEPENDS += debhelper dkms git libtool libapr1-dev dh-systemd
DEB_DEPENDS += libconfuse-dev git-review exuberant-ctags cscope pkg-config
DEB_DEPENDS += debhelper dkms git libtool libapr1-dev dh-systemd
DEB_DEPENDS += libconfuse-dev git-review exuberant-ctags cscope pkg-config
-DEB_DEPENDS += lcov chrpath autoconf nasm indent libnuma-dev
+DEB_DEPENDS += lcov chrpath autoconf nasm indent
clang-format
libnuma-dev
DEB_DEPENDS += python-all python-dev python-virtualenv python-pip libffi6 check
ifeq ($(OS_VERSION_ID),14.04)
DEB_DEPENDS += openjdk-8-jdk-headless
DEB_DEPENDS += python-all python-dev python-virtualenv python-pip libffi6 check
ifeq ($(OS_VERSION_ID),14.04)
DEB_DEPENDS += openjdk-8-jdk-headless
+ DEB_DEPENDS += libssl-dev
else ifeq ($(OS_ID)-$(OS_VERSION_ID),debian-8)
DEB_DEPENDS += openjdk-8-jdk-headless
else ifeq ($(OS_ID)-$(OS_VERSION_ID),debian-8)
DEB_DEPENDS += openjdk-8-jdk-headless
+ DEB_DEPENDS += libssl-dev
APT_ARGS = -t jessie-backports
APT_ARGS = -t jessie-backports
-else
+else ifeq ($(OS_ID)-$(OS_VERSION_ID),debian-9)
+ DEB_DEPENDS += default-jdk-headless
+ DEB_DEPENDS += libssl1.0-dev
+else
DEB_DEPENDS += default-jdk-headless
DEB_DEPENDS += default-jdk-headless
+ DEB_DEPENDS += libssl-dev
endif
RPM_DEPENDS = redhat-lsb glibc-static java-1.8.0-openjdk-devel yum-utils
RPM_DEPENDS += apr-devel
RPM_DEPENDS += numactl-devel
RPM_DEPENDS += check
endif
RPM_DEPENDS = redhat-lsb glibc-static java-1.8.0-openjdk-devel yum-utils
RPM_DEPENDS += apr-devel
RPM_DEPENDS += numactl-devel
RPM_DEPENDS += check
+
+ifeq ($(filter centos,$(OS_ID)),$(OS_ID))
+ RPM_DEPENDS += check-devel subunit subunit-devel
+endif
+
ifeq ($(OS_ID)-$(OS_VERSION_ID),fedora-25)
RPM_DEPENDS += openssl-devel
RPM_DEPENDS += python-devel
ifeq ($(OS_ID)-$(OS_VERSION_ID),fedora-25)
RPM_DEPENDS += openssl-devel
RPM_DEPENDS += python-devel
@@
-102,14
+113,16
@@
else ifeq ($(findstring y,$(AESNI)),y)
RPM_DEPENDS += https://kojipkgs.fedoraproject.org//packages/nasm/2.12.02/2.fc26/x86_64/nasm-2.12.02-2.fc26.x86_64.rpm
endif
RPM_DEPENDS += https://kojipkgs.fedoraproject.org//packages/nasm/2.12.02/2.fc26/x86_64/nasm-2.12.02-2.fc26.x86_64.rpm
endif
-RPM_SUSE_DEPENDS = autoconf automake bison ccache ch
rpath
distribution-release gcc6 glibc-devel-static
-RPM_SUSE_DEPENDS += java-1_8_0-openjdk-devel
libopenssl-devel libtool lsb-release
make openssl-devel
-RPM_SUSE_DEPENDS += python-devel python-pip python-rpm-macros shadow
nasm libnuma-devel python3
+RPM_SUSE_DEPENDS = autoconf automake bison ccache ch
eck-devel chrpath clang
distribution-release gcc6 glibc-devel-static
+RPM_SUSE_DEPENDS += java-1_8_0-openjdk-devel
indent libopenssl-devel libtool
make openssl-devel
+RPM_SUSE_DEPENDS += python-devel python-pip python-rpm-macros shadow
libnuma-devel rpm-build
-ifeq ($(filter rhel centos,$(OS_ID)),$(OS_ID))
- RPM_DEPENDS += python34
+ifeq ($(OS_ID),opensuse)
+ifeq ($(findstring y,$(AESNI)),y)
+ RPM_SUSE_DEPENDS += https://download.opensuse.org/tumbleweed/repo/oss/suse/x86_64/nasm-2.13.01-2.1.x86_64.rpm
else
else
- RPM_DEPENDS += python3
+ RPM_SUSE_DEPENDS += nasm
+endif
endif
ifneq ($(wildcard $(STARTUP_DIR)/startup.conf),)
endif
ifneq ($(wildcard $(STARTUP_DIR)/startup.conf),)
@@
-264,9
+277,10
@@
else ifneq ("$(wildcard /etc/redhat-release)","")
@sudo -E yum install $(CONFIRM) $(RPM_DEPENDS)
@sudo -E debuginfo-install $(CONFIRM) glibc openssl-libs zlib
else ifeq ($(filter opensuse,$(OS_ID)),$(OS_ID))
@sudo -E yum install $(CONFIRM) $(RPM_DEPENDS)
@sudo -E debuginfo-install $(CONFIRM) glibc openssl-libs zlib
else ifeq ($(filter opensuse,$(OS_ID)),$(OS_ID))
- @sudo -E zypper -n install -y $(RPM_SUSE_DEPENDS)
+ @sudo -E zypper refresh
+ @sudo -E zypper install -y $(RPM_SUSE_DEPENDS)
else
else
- $(error "This option currently works only on Ubuntu, Debian
or Centos
systems")
+ $(error "This option currently works only on Ubuntu, Debian
, Centos or openSUSE
systems")
endif
define make
endif
define make
@@
-339,6
+353,7
@@
define test
LD_LIBRARY_PATH=$(call libexpand,$(libs),$(2),) \
EXTENDED_TESTS=$(EXTENDED_TESTS) \
PYTHON=$(PYTHON) \
LD_LIBRARY_PATH=$(call libexpand,$(libs),$(2),) \
EXTENDED_TESTS=$(EXTENDED_TESTS) \
PYTHON=$(PYTHON) \
+ OS_ID=$(OS_ID) \
$(3)
endef
$(3)
endef
@@
-507,7
+522,7
@@
endif
$(call banner,"Building $(PKG) packages")
@make pkg-$(PKG)
ifeq ($(OS_ID)-$(OS_VERSION_ID),ubuntu-16.04)
$(call banner,"Building $(PKG) packages")
@make pkg-$(PKG)
ifeq ($(OS_ID)-$(OS_VERSION_ID),ubuntu-16.04)
- @make COMPRESS_FAILED_TEST_LOGS=yes test
+ @make COMPRESS_FAILED_TEST_LOGS=yes
RETRIES=3
test
endif
endif