diff options
| -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 | ||||
| -rw-r--r-- | build-data/platforms/arm32.mk | 45 | ||||
| -rw-r--r-- | build-data/platforms/dpaa.mk | 87 | ||||
| -rw-r--r-- | build-data/platforms/qppc.mk | 47 | ||||
| -rw-r--r-- | build-data/platforms/vpp.mk | 3 | ||||
| -rw-r--r-- | build-root/config.site | 112 |
8 files changed, 0 insertions, 315 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' diff --git a/build-data/platforms/arm32.mk b/build-data/platforms/arm32.mk deleted file mode 100644 index 5d8749e2ff6..00000000000 --- a/build-data/platforms/arm32.mk +++ /dev/null @@ -1,45 +0,0 @@ -# Copyright (c) 2016 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. - -# vector packet processor -arm32_arch = native -arm32_native_tools = vppapigen - -arm32_uses_dpdk = yes -arm32_uses_openssl = no - -arm32_root_packages = vpp vlib vlib-api vnet svm vpp-api-test \ - gmod - -vlib_configure_args_arm32 = --with-pre-data=128 -vnet_configure_args_arm32 = --with-dpdk --without-libssl -vpp_configure_args_arm32 = --with-dpdk --without-libssl - -arm32_dpdk_arch = "armv7a" -arm32_dpdk_target = "arm-armv7a-linuxapp-gcc" -arm32_dpdk_make_extra_args = "CPU_CFLAGS='-mfloat-abi=hard' \ - CONFIG_RTE_EAL_IGB_UIO=y \ - CONFIG_RTE_LIBRTE_E1000_PMD=y \ - CONFIG_RTE_MAX_LCORE=4 \ - CONFIG_RTE_MAX_NUMA_NODES=1" - - -arm32_debug_TAG_CFLAGS = -g -O0 -DCLIB_DEBUG -DVLIB_MAX_CPUS=4 -march=armv7-a \ - -fstack-protector-all -fPIC -Werror -arm32_debug_TAG_LDFLAGS = -g -O0 -DCLIB_DEBUG -DVLIB_MAX_CPUS=4 -march=armv7-a \ - -fstack-protector-all -fPIC -Werror - -arm32_TAG_CFLAGS = -g -O2 -D_FORTIFY_SOURCE=2 -DVLIB_MAX_CPUS=4 -march=armv7-a \ - -fstack-protector -fPIC -Werror -arm32_TAG_LDFLAGS = -g -O2 -D_FORTIFY_SOURCE=2 -DVLIB_MAX_CPUS=4 -march=armv7-a \ - -fstack-protector -fPIC -Werror diff --git a/build-data/platforms/dpaa.mk b/build-data/platforms/dpaa.mk deleted file mode 100644 index e6f0b232849..00000000000 --- a/build-data/platforms/dpaa.mk +++ /dev/null @@ -1,87 +0,0 @@ -# Copyright 2018 NXP -# 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. - -# Configuration for NXP DPAA1/DPAA2 ARM64 based platform -MACHINE=$(shell uname -m) - -dpaa_mtune = cortex-A72 -dpaa_march = "armv8-a+fp+simd+crc+crypto" - -ifeq ($(MACHINE),aarch64) -dpaa_arch = native -else -dpaa_arch = aarch64 -dpaa_os = linux-gnu -dpaa_target = aarch64-fsl-linux -dpaa_cross_ldflags = \ - -Wl,--dynamic-linker=/lib/ld-linux-aarch64.so.1 \ - -Wl,-rpath=/usr/lib64 \ - -Wl,-rpath=./.libs \ - -Wl,-rpath=$(OPENSSL_PATH)/lib -endif - -# Re-write Default configuration, if requied -ifneq ($(CROSS_PREFIX),) -# like: aarch64-linux-gnu -dpaa_target = $(CROSS_PREFIX) -endif - -ifneq ($(CPU_MTUNE),) -# like: cortex-A53 -dpaa_mtune = $(CPU_MTUNE) -endif - -dpaa_native_tools = vppapigen -dpaa_root_packages = vpp - -# DPDK configuration parameters -dpaa_uses_dpdk = yes - -# Compile with external DPDK only if "DPDK_PATH" variable is defined where we have -# installed DPDK libraries and headers. -ifeq ($(PLATFORM),dpaa) -ifneq ($(DPDK_PATH),) -#dpaa_dpdk_shared_lib = yes -dpaa_uses_external_dpdk = yes -dpaa_dpdk_inc_dir = $(DPDK_PATH)/include/dpdk -dpaa_dpdk_lib_dir = $(DPDK_PATH)/lib -else -# compile using internal DPDK + NXP DPAA2 Driver patch -dpaa_dpdk_arch = "armv8a" -dpaa_dpdk_target = "arm64-dpaa-linuxapp-gcc" -dpaa_dpdk_make_extra_args = "CONFIG_RTE_KNI_KMOD=n" -endif -endif - -# Disable the unused plugins in order to decrease the VPP pacakage size. -vpp_configure_args_dpaa = --without-ipv6sr --with-pre-data=128 --without-libnuma - -# Other optional vpp_configure_args -ifneq ($(VPP_CFG_ARGS),) -vpp_configure_args_dpaa += $(VPP_CFG_ARGS) -endif - - -dpaa_debug_TAG_CFLAGS = -g -O0 -DCLIB_DEBUG -fPIC -fstack-protector-all -mtls-dialect=trad \ - -march=$(MARCH) -Werror -DCLIB_LOG2_CACHE_LINE_BYTES=6 -I$(OPENSSL_PATH)/include -dpaa_debug_TAG_LDFLAGS = -g -O0 -DCLIB_DEBUG -fstack-protector-all \ - -march=$(MARCH) -Werror -DCLIB_LOG2_CACHE_LINE_BYTES=6 -L$(OPENSSL_PATH)/lib - - -# Use -rdynamic is for stack tracing, O0 for debugging....default is O2 -# Use -DCLIB_LOG2_CACHE_LINE_BYTES to change cache line size -dpaa_TAG_CFLAGS = -g -Ofast -fPIC -march=$(MARCH) -mcpu=$(dpaa_mtune) -mtls-dialect=trad \ - -mtune=$(dpaa_mtune) -funroll-all-loops -DCLIB_LOG2_CACHE_LINE_BYTES=6 -I$(OPENSSL_PATH)/include -dpaa_TAG_LDFLAGS = -g -Ofast -fPIC -march=$(MARCH) -mcpu=$(dpaa_mtune) \ - -mtune=$(dpaa_mtune) -funroll-all-loops -DCLIB_LOG2_CACHE_LINE_BYTES=6 -L$(OPENSSL_PATH)/lib - diff --git a/build-data/platforms/qppc.mk b/build-data/platforms/qppc.mk deleted file mode 100644 index 5bc6155699f..00000000000 --- a/build-data/platforms/qppc.mk +++ /dev/null @@ -1,47 +0,0 @@ -# Copyright (c) 2015 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. - -# Qemu "p-series" powerpc64 - -qppc_os = linux-gnu - -qppc_cross_ldflags = \ - -Wl,--dynamic-linker=/lib64/ld64.so.1 - -qppc_arch = powerpc - -qppc_root_packages = vppinfra vlib vlib-api vnet svm \ - vpp vpp-api-test - -vnet_configure_args_qppc = \ - --without-libssl - -vpp_configure_args_qppc = \ - --without-libssl - -vlib_configure_args_qppc = --with-pre-data=128 - -qppc_march=powerpc64 - -# native tool chain additions for this platform -qppc_native_tools = vppapigen - -qppc_uses_dpdk = no - -qppc_debug_TAG_CFLAGS = -m64 -g -O0 -DCLIB_DEBUG -DCLIB_LOG2_CACHE_LINE_BYTES=6 -maltivec -qppc_debug_TAG_LDFLAGS = -m64 -g -O0 -DCLIB_DEBUG -DCLIB_LOG2_CACHE_LINE_BYTES=6 -maltivec - -qppc_TAG_CFLAGS = -m64 -g -O2 -DCLIB_LOG2_CACHE_LINE_BYTES=6 -maltivec -qppc_TAG_LDFLAGS = -m64 -g -O2 -DCLIB_LOG2_CACHE_LINE_BYTES=6 -maltivec - - diff --git a/build-data/platforms/vpp.mk b/build-data/platforms/vpp.mk index 83d0fe5840b..3edfa39369f 100644 --- a/build-data/platforms/vpp.mk +++ b/build-data/platforms/vpp.mk @@ -16,9 +16,6 @@ MACHINE=$(shell uname -m) vpp_arch = native -ifeq ($(TARGET_PLATFORM),thunderx) -vpp_dpdk_target = arm64-thunderx-linuxapp-gcc -endif vpp_root_packages = vpp diff --git a/build-root/config.site b/build-root/config.site deleted file mode 100644 index c8996c58974..00000000000 --- a/build-root/config.site +++ /dev/null @@ -1,112 +0,0 @@ -# Copyright (c) 2015 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. - - -###################################################################### -# glibc -###################################################################### - -# glibc needs this for cross compiling -libc_cv_forced_unwind=yes -libc_cv_c_cleanup=yes -libc_cv_ssp=no -# fixes gentoo build; not sure why? -libc_cv_uname_release="" -libc_cv_uname_version="" -ac_cv_header_cpuid_h=yes -###################################################################### -# bash -###################################################################### - -# Bash configure.in uses this to work around an autoconf 2.53 bug -ac_cv_func_setvbuf_reversed=no -ac_cv_rl_version=5.1 -bash_cv_termcap_lib=libncurses - -# These mostly come from debian bash-2.05b changes -# They are needed to make a functioning bash. Without these -# settings gdbserver exiting would cause the invoking bash to -# exit also. -bash_cv_have_mbstate_t=yes -bash_cv_dup2_broken=no -bash_cv_pgrp_pipe=no -bash_cv_sys_siglist=yes -bash_cv_under_sys_siglist=yes -bash_cv_opendir_not_robust=no -bash_cv_printf_declared=yes -bash_cv_ulimit_maxfds=yes -bash_cv_getenv_redef=yes -bash_cv_getcwd_calls_popen=no -bash_cv_func_strcoll_broken=no -bash_cv_must_reinstall_sighandlers=no -bash_cv_type_quad_t=yes -bash_cv_func_sigsetjmp=present -bash_cv_job_control_missing=present -bash_cv_sys_named_pipes=present -bash_cv_type_rlimit=long -bash_cv_printf_a_format=yes -bash_cv_unusable_rtsigs=no - -###################################################################### -# Apache -###################################################################### -ac_cv_func_setpgrp_void=yes -apr_cv_process_shared_works=yes -apr_cv_tcp_nodelay_with_cork=yes -ap_void_ptr_lt_long=no - -case ${host_cpu} in -x86_64 | alpha) - ac_cv_sizeof_ssize_t=8 - ac_cv_sizeof_size_t=8 - ac_cv_sizeof_pid_t=4 - ;; -*) - ac_cv_sizeof_ssize_t=4 - ac_cv_sizeof_size_t=4 - ac_cv_sizeof_pid_t=4 - ;; -esac - -###################################################################### -# gdb -###################################################################### -gdb_cv_func_ptrace_args=int,int,long,long - -###################################################################### -# dpkg -###################################################################### -dpkg_cv_va_copy=yes - -###################################################################### -# coreutils -###################################################################### -ac_cv_search_clock_gettime=no -gl_cv_fs_space=yes - -###################################################################### -# tcpdump -###################################################################### -ac_cv_linux_vers=2 -ac_cv_func_pcap_findalldevs=no - -###################################################################### -# flex -###################################################################### -ac_cv_func_malloc_0_nonnull=yes -ac_cv_func_realloc_0_nonnull=yes - -###################################################################### -# tar -###################################################################### -tar_gl_cv_func_mknod_works=yes |