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

ocf: Move ocf configuration to Makefile

Browse Source 
Signed-off-by: Piotr Pelplinski <piotr.pelplinski@intel.com>
Change-Id: I116b53319152b229900e56afc6277340a9daa988
Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/445261
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Vitaliy Mysak <vitaliy.mysak@intel.com>
Reviewed-by: Darek Stojaczyk <dariusz.stojaczyk@intel.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
Reviewed-by: Tomasz Zawadzki <tomasz.zawadzki@intel.com>
This commit is contained in:
Piotr Pelplinski 2019-02-22 13:24:30 +01:00 committed by Jim Harris
parent 1fc4165fe9
commit d6c4518c69
2 changed files with 37 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
configure vendored
View File

@ -467,23 +467,6 @@ if [[ "${CONFIG[OCF]}" = "y" ]]; then
else
CONFIG[CUSTOMOCF]=n
fi
# If OCF_PATH is not a library, we need to do sources export procedure using OCF Makefile
if [[ ${CONFIG[CUSTOMOCF]} = "n" ]]; then
echo "configuring OCF..."
rootdir=$(readlink -f $(dirname $0))
if pushd "${CONFIG[OCF_PATH]}" > /dev/null && \
make inc O="$rootdir/lib/bdev/ocf/env/" && \
make src O="$rootdir/lib/bdev/ocf/env/" CMD=cp 1>/dev/null && \
popd > /dev/null
then
echo "done configuring OCF"
else
echo "Could not configure OCF"
exit 1
fi
fi
fi
if [[ "${CONFIG[PGO_CAPTURE]}" = "y" && "${CONFIG[PGO_USE]}" = "y" ]]; then

47
lib/bdev/ocf/env/Makefile vendored
View File

@ -44,29 +44,56 @@ include $(SPDK_ROOT_DIR)/mk/spdk.common.mk
LIBNAME := ocfenv
ifeq ($(CONFIG_CUSTOMOCF),n)
CFLAGS += $(ENV_CFLAGS) -I$(CURDIR) -I$(CURDIR)/include -w
C_SRCS = $(shell find -name \*.c)
include $(SPDK_ROOT_DIR)/mk/spdk.lib.mk
else
LIB = $(call spdk_lib_list_to_static_libs,$(LIBNAME))
all: $(LIB)
ifeq ($(CONFIG_CUSTOMOCF),y)
.PHONY: all clean install
all:
$(Q)$(MAKE) $(LIB)
clean:
$(Q)rm -f $(LIB)
$(LIB):
cp $(CONFIG_OCF_PATH) $(LIB)
clean:
$(Q)rm -f $(LIB)
install:
else
.PHONY: all clean install ocf_inc ocf_src ocf_distclean all exportlib
all: ocf_inc ocf_src
$(Q)$(MAKE) $(LIB)
ocf_inc:
$(Q)$(MAKE) -C "$(CONFIG_OCF_PATH)" inc O="$(SPDK_ROOT_DIR)/lib/bdev/ocf/env/" --quiet
ocf_src:
$(Q)$(MAKE) -C "$(CONFIG_OCF_PATH)" src O="$(SPDK_ROOT_DIR)/lib/bdev/ocf/env/" CMD=cp --quiet
ocf_distclean:
$(Q)$(MAKE) -C "$(CONFIG_OCF_PATH)" distclean O="$(SPDK_ROOT_DIR)/lib/bdev/ocf/env/" --quiet
clean: ocf_distclean
$(Q)rm -rf "$(SPDK_ROOT_DIR)/lib/bdev/ocf/env/include" \
"$(SPDK_ROOT_DIR)/lib/bdev/ocf/env/src" \
$(LIB) $(OBJS);
$(LIB): $(OBJS)
$(LIB_C)
install:
endif
exportlib: $(LIB)
exportlib: all
@ if [ -z $(O) ]; then echo "No output specified"; exit 1; fi
cp $(LIB) $(O)