From 1edb07ac50f698107a0b412cb3b81dd4d409d59c Mon Sep 17 00:00:00 2001 From: quackerd Date: Tue, 8 Mar 2022 04:08:39 +0800 Subject: [PATCH] fix build system --- configure | 2 +- dpdkbuild/Makefile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/configure b/configure index 3a785ce946..ee66707acd 100755 --- a/configure +++ b/configure @@ -845,7 +845,7 @@ fi echo -n "Creating mk/config.mk..." cp -f $rootdir/CONFIG $rootdir/mk/config.mk for key in "${!CONFIG[@]}"; do - sed -i.bak -r "s#^\s*CONFIG_${key}=.*#CONFIG_${key}\?=${CONFIG[$key]}#g" $rootdir/mk/config.mk + sed -i.bak -r "s#[[:space:]]*CONFIG_${key}=.*#CONFIG_${key}\?=${CONFIG[$key]}#g" $rootdir/mk/config.mk done # On FreeBSD sed -i 'SUFFIX' - SUFFIX is mandatory. So no way but to delete the backed file. rm -f $rootdir/mk/config.mk.bak diff --git a/dpdkbuild/Makefile b/dpdkbuild/Makefile index b540d2fa08..d4af3a0a45 100644 --- a/dpdkbuild/Makefile +++ b/dpdkbuild/Makefile @@ -137,7 +137,7 @@ ifeq ($(MAKE_PID),) MAKE_PID := $(shell echo $$PPID) endif -MAKE_NUMJOBS := $(shell ps T | sed -nE 's/\s*$(MAKE_PID)\s.* (-j|--jobs=)( *[0-9]+).*/\1\2/p') +MAKE_NUMJOBS := $(shell ps T | sed -nE 's/[[:space:]]*$(MAKE_PID)[[:space:]].* (-j|--jobs=)( *[0-9]+).*/\1\2/p') all: $(SPDK_ROOT_DIR)/dpdk/build-tmp $(Q)# DPDK doesn't handle nested make calls, so unset MAKEFLAGS