ivampiresp/Spdk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

build: don't put out-of-tree ocf build in build/ dir

Browse Source 
When we are testing out-of-tree ocf builds, don't
put the resulting binary in the build directory.
An upcoming patch will enable 'make clean' to just
remove the entire build/ directory, which would
then include this ocf.a binary.

Signed-off-by: Jim Harris <james.r.harris@intel.com>
Change-Id: I74040fc414a5009faffaeada7fd76842b8cad38e
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/9170
Community-CI: Broadcom CI <spdk-ci.pdl@broadcom.com>
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Changpeng Liu <changpeng.liu@intel.com>
Reviewed-by: Tomasz Zawadzki <tomasz.zawadzki@intel.com>
This commit is contained in:
Jim Harris 2021-08-12 21:29:26 +00:00 committed by Tomasz Zawadzki
parent 076d14ce4b
commit 9ef1a55d0a
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
autobuild.sh
View File

@ -45,9 +45,9 @@ function ocf_precompile() {
# So we precompile OCF now for further use as standalone static library # So we precompile OCF now for further use as standalone static library
./configure $(echo $config_params | sed 's/--enable-coverage//g') ./configure $(echo $config_params | sed 's/--enable-coverage//g')
$MAKE $MAKEFLAGS include/spdk/config.h $MAKE $MAKEFLAGS include/spdk/config.h
CC=gcc CCAR=ar $MAKE $MAKEFLAGS -C lib/env_ocf exportlib O=$rootdir/build/ocf.a CC=gcc CCAR=ar $MAKE $MAKEFLAGS -C lib/env_ocf exportlib O=$rootdir/ocf.a
# Set config to use precompiled library # Set config to use precompiled library
config_params="$config_params --with-ocf=/$rootdir/build/ocf.a" config_params="$config_params --with-ocf=/$rootdir/ocf.a"
# need to reconfigure to avoid clearing ocf related files on future make clean. # need to reconfigure to avoid clearing ocf related files on future make clean.
./configure $config_params ./configure $config_params
} }

4
test/common/config/pkgdep/git
View File

@ -90,8 +90,8 @@ function install_refspdk() {
$output_dir/configure $(echo $config_params | sed 's/--enable-coverage//g') $output_dir/configure $(echo $config_params | sed 's/--enable-coverage//g')
if [[ $OSID != freebsd ]]; then if [[ $OSID != freebsd ]]; then
$MAKE -C $output_dir $MAKEFLAGS include/spdk/config.h $MAKE -C $output_dir $MAKEFLAGS include/spdk/config.h
CONFIG_OCF_PATH="$output_dir/ocf" $MAKE -C $output_dir/lib/env_ocf $MAKEFLAGS exportlib O=$output_dir/build/ocf.a CONFIG_OCF_PATH="$output_dir/ocf" $MAKE -C $output_dir/lib/env_ocf $MAKEFLAGS exportlib O=$output_dir/ocf.a
$output_dir/configure $config_params --with-ocf=$output_dir/build/ocf.a --with-shared $output_dir/configure $config_params --with-ocf=$output_dir/ocf.a --with-shared
fi fi
$MAKE -C $output_dir $MAKEFLAGS $MAKE -C $output_dir $MAKEFLAGS
) )

2
test/make/check_so_deps.sh
View File

@ -243,7 +243,7 @@ function confirm_makefile_deps() {
config_params=$(get_config_params) config_params=$(get_config_params)
if [ "$SPDK_TEST_OCF" -eq 1 ]; then if [ "$SPDK_TEST_OCF" -eq 1 ]; then
config_params="$config_params --with-ocf=$rootdir/build/ocf.a" config_params="$config_params --with-ocf=$rootdir/ocf.a"
fi fi
$MAKE $MAKEFLAGS clean $MAKE $MAKEFLAGS clean