X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=build-root%2FMakefile;h=cc66eedf79c0aa4edf28fc6dbf62c034488d78ec;hb=952ec0e0a68ccf5a4c3c00894bb26a25d80910a3;hp=af35be495800fa662ce7dbb684b6a98b121ac388;hpb=5ee623e789261552eb9460be10f34793d40b6575;p=vpp.git

diff --git a/build-root/Makefile b/build-root/Makefile
index af35be49580..cc66eedf79c 100644
--- a/build-root/Makefile
+++ b/build-root/Makefile
@@ -190,7 +190,7 @@ ARCH_TARGET_tmp = $(call ifdef_fn,$(ARCH)_target,$(ARCH)-$(OS))
 TARGET = $(call ifdef_fn,$(PLATFORM)_target,$(ARCH_TARGET_tmp))
 TARGET_PREFIX = $(if $(not_native),$(TARGET)-,)
 
-# CPU microarchitecture detection. 
+# CPU microarchitecture detection.
 # Either set <platform>_march in build-data/platforms/<platform>.mk,
 # or detect and use the build-host instruction set
 
@@ -236,7 +236,7 @@ PACKAGE = $*
 # Build/install tags.  This lets you have different CFLAGS/CPPFLAGS/LDFLAGS
 # for e.g. debug versus optimized compiles.  Each tag has its own set of build/install
 # areas.
-TAG = 
+TAG =
 TAG_PREFIX = $(if $(TAG),$(TAG)-)
 
 # yes you need the space
@@ -309,15 +309,16 @@ endif
 
 # Always prefer our own tools to those installed on system.
 # Note: ccache-bin must be before tool bin.
-# 
-# Removed LD_LIBRARY_PATH from BUILD_ENV (drb, 10/31/17):  
+#
+# Removed LD_LIBRARY_PATH from BUILD_ENV (drb, 10/31/17):
 # export LD_LIBRARY_PATH=$(TOOL_INSTALL_DIR)/lib64:$(TOOL_INSTALL_DIR)/lib
 #   Reported to cause trouble. Only of historical interest, since we no longer
 #   build a full tool chain from source.
 
 BUILD_ENV =										\
     export CCACHE_DIR=$(CCACHE_DIR) ;					\
-    export PATH=$(TOOL_INSTALL_DIR)/ccache-bin:$(TOOL_INSTALL_DIR)/bin:$${PATH} ;	\
+    export PATH=$(wildcard /usr/lib*/ccache):$(TOOL_INSTALL_DIR)/bin:$${PATH} ;		\
+    $(if $(call configure_var_fn,PATH), export PATH=$${PATH}:$(call configure_var_fn,PATH);,)	\
     export PATH="`echo $${PATH} | sed -e s/[.]://`" ;					\
     $(if $(not_native),export CONFIG_SITE=$(MU_BUILD_ROOT_DIR)/config.site ;,)	\
     set -eu$(BUILD_DEBUG) ;							        \
@@ -367,7 +368,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
@@ -616,7 +617,7 @@ check_platform =								\
 	     try make PLATFORM=$(PLATFORM) install-tools) ;			\
     exit 1 ;									\
   fi
-    
+
 configure_check_timestamp =						\
   @$(BUILD_ENV) ;							\
   $(check_platform) ;							\
@@ -624,6 +625,10 @@ configure_check_timestamp =						\
   mkdir -p $(PACKAGE_INSTALL_DIR) ;					\
   conf="$(TIMESTAMP_DIR)/$(CONFIGURE_TIMESTAMP)" ;			\
   dirs="$(call package_mk_fn,$(PACKAGE))				\
+	$(SOURCE_PATH_BUILD_DATA_DIRS)/platforms/$(PLATFORM).mk		\
+	$(wildcard $(call find_source_fn,$(PACKAGE_SOURCE))/cmake)	\
+	$(shell find $(call find_source_fn,$(PACKAGE_SOURCE))		\
+			-name CMakeLists.txt)				\
 	$(wildcard $(call find_source_fn,				\
 	             $(PACKAGE_SOURCE))$(PACKAGE_SUBDIR)/configure)	\
        $(MU_BUILD_ROOT_DIR)/config.site" ;				\
@@ -647,9 +652,11 @@ configure_check_timestamp =						\
 # we assume there's 1 processor; we use 2*ncpu for the -j option.
 # 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), \
+ifndef MAKE_PARALLEL_JOBS
+MAKE_PARALLEL_JOBS = $(if $(shell [ -f /proc/cpuinfo ] && head /proc/cpuinfo), \
 	$(shell grep -c ^processor /proc/cpuinfo), 2)
-MAKE_PARALLEL_FLAGS ?= $(if $($(PACKAGE)_make_parallel_fails),,$(MAKE_PARALLEL_JOBS))
+endif
+MAKE_PARALLEL_FLAGS ?= $(if $($(PACKAGE)_make_parallel_fails),,-j $(MAKE_PARALLEL_JOBS))
 
 # Make command shorthand for packages & tools.
 PACKAGE_MAKE =					\
@@ -796,7 +803,7 @@ pull-all:
 	make PLATFORM=$(PLATFORM) $(patsubst %,%-pull-all,$(ROOT_PACKAGES))
 
 .PHONY: %-diff
-%-diff:									
+%-diff:
 	@$(BUILD_ENV) ;							\
 	d=$(call find_source_fn,$(PACKAGE_SOURCE)) ;			\
 	$(call build_msg_fn,Git diff $(PACKAGE)) ;			\
