X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fconfigure.ac;h=2d12090aaf1b6b4b17067e4b7eb35f35bfd586e2;hb=refs%2Fchanges%2F72%2F12772%2F3;hp=d0067c079ebca8040943632d748e5015dc7a0dfd;hpb=9cd2d7a5a4fafadb65d772c48109d55d1e19d425;p=vpp.git diff --git a/src/configure.ac b/src/configure.ac index d0067c079eb..2d12090aaf1 100644 --- a/src/configure.ac +++ b/src/configure.ac @@ -1,17 +1,15 @@ -AC_INIT([vpp], [18.04], [vpp-dev@fd.io]) +AC_INIT([vpp], [18.07], [vpp-dev@fd.io]) LT_INIT AC_CONFIG_AUX_DIR([.]) AM_INIT_AUTOMAKE([subdir-objects]) AM_SILENT_RULES([yes]) -AC_CONFIG_FILES([Makefile plugins/Makefile vpp-api/python/Makefile vpp-api/java/Makefile vpp-api/vapi/Makefile vpp-api/vom/Makefile]) +AC_CONFIG_FILES([Makefile plugins/Makefile vpp-api/python/Makefile vpp-api/java/Makefile vpp-api/vapi/Makefile]) AC_CONFIG_MACRO_DIR([m4]) AC_PROG_CC -AC_PROG_CXX AC_PROG_CPP AM_PROG_AS AM_PROG_LIBTOOL -AC_PROG_YACC AM_PATH_PYTHON AM_CONDITIONAL([CROSSCOMPILE], [test "$cross_compiling" == "yes"]) @@ -130,7 +128,6 @@ DISABLE_ARG(vlib, [Disable vlib and dependant libs and binaries]) DISABLE_ARG(svm, [Disable svm and dependant libs and binaries]) DISABLE_ARG(papi, [Disable Python API bindings]) DISABLE_ARG(japi, [Disable Java API bindings]) -DISABLE_ARG(vom, [Disable VPP object model bindings]) # --with-X @@ -138,6 +135,7 @@ DISABLE_ARG(vom, [Disable VPP object model bindings]) WITHOUT_ARG(libssl, [Disable libssl]) WITHOUT_ARG(apicli, [Disable binary api CLI]) WITHOUT_ARG(mbedtls, [Disable mbedtls]) +WITHOUT_ARG(libnuma, [for non numa architectures]) AC_ARG_WITH(unix, AC_HELP_STRING([--with-unix],[Compile unix version of clib]), @@ -175,7 +173,7 @@ AS_IF([test "$cc_flag_check" = yes], [march_skylake_avx512=no]) AM_CONDITIONAL([CC_SUPPORTS_AVX512], [test "$march_skylake_avx512" = "yes"]) -AS_CASE([$build_cpu], +AS_CASE([$host_cpu], [x86_64], [CPU_FLAGS="-march=corei7 -mtune=corei7-avx"], [aarch64], [CPU_FLAGS="-march=armv8-a+crc"], [CPU_FLAGS=""], @@ -185,8 +183,16 @@ AC_SUBST([CPU_FLAGS]) AC_SUBST([CPU_AVX2_FLAGS],"-march=core-avx2 -mtune=core-avx2") AC_SUBST([CPU_AVX512_FLAGS],"-march=skylake-avx512 -mtune=skylake-avx512") -AM_CONDITIONAL([CPU_X86_64], [test "$build_cpu" = "x86_64"]) -AM_CONDITIONAL([CPU_AARCH64], [test "$build_cpu" = "aarch64"]) +AM_CONDITIONAL([CPU_X86_64], [test "$host_cpu" = "x86_64"]) +AM_CONDITIONAL([CPU_AARCH64], [test "$host_cpu" = "aarch64"]) + +############################################################################### +# misc compiler flags +############################################################################### + +CC_CHECK_FLAG("-Wno-address-of-packed-member") +AS_IF([test "$cc_flag_check" = yes], + [CFLAGS="${CFLAGS} -Wno-address-of-packed-member"], []) ############################################################################### # Substitutions and defines @@ -198,6 +204,7 @@ AC_SUBST(APICLI, [-DVPP_API_TEST_BUILTIN=${n_with_apicli}]) AC_DEFINE_UNQUOTED(DPDK_SHARED_LIB, [${n_enable_dpdk_shared}]) AC_DEFINE_UNQUOTED(WITH_LIBSSL, [${n_with_libssl}]) AC_DEFINE_UNQUOTED(WITH_MBEDTLS, [${n_with_mbedtls}]) +AC_DEFINE_UNQUOTED(WITH_LIBNUMA, [${n_with_libnuma}]) # Silence following noise: @@ -210,7 +217,9 @@ AC_SUBST(AR_FLAGS) ############################################################################### # Please keep alphabetical order +PLUGIN_ENABLED(abf) PLUGIN_ENABLED(acl) +PLUGIN_ENABLED(avf) PLUGIN_ENABLED(cdp) PLUGIN_ENABLED(dpdk) PLUGIN_ENABLED(flowprobe) @@ -220,7 +229,6 @@ PLUGIN_ENABLED(igmp) PLUGIN_ENABLED(ila) PLUGIN_ENABLED(ioam) PLUGIN_ENABLED(ixge) -PLUGIN_ENABLED(kubeproxy) PLUGIN_ENABLED(l2e) PLUGIN_ENABLED(lacp) PLUGIN_ENABLED(lb)