build: Detect number of CPUs for build processes on FreeBSD

[vpp.git] / build-root / Makefile

diff --git a/build-root/Makefile b/build-root/Makefile
index cc66eed..d69a94c 100644 (file)
--- a/build-root/Makefile
+++ b/build-root/Makefile
@@ -39,7 +39,7 @@
 ######################################################################
 
 # Scripts require non-POSIX parts of bash
-SHELL := /bin/bash
+SHELL := $(shell which bash)
 
 # Where this makefile lives
 MU_BUILD_ROOT_DIR = $(shell pwd)
@@ -243,11 +243,11 @@ TAG_PREFIX = $(if $(TAG),$(TAG)-)
 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) \
+debug_TAG_CFLAGS = -g -O0 -DCLIB_DEBUG -march=$(MARCH) \
                   -fstack-protector-all -fPIC
-debug_TAG_CXXFLAGS = -g -O0 -DCLIB_DEBUG -DFORTIFY_SOURCE=2 -march=$(MARCH) \
+debug_TAG_CXXFLAGS = -g -O0 -DCLIB_DEBUG -march=$(MARCH) \
                   -fstack-protector-all -fPIC
-debug_TAG_LDFLAGS = -g -O0 -DCLIB_DEBUG -DFORTIFY_SOURCE=2 -march=$(MARCH) \
+debug_TAG_LDFLAGS = -g -O0 -DCLIB_DEBUG -march=$(MARCH) \
                   -fstack-protector-all -fPIC
 
 BUILD_PREFIX_package = build-$(TAG_PREFIX)
@@ -365,7 +365,7 @@ NATIVE_TOOLS_$(IS_LINUX) += $(NATIVE_TOOLS_LINUX)
 CROSS_TOOLS_$(IS_LINUX) += glibc gcc
 
 # must be first for bootstrapping
-NATIVE_TOOLS = findutils make
+NATIVE_TOOLS = findutils $(MAKE)
 
 # basic tools needed for build system
 NATIVE_TOOLS += git automake autoconf libtool texinfo tar
@@ -416,7 +416,7 @@ find_filter += -and -not -path '*/.mu_build_*'
 find_newer_filtered_fn =                       \
   (! -f $(1)                                   \
     || -n $(call find_newer_files_fn,$(1),$(3))        \
-    || -n "`find -H $(2)                       \
+    || -n "`find -L $(2)                       \
              -type f                           \
               -and -newer $(1)                 \
              -and \( $(4) \)                   \
@@ -614,7 +614,7 @@ check_platform =                                                            \
        -a ! -x "`which 2> /dev/null $${target_gcc}`" ] ; then                  \
     $(call build_msg_fn,                                                       \
           No cross-compiler found for platform $(PLATFORM) target $(TARGET);   \
-            try make PLATFORM=$(PLATFORM) install-tools) ;                     \
+            try $(MAKE) PLATFORM=$(PLATFORM) install-tools) ;                  \
     exit 1 ;                                                                   \
   fi
 
@@ -650,11 +650,18 @@ configure_check_timestamp =                                               \
 # /proc/cpuinfo does not exist on platforms without a /proc and on some
 # platforms, notably inside containers, it has no content. In those cases
 # we assume there's 1 processor; we use 2*ncpu for the -j option.
+#
+# On FreeBSD we can call nproc to get the number of processors.
+#
 # 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.
 ifndef MAKE_PARALLEL_JOBS
+ifeq ($(shell uname), FreeBSD)
+MAKE_PARALLEL_JOBS = $(shell nproc)
+else
 MAKE_PARALLEL_JOBS = $(if $(shell [ -f /proc/cpuinfo ] && head /proc/cpuinfo), \
        $(shell grep -c ^processor /proc/cpuinfo), 2)
+endif  # FreeBSD
 endif
 MAKE_PARALLEL_FLAGS ?= $(if $($(PACKAGE)_make_parallel_fails),,-j $(MAKE_PARALLEL_JOBS))
 
@@ -765,7 +772,7 @@ find_source_for_package =                                                                   \
       exit 1;                                                                                  \
     fi ;                                                                                       \
     $(call build_msg_fn,Fix file dates in $${g}/$(PACKAGE_SOURCE)) ;                                   \
-    (cd $${s} ; $(MU_BUILD_ROOT_DIR)/autowank --touch) ;                                       \
+    : the timestamp-adjustment script used to be invoked at this point ;                       \
   fi ;                                                                                         \
   s=`cd $${s} && pwd` ;                                                                                \
   $(call build_msg_fn,Source found in $${s})
@@ -800,7 +807,7 @@ pull-all:
        $(call build_msg_fn,Git pull build tools) ;                             \
        $(call tool_make_target_fn,pull-all) ;                                  \
        $(call build_msg_fn,Git pull packages for platform $(PLATFORM)) ;       \
-       make PLATFORM=$(PLATFORM) $(patsubst %,%-pull-all,$(ROOT_PACKAGES))
+       $(MAKE) PLATFORM=$(PLATFORM) $(patsubst %,%-pull-all,$(ROOT_PACKAGES))
 
 .PHONY: %-diff
 %-diff:
@@ -962,13 +969,13 @@ $(PLATFORM_IMAGE_DIR)/ro.img ro-image: $(patsubst %,%-find-source,$(ROOT_PACKAGE
        chmod 0755 $${tmp_dir} ;                                        \
        cd $${tmp_dir} ;                                                \
        trap "rm -rf $${tmp_dir}" err ;                                 \
-       fakeroot /bin/bash -c "{                                        \
+       fakeroot $(SHELL) -c "{                                 \
          set -eu$(BUILD_DEBUG) ;                                       \
          $(MAKE) -C $(MU_BUILD_ROOT_DIR) IMAGE_INSTALL_DIR=$${tmp_dir} \
            $(patsubst %,%-image_install,                               \
              basic_system                                              \
              $(ROOT_PACKAGES)) ;                                       \
-         : make dev directory ;                                        \
+         : $(MAKE) dev directory ;                                     \
          $(linuxrc_makedev) ;                                          \
          echo @@@@ Relocating ELF executables to run in / @@@@ ;       \
          scripts/set-rpath /$(arch_lib_dir):/lib ;                     \
@@ -1054,7 +1061,7 @@ rw-image: rw-image-check-type ro-image
        chmod 0755 $${tmp_dir} ;                                \
        cd $${tmp_dir} ;                                        \
        trap "rm -rf $${tmp_dir}" err ;                         \
-       fakeroot /bin/bash -c "{                                \
+       fakeroot $(SHELL) -c "{                         \
          set -eu$(BUILD_DEBUG) ;                               \
          $(linuxrc_makedev) ;                                  \
          $(call rw_image_embed_ro_image_fn,$${ro_image}) ;     \