X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=Makefile;h=432922d327374f7c580adccca961b6906b60ea21;hb=refs%2Fchanges%2F57%2F17957%2F9;hp=a1665c8956a0b71748171cb0dd642886b71b974c;hpb=4e633e1043e867fd24badeb0405f794793beb9a9;p=vpp.git diff --git a/Makefile b/Makefile index a1665c8956a..432922d3273 100644 --- a/Makefile +++ b/Makefile @@ -86,6 +86,7 @@ RPM_DEPENDS += boost boost-devel RPM_DEPENDS += selinux-policy selinux-policy-devel RPM_DEPENDS += ninja-build RPM_DEPENDS += libuuid-devel +RPM_DEPENDS += mbedtls-devel ifeq ($(OS_ID),fedora) RPM_DEPENDS += dnf-utils @@ -93,13 +94,13 @@ ifeq ($(OS_ID),fedora) RPM_DEPENDS += compat-openssl10-devel RPM_DEPENDS += python2-devel python34-ply RPM_DEPENDS += python2-virtualenv - RPM_DEPENDS += mbedtls-devel RPM_DEPENDS += cmake RPM_DEPENDS_GROUPS = 'C Development Tools and Libraries' else RPM_DEPENDS += yum-utils RPM_DEPENDS += openssl-devel RPM_DEPENDS += python-devel python34-ply + RPM_DEPENDS += python34-devel python34-pip RPM_DEPENDS += python-virtualenv RPM_DEPENDS += devtoolset-7 RPM_DEPENDS += cmake3 @@ -129,7 +130,7 @@ ifeq ($(SUSE_NAME),Tumbleweed) RPM_SUSE_PYTHON_DEPS += python3-ply python2-virtualenv endif ifeq ($(SUSE_ID),15.0) - RPM_SUSE_DEVEL_DEPS = libboost_headers1_68_0-devel-1.68.0 libboost_thread1_68_0-devel-1.68.0 gcc6 + RPM_SUSE_DEVEL_DEPS += libboost_headers-devel libboost_thread-devel gcc RPM_SUSE_PYTHON_DEPS += python3-ply python2-virtualenv else RPM_SUSE_DEVEL_DEPS += libboost_headers1_68_0-devel-1.68.0 gcc6 @@ -139,7 +140,7 @@ endif ifeq ($(OS_ID),opensuse-leap) ifeq ($(SUSE_ID),15.0) - RPM_SUSE_DEVEL_DEPS = libboost_headers-devel libboost_thread-devel gcc6 + RPM_SUSE_DEVEL_DEPS = libboost_headers-devel libboost_thread-devel gcc RPM_SUSE_PYTHON_DEPS += python3-ply python2-virtualenv endif endif @@ -200,7 +201,9 @@ help: @echo " test-help - show help on test framework" @echo " run-vat - run vpp-api-test tool" @echo " pkg-deb - build DEB packages" + @echo " pkg-deb-debug - build DEB debug packages" @echo " vom-pkg-deb - build vom DEB packages" + @echo " vom-pkg-deb-debug - build vom DEB debug packages" @echo " pkg-rpm - build RPM packages" @echo " install-ext-deps - install external development dependencies" @echo " ctags - (re)generate ctags database"