Code Review
/
deb_dpdk.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Changelog: Merge stable update to 16.11.2
[deb_dpdk.git]
/
scripts
/
validate-abi.sh
diff --git
a/scripts/validate-abi.sh
b/scripts/validate-abi.sh
index
c36ad61
..
52e4e7a
100755
(executable)
--- a/
scripts/validate-abi.sh
+++ b/
scripts/validate-abi.sh
@@
-97,6
+97,17
@@
fixup_config() {
#trap on ctrl-c to clean up
trap cleanup_and_exit SIGINT
#trap on ctrl-c to clean up
trap cleanup_and_exit SIGINT
+if [ -z "$DPDK_MAKE_JOBS" ]
+then
+ # This counts the number of cpus on the system
+ if [ -e /usr/bin/lscpu ]
+ then
+ DPDK_MAKE_JOBS=`lscpu -p=cpu | grep -v "#" | wc -l`
+ else
+ DPDK_MAKE_JOBS=1
+ fi
+fi
+
#Save the current branch
CURRENT_BRANCH=`git branch | grep \* | cut -d' ' -f2`
#Save the current branch
CURRENT_BRANCH=`git branch | grep \* | cut -d' ' -f2`
@@
-175,7
+186,7
@@
fixup_config
# Checking abi compliance relies on using the dwarf information in
# The shared objects. Thats only included in the DSO's if we build
# with -g
# Checking abi compliance relies on using the dwarf information in
# The shared objects. Thats only included in the DSO's if we build
# with -g
-export EXTRA_CFLAGS="$EXTRA_CFLAGS -g"
+export EXTRA_CFLAGS="$EXTRA_CFLAGS -g
-O0
"
export EXTRA_LDFLAGS="$EXTRA_LDFLAGS -g"
# Now configure the build
export EXTRA_LDFLAGS="$EXTRA_LDFLAGS -g"
# Now configure the build
@@
-183,7
+194,7
@@
log "INFO" "Configuring DPDK $TAG1"
make config T=$TARGET O=$TARGET > $VERBOSE 2>&1
log "INFO" "Building DPDK $TAG1. This might take a moment"
make config T=$TARGET O=$TARGET > $VERBOSE 2>&1
log "INFO" "Building DPDK $TAG1. This might take a moment"
-make O=$TARGET > $VERBOSE 2>&1
+make
-j$DPDK_MAKE_JOBS
O=$TARGET > $VERBOSE 2>&1
if [ $? -ne 0 ]
then
if [ $? -ne 0 ]
then
@@
-214,7
+225,7
@@
log "INFO" "Configuring DPDK $TAG2"
make config T=$TARGET O=$TARGET > $VERBOSE 2>&1
log "INFO" "Building DPDK $TAG2. This might take a moment"
make config T=$TARGET O=$TARGET > $VERBOSE 2>&1
log "INFO" "Building DPDK $TAG2. This might take a moment"
-make O=$TARGET > $VERBOSE 2>&1
+make
-j$DPDK_MAKE_JOBS
O=$TARGET > $VERBOSE 2>&1
if [ $? -ne 0 ]
then
if [ $? -ne 0 ]
then