From 4af058edd46fd6a1afd49a8a8b33aae5e00a511b Mon Sep 17 00:00:00 2001 From: Bart Van Assche Date: Fri, 31 May 2019 01:23:20 +0000 Subject: [PATCH] srpt: Fix the build against Oracle Linux + MOFED Disable DTrace when building against MOFED to avoid hitting compatibility issue between DTrace and MOFED. Signed-off-by: Sergey Gorenko git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@8400 d57e44dd-8a1f-0410-8b47-8ef2f437770f --- srpt/Makefile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/srpt/Makefile b/srpt/Makefile index d262a64dc..acd2fcc9f 100644 --- a/srpt/Makefile +++ b/srpt/Makefile @@ -69,6 +69,7 @@ OFED_CFLAGS:=-I$(OFED_KERNEL_DIR)/include \ -include "linux/compat-2.6.h" OFED_CFLAGS+=-DMOFED_MAJOR=$(shell echo "$(OFED_VERS)" | sed 's/\([0-9]\+\)[^0-9]\+\([0-9]\+\).*/\1/g') OFED_CFLAGS+=-DMOFED_MINOR=$(shell echo "$(OFED_VERS)" | sed 's/\([0-9]\+\)[^0-9]\+\([0-9]\+\).*/\2/g') +OFED_CONFIG:=CONFIG_DTRACE= else # OFED 1.5 OFED_KERNEL_DIR:=/usr/src/ofa_kernel @@ -81,7 +82,7 @@ OFED_MODULE_SYMVERS:=$(OFED_KERNEL_DIR)/$(MODULE_SYMVERS) 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/*) @@ -97,7 +98,7 @@ PRE_CFLAGS = $(OFED_CFLAGS) \ done) all: check src/$(MODULE_SYMVERS) $(CONFTEST_OUTPUTS) - $(MAKE) -C $(KDIR) M=$(shell pwd)/src PRE_CFLAGS="$(PRE_CFLAGS)" modules + $(MAKE) -C $(KDIR) M=$(shell pwd)/src PRE_CFLAGS="$(PRE_CFLAGS)" $(OFED_CONFIG) modules src/$(MODULE_SYMVERS): $(SCST_DIR)/$(MODULE_SYMVERS) $(OFED_MODULE_SYMVERS) cat $^ | \