From 93a9cf11bca2f57b4323f201a8e64cfae1fa6b8c Mon Sep 17 00:00:00 2001 From: Bart Van Assche Date: Tue, 23 Jul 2019 15:08:29 +0000 Subject: [PATCH] iscsi-scst: Work around a compatibility problem between MOFED and DTRACE (merge r8396 from trunk) When building against Oracle Linux + MOFED the build fails unless if DTrace is disabled. Hence disable DTrace for the isert-scst module if MOFED is detected. Signed-off-by: Sergey Gorenko [ bvanassche: Left out one empty OFED_CONFIG assignment ] git-svn-id: http://svn.code.sf.net/p/scst/svn/branches/3.3.x@8468 d57e44dd-8a1f-0410-8b47-8ef2f437770f --- iscsi-scst/Makefile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/iscsi-scst/Makefile b/iscsi-scst/Makefile index 0a024c9ec..894047ad3 100644 --- a/iscsi-scst/Makefile +++ b/iscsi-scst/Makefile @@ -89,6 +89,7 @@ ifeq ($(OFED_FLAVOR),MOFED) -I$(OFED_DIR)/include/uapi \ -include $(OFED_DIR)/include/linux/compat-2.6.h ISER_SYMVERS:="$(ISER_SYMVERS) $(OFED_DIR)/Module.symvers" + OFED_CONFIG:= CONFIG_DTRACE= else # Whether or not the OFED kernel-ib-devel RPM has been installed. OFED_KERNEL_IB_DEVEL_RPM_INSTALLED:=$(shell if rpm -q kernel-ib-devel 2>/dev/null | grep -q $$(uname -r | sed 's/-/_/g'); then echo true; else echo false; fi) @@ -111,7 +112,7 @@ else endif # Use make instead of $(MAKE) to get rid of command-line option -i -run_conftest = $(shell if [ "0$(V)" -gt 0 ]; then output=/dev/stdout; else output=/dev/null; fi; if MAKEFLAGS= make -C $(KDIR) V=$(V) M="$(shell pwd)/conftest/$1" PRE_CFLAGS="-Werror $(OFED_CFLAGS)" 1>&2 2>$${output}; then echo "$(strip $2)"; else echo "$(strip $3)"; fi) +run_conftest = $(shell if [ "0$(V)" -gt 0 ]; then output=/dev/stdout; else output=/dev/null; fi; if MAKEFLAGS= make -C $(KDIR) V=$(V) M="$(shell pwd)/conftest/$1" PRE_CFLAGS="-Werror $(OFED_CFLAGS)" $(OFED_CONFIG) 1>&2 2>$${output}; then echo "$(strip $2)"; else echo "$(strip $3)"; fi) run_conftest_bool = $(call run_conftest,$1,-D$(strip $2)=1,-D$(strip $2)=0) CONFTESTS = $(shell ls -d conftest/*) @@ -136,7 +137,7 @@ mods: include/iscsi_scst_itf_ver.h Modules.symvers Module.symvers \ echo " Building against $(OFED_FLAVOR) InfiniBand kernel headers."; \ $(MAKE) -C $(KDIR) SCST_INC_DIR=$(SCST_INC_DIR) M=$(ISERTMOD) \ PRE_CFLAGS="$(ISER_CFLAGS)" \ - KBUILD_EXTRA_SYMBOLS=$(ISER_SYMVERS) modules; \ + KBUILD_EXTRA_SYMBOLS=$(ISER_SYMVERS) $(OFED_CONFIG) modules; \ fi progs: include/iscsi_scst_itf_ver.h