@@ -805,12 +812,12 @@ pull-all:
         else								\
 	 $(call build_msg_fn, $(PACKAGE) not a git directory) ;		\
 	fi
-            
+
 
 
 # generate diffs for everything in source path
 .PHONY: diff-all
-diff-all:								
+diff-all:
 	@$(BUILD_ENV) ;							\
 	$(call build_msg_fn,Generate diffs) ;				\
 	for r in $(ABSOLUTE_SOURCE_PATH); do				\
@@ -908,7 +915,7 @@ basic_system_image_install =				\
   mkdir -p bin lib mnt proc root sbin sys tmp etc ;	\
   mkdir -p usr usr/{bin,sbin} usr/lib ;			\
   mkdir -p var var/{lib,lock,log,run,tmp} ;		\
-  mkdir -p var/lock/subsys var/lib/urandom 
+  mkdir -p var/lock/subsys var/lib/urandom
 
 .PHONY: basic_system-image_install
 basic_system-image_install: # linuxrc-install
@@ -918,7 +925,7 @@ basic_system-image_install: # linuxrc-install
 ROOT_PACKAGES = $(if $($(PLATFORM)_root_packages),$($(PLATFORM)_root_packages),$(default_root_packages))
 
 .PHONY: install-packages
-install-packages: $(patsubst %,%-find-source,$(ROOT_PACKAGES))	
+install-packages: $(patsubst %,%-find-source,$(ROOT_PACKAGES))
 	@$(BUILD_ENV) ;							        \
 	set -eu$(BUILD_DEBUG) ;							\
 	d=$(MU_BUILD_ROOT_DIR)/packages-$(PLATFORM) ;				\
@@ -929,11 +936,7 @@ install-packages: $(patsubst %,%-find-source,$(ROOT_PACKAGES))
 	      basic_system							\
 	      $(ROOT_PACKAGES))	|| exit 1;					\
 	$(call build_msg_fn, Relocating ELF executables to run in $${d}) ;	\
-	find $${d} -type f							\
-	    -exec elftool quiet in '{}' out '{}'				\
-		set-interpreter							\
-		    $${d}/$(arch_lib_dir)/$(DYNAMIC_LINKER)			\
-		set-rpath $${d}/$(arch_lib_dir):$${d}/lib ';' ;			\
+	scripts/set-rpath $${d} $${d}/$(arch_lib_dir) ;				\
 	: strip symbols from files ;						\
 	if [ $${strip_symbols:-no} = 'yes' ] ; then				\
 	    $(call build_msg_fn, Stripping symbols from files) ;		\
@@ -944,7 +947,7 @@ install-packages: $(patsubst %,%-find-source,$(ROOT_PACKAGES))
 		    >& /dev/null ;						\
 	else									\
 	    $(call build_msg_fn, NOT stripping symbols) ;			\
-	fi 
+	fi
 
 # readonly root squashfs image
 # Note: $(call build_msg_fn) does not seem to work inside of fakeroot so we use echo
@@ -968,11 +971,7 @@ $(PLATFORM_IMAGE_DIR)/ro.img ro-image: $(patsubst %,%-find-source,$(ROOT_PACKAGE
 	  : make dev directory ;					\
 	  $(linuxrc_makedev) ;						\
 	  echo @@@@ Relocating ELF executables to run in / @@@@ ;	\
-	  find $${d} -type f						\
-	      -exec elftool quiet in '{}' out '{}'			\
-		set-interpreter						\
-		    /$(arch_lib_dir)/$(DYNAMIC_LINKER)			\
-	        set-rpath /$(arch_lib_dir):/lib ';' ;			\
+	  scripts/set-rpath /$(arch_lib_dir):/lib ;			\
 	  : strip symbols from files ;					\
 	  if [ '$${strip_symbols:-yes}' = 'yes' ] ; then		\
 	      echo @@@@ Stripping symbols from files @@@@ ;		\
@@ -1088,7 +1087,7 @@ ccache-install:
 	$(MAKE) -C $(MU_BUILD_ROOT_DIR)	ccache-build
 	mkdir -p $(TOOL_INSTALL_DIR)/ccache-bin
 	ln -sf $(MU_BUILD_ROOT_DIR)/build-tool-native/ccache/ccache \
-		$(TOOL_INSTALL_DIR)/ccache-bin/$(TARGET_PREFIX)gcc 
+		$(TOOL_INSTALL_DIR)/ccache-bin/$(TARGET_PREFIX)gcc
 
 TOOL_MAKE = $(MAKE) is_build_tool=yes
 
@@ -1152,7 +1151,4 @@ distclean:
 	rm -rf $(MU_BUILD_ROOT_DIR)/*.deb
 	rm -rf $(MU_BUILD_ROOT_DIR)/*.rpm
 	rm -rf $(MU_BUILD_ROOT_DIR)/*.changes
-	rm -rf $(MU_BUILD_ROOT_DIR)/python
-	if [ -e /usr/bin/dh ];then (cd $(MU_BUILD_ROOT_DIR)/deb/;debian/rules clean); fi
-	rm -f $(MU_BUILD_ROOT_DIR)/deb/debian/*.install
-	rm -f $(MU_BUILD_ROOT_DIR)/deb/debian/changelog
+	rm -rf $(MU_BUILD_ROOT_DIR)/*.buildinfo