Commit 9ef1a55d authored by Jim Harris's avatar Jim Harris Committed by Tomasz Zawadzki
Browse files

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



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: default avatarJim 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: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarChangpeng Liu <changpeng.liu@intel.com>
Reviewed-by: default avatarTomasz Zawadzki <tomasz.zawadzki@intel.com>
parent 076d14ce

autobuild.sh

+2 −2
Original line number Diff line number Diff line
@@ -45,9 +45,9 @@ function ocf_precompile() { 
	# So we precompile OCF now for further use as standalone static library

	./configure $(echo $config_params | sed 's/--enable-coverage//g')

	$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

	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.

	./configure $config_params

}

test/common/config/pkgdep/git

+2 −2
Original line number Diff line number Diff line
@@ -90,8 +90,8 @@ function install_refspdk() { 
		$output_dir/configure $(echo $config_params | sed 's/--enable-coverage//g')

		if [[ $OSID != freebsd ]]; then

			$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

			$output_dir/configure $config_params --with-ocf=$output_dir/build/ocf.a --with-shared

			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/ocf.a --with-shared

		fi

		$MAKE -C $output_dir $MAKEFLAGS

	)

test/make/check_so_deps.sh

+1 −1
Original line number Diff line number Diff line
@@ -243,7 +243,7 @@ function confirm_makefile_deps() { 


config_params=$(get_config_params)

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



$MAKE $MAKEFLAGS clean