vppapigen: require reply ID different than caller ID

[vpp.git] / build-root / Makefile

diff --git a/build-root/Makefile b/build-root/Makefile
index 6298ea1..8154ecd 100644 (file)
--- a/build-root/Makefile
+++ b/build-root/Makefile
@@ -245,6 +245,8 @@ tag_var_with_added_space_fn = $(if $($(TAG)_TAG_$(1)),$($(TAG)_TAG_$(1)) )
 # TAG=debug for debugging
 debug_TAG_CFLAGS = -g -O0 -DCLIB_DEBUG -DFORTIFY_SOURCE=2 -march=$(MARCH) \
                   -fstack-protector-all -fPIC
+debug_TAG_CXXFLAGS = -g -O0 -DCLIB_DEBUG -DFORTIFY_SOURCE=2 -march=$(MARCH) \
+                  -fstack-protector-all -fPIC
 debug_TAG_LDFLAGS = -g -O0 -DCLIB_DEBUG -DFORTIFY_SOURCE=2 -march=$(MARCH) \
                   -fstack-protector-all -fPIC
 
@@ -365,7 +367,7 @@ CROSS_TOOLS_$(IS_LINUX) += glibc gcc
 NATIVE_TOOLS = findutils make
 
 # basic tools needed for build system
-NATIVE_TOOLS += git automake autoconf libtool texinfo bison flex tar
+NATIVE_TOOLS += git automake autoconf libtool texinfo tar
 
 # needed to compile gcc
 NATIVE_TOOLS += mpfr gmp mpc
@@ -537,6 +539,8 @@ configure_ldflags_fn = \
 CONFIGURE_ENV =                                                                \
     $(if $(call configure_var_fn,CPPFLAGS),                            \
         CPPFLAGS="$(CPPFLAGS) $(call configure_var_fn,CPPFLAGS)")      \
+    $(if $(call configure_var_fn,CXXFLAGS),                            \
+        CXXFLAGS="$(CXXFLAGS) $(call configure_var_fn,CXXFLAGS)")      \
     $(if $(call configure_var_fn,CFLAGS),                              \
         CFLAGS="$(CFLAGS) $(call configure_var_fn,CFLAGS)")            \
     $(if $(call configure_var_fn,CCASFLAGS),                           \
@@ -644,8 +648,8 @@ configure_check_timestamp =                                         \
 # NB: GNU Make 4.2 will let us use '$(file </proc/cpuinfo)' to both test
 # for file presence and content; for now this will have to do.
 MAKE_PARALLEL_JOBS = -j $(if $(shell [ -f /proc/cpuinfo ] && head /proc/cpuinfo), \
-       $(shell expr 2 '*' $$(grep -c ^processor /proc/cpuinfo)), 2)
-MAKE_PARALLEL_FLAGS = $(if $($(PACKAGE)_make_parallel_fails),,$(MAKE_PARALLEL_JOBS))
+       $(shell grep -c ^processor /proc/cpuinfo), 2)
+MAKE_PARALLEL_FLAGS ?= $(if $($(PACKAGE)_make_parallel_fails),,$(MAKE_PARALLEL_JOBS))
 
 # Make command shorthand for packages & tools.
 PACKAGE_MAKE =                                 \