CONFIG: allow overriding options in make command

Change-Id: Iba75d4b4be0175e8ddd5d5905eece1e2c9f6db51
Signed-off-by: Daniel Verkamp <daniel.verkamp@intel.com>
This commit is contained in:
Daniel Verkamp 2015-10-22 12:18:38 -07:00
parent 4f677a1d4c
commit d5ced366c0
3 changed files with 6 additions and 9 deletions

7
CONFIG
View File

@ -32,14 +32,13 @@
# #
# Build with debug logging. Turn off for performance testing and normal usage # Build with debug logging. Turn off for performance testing and normal usage
CONFIG_DEBUG=y CONFIG_DEBUG?=y
# This directory should contain 'include' and 'lib' directories for your DPDK # This directory should contain 'include' and 'lib' directories for your DPDK
# installation. Alternatively you can specify this on the command line # installation. Alternatively you can specify this on the command line
# with 'make DPDK_DIR=/path/to/dpdk'. # with 'make DPDK_DIR=/path/to/dpdk'.
CONFIG_DPDK_DIR=/path/to/dpdk CONFIG_DPDK_DIR?=/path/to/dpdk
# Header file to use for NVMe implementation specific functions. # Header file to use for NVMe implementation specific functions.
# Defaults to depending on DPDK. # Defaults to depending on DPDK.
CONFIG_NVME_IMPL=nvme_impl.h CONFIG_NVME_IMPL?=nvme_impl.h

View File

@ -26,7 +26,7 @@ $MAKE $MAKEFLAGS clean
timing_enter scanbuild_make timing_enter scanbuild_make
fail=0 fail=0
time $scanbuild $MAKE $MAKEFLAGS DPDK_DIR=$DPDK_DIR || fail=1 time $scanbuild $MAKE $MAKEFLAGS DPDK_DIR=$DPDK_DIR CONFIG_DEBUG=y || fail=1
timing_exit scanbuild_make timing_exit scanbuild_make
# Check that header file dependencies are working correctly by # Check that header file dependencies are working correctly by
@ -34,7 +34,7 @@ timing_exit scanbuild_make
# header file and re-making. # header file and re-making.
STAT1=`stat examples/nvme/identify/identify` STAT1=`stat examples/nvme/identify/identify`
touch lib/nvme/nvme_internal.h touch lib/nvme/nvme_internal.h
$MAKE $MAKEFLAGS DPDK_DIR=$DPDK_DIR || fail=1 $MAKE $MAKEFLAGS DPDK_DIR=$DPDK_DIR CONFIG_DEBUG=y || fail=1
STAT2=`stat examples/nvme/identify/identify` STAT2=`stat examples/nvme/identify/identify`
if [ "$STAT1" == "$STAT2" ]; then if [ "$STAT1" == "$STAT2" ]; then

View File

@ -36,9 +36,7 @@ echo "tmpdir=$tmpdir"
tar -C "$tmpdir" -xf $out/$tarball tar -C "$tmpdir" -xf $out/$tarball
( (
cd "$tmpdir"/spdk-* cd "$tmpdir"/spdk-*
cp CONFIG CONFIG.orig time $MAKE ${MAKEFLAGS} DPDK_DIR=$DPDK_DIR CONFIG_DEBUG=n
sed -e 's/CONFIG_DEBUG=y/CONFIG_DEBUG=n/' <CONFIG.orig >CONFIG
time $MAKE ${MAKEFLAGS} DPDK_DIR=$DPDK_DIR
) )
rm -rf "$tmpdir" rm -rf "$tmpdir"