diff options
Diffstat (limited to 'build-data/packages')
| -rw-r--r-- | build-data/packages/libmemif.mk | 5 | ||||
| -rw-r--r-- | build-data/packages/sample-plugin.mk | 5 | ||||
| -rw-r--r-- | build-data/packages/vpp.mk | 11 |
3 files changed, 0 insertions, 21 deletions
diff --git a/build-data/packages/libmemif.mk b/build-data/packages/libmemif.mk index acc0d64257f..a4676af456e 100644 --- a/build-data/packages/libmemif.mk +++ b/build-data/packages/libmemif.mk @@ -26,11 +26,6 @@ libmemif_cmake_args += -DCMAKE_C_FLAGS="$($(TAG)_TAG_CFLAGS)" libmemif_cmake_args += -DCMAKE_SHARED_LINKER_FLAGS="$($(TAG)_TAG_LDFLAGS)" libmemif_cmake_args += -DCMAKE_PREFIX_PATH:PATH="$(PACKAGE_INSTALL_DIR)/../vpp" -# Use devtoolset on centos 7 -ifneq ($(wildcard /opt/rh/devtoolset-9/enable),) -libmemif_cmake_args += -DCMAKE_PROGRAM_PATH:PATH="/opt/rh/devtoolset-9/root/bin" -endif - libmemif_configure = \ cd $(PACKAGE_BUILD_DIR) && \ $(CMAKE) -G Ninja $(libmemif_cmake_args) $(call find_source_fn,$(PACKAGE_SOURCE))$(PACKAGE_SUBDIR) diff --git a/build-data/packages/sample-plugin.mk b/build-data/packages/sample-plugin.mk index 34188f9e7a7..546164c0d16 100644 --- a/build-data/packages/sample-plugin.mk +++ b/build-data/packages/sample-plugin.mk @@ -30,11 +30,6 @@ sample-plugin_cmake_args += -DCMAKE_C_FLAGS="$($(TAG)_TAG_CFLAGS)" sample-plugin_cmake_args += -DCMAKE_SHARED_LINKER_FLAGS="$($(TAG)_TAG_LDFLAGS)" sample-plugin_cmake_args += -DCMAKE_PREFIX_PATH:PATH="$(PACKAGE_INSTALL_DIR)/../vpp" -# Use devtoolset on centos 7 -ifneq ($(wildcard /opt/rh/devtoolset-9/enable),) -sample-plugin_cmake_args += -DCMAKE_PROGRAM_PATH:PATH="/opt/rh/devtoolset-9/root/bin" -endif - sample-plugin_configure = \ cd $(PACKAGE_BUILD_DIR) && \ $(CMAKE) -G Ninja $(sample-plugin_cmake_args) \ diff --git a/build-data/packages/vpp.mk b/build-data/packages/vpp.mk index 7db450e0554..ad1d1fc9a28 100644 --- a/build-data/packages/vpp.mk +++ b/build-data/packages/vpp.mk @@ -30,16 +30,6 @@ vpp_cmake_args += -DCMAKE_PREFIX_PATH:PATH="$(vpp_cmake_prefix_path)" ifeq ("$(V)","1") vpp_cmake_args += -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON endif -ifeq (,$(TARGET_PLATFORM)) -ifeq ($(MACHINE),aarch64) -vpp_cmake_args += -DVPP_LOG2_CACHE_LINE_SIZE=7 -endif -endif - -# Use devtoolset on centos 7 -ifneq ($(wildcard /opt/rh/devtoolset-9/enable),) -vpp_cmake_args += -DCMAKE_PROGRAM_PATH:PATH="/opt/rh/devtoolset-9/root/bin" -endif ifneq ($(VPP_EXTRA_CMAKE_ARGS),) vpp_cmake_args += $(VPP_EXTRA_CMAKE_ARGS) @@ -49,7 +39,6 @@ vpp_configure_depend += external-install vpp_configure = \ cd $(PACKAGE_BUILD_DIR) && \ $(CMAKE) -G Ninja $(vpp_cmake_args) $(call find_source_fn,$(PACKAGE_SOURCE)) -#vpp_make_args = --no-print-directory vpp_build = $(CMAKE) --build $(PACKAGE_BUILD_DIR) -- $(MAKE_PARALLEL_FLAGS) vpp_install = $(CMAKE) --build $(PACKAGE_BUILD_DIR) -- install | grep -v 'Set runtime path' |