diff options
| author |   Michal Cmarada <mcmarada@cisco.com> | 2019-01-31 10:57:40 +0100 |
|---|---|---|
| committer |   Damjan Marion <dmarion@me.com> | 2019-02-19 15:14:02 +0000 |
| commit | 4e633e1043e867fd24badeb0405f794793beb9a9 (patch) | |
| tree | acc92341b32be50bdef030becb2c65efe5252da2 /build-data | |
| parent | aed61801947146e6a93e7791d382bd21d050ee14 (diff) | |
VPP-1504: Remove JVPP
As part of JVPP migration this removes JVPP completely from VPP.
Change-Id: I6b74e7961aa474ae471e63fe43a624cd9fc3659b
Signed-off-by: Michal Cmarada <mcmarada@cisco.com>
Diffstat (limited to 'build-data')
| -rw-r--r-- | build-data/packages/japi.mk | 44 | ||||
| -rw-r--r-- | build-data/platforms/arm32.mk | 2 | ||||
| -rw-r--r-- | build-data/platforms/vpp.mk | 2 |
3 files changed, 2 insertions, 46 deletions
diff --git a/build-data/packages/japi.mk b/build-data/packages/japi.mk deleted file mode 100644 index a9df1fcb336..00000000000 --- a/build-data/packages/japi.mk +++ /dev/null @@ -1,44 +0,0 @@ -# Copyright (c) 2017-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. - -japi_configure_depend = vpp-install -japi_source = extras -japi_configure_subdir = japi - -ifneq ($(shell which cmake3),) -CMAKE?=cmake3 -else -CMAKE?=cmake -endif - -japi_cmake_args ?= -japi_cmake_args += -DCMAKE_INSTALL_PREFIX:PATH=$(PACKAGE_INSTALL_DIR) -japi_cmake_args += -DCMAKE_C_FLAGS="$($(TAG)_TAG_CFLAGS)" -japi_cmake_args += -DCMAKE_SHARED_LINKER_FLAGS="$($(TAG)_TAG_LDFLAGS)" -japi_cmake_args += -DCMAKE_PREFIX_PATH:PATH="$(PACKAGE_INSTALL_DIR)/../vpp" -ifeq ("$(V)","1") -japi_cmake_args += -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON -endif - -#Use devtoolset on centos 7 -ifneq ($(wildcard /opt/rh/devtoolset-7/enable),) -japi_cmake_args += -DCMAKE_PROGRAM_PATH:PATH="/opt/rh/devtoolset-7/root/bin" -endif - -japi_configure = \ - cd $(PACKAGE_BUILD_DIR) && \ - $(CMAKE) -G Ninja $(japi_cmake_args) $(call find_source_fn,$(PACKAGE_SOURCE))$(PACKAGE_SUBDIR) - -japi_build = $(CMAKE) --build $(PACKAGE_BUILD_DIR) -- $(MAKE_PARALLEL_FLAGS) - -japi_install = $(CMAKE) --build $(PACKAGE_BUILD_DIR) -- install diff --git a/build-data/platforms/arm32.mk b/build-data/platforms/arm32.mk index 47d4ad5ada7..f62484d49e0 100644 --- a/build-data/platforms/arm32.mk +++ b/build-data/platforms/arm32.mk @@ -19,7 +19,7 @@ arm32_uses_dpdk = yes arm32_uses_openssl = no arm32_root_packages = vpp vlib vlib-api vnet svm vpp-api-test \ - jvpp gmod + gmod vlib_configure_args_arm32 = --with-pre-data=128 vnet_configure_args_arm32 = --with-dpdk --without-libssl diff --git a/build-data/platforms/vpp.mk b/build-data/platforms/vpp.mk index 0217fb7d342..ffafe861294 100644 --- a/build-data/platforms/vpp.mk +++ b/build-data/platforms/vpp.mk @@ -20,7 +20,7 @@ ifeq ($(TARGET_PLATFORM),thunderx) vpp_dpdk_target = arm64-thunderx-linuxapp-gcc endif -vpp_root_packages = vpp vom japi +vpp_root_packages = vpp vom vpp_debug_TAG_CFLAGS = -g -O0 -DCLIB_DEBUG -DFORTIFY_SOURCE=2 \ -fstack-protector-all -fPIC -Werror |