1From e4acb46b10484d1da6f093257e34f269832e6a37 Mon Sep 17 00:00:00 2001 2From: Changqing Li <changqing.li@windriver.com> 3Date: Mon, 26 Nov 2018 11:17:41 +0800 4Subject: [PATCH] Subject: [PATCH] Always use devmapper 5 6Do not try to compute several _API_ make variables 7from host information when cross-compiling. 8 9Upstream-Status: Inappropriate [embedded specific] 10 11Signed-off-by: Aws Ismail <aws.ismail@windriver.com> 12Signed-off-by: Joe Slater <joe.slater@windriver.com> 13 14Rebase to 0.7.1 15 16Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> 17 18Rebase to 0.7.7 19 20Signed-off-by: Changqing Li <changqing.li@windriver.com> 21 22Rebase to 0.7.9 23Signed-off-by: Changqing Li <changqing.li@windriver.com> 24--- 25 libmultipath/Makefile | 19 ++++--------------- 26 1 file changed, 4 insertions(+), 15 deletions(-) 27 28diff --git a/libmultipath/Makefile b/libmultipath/Makefile 29index 33f5269..adf6f4a 100644 30--- a/libmultipath/Makefile 31+++ b/libmultipath/Makefile 32@@ -20,21 +20,10 @@ ifdef SYSTEMD 33 endif 34 endif 35 36-ifneq ($(call check_func,dm_task_no_flush,/usr/include/libdevmapper.h),0) 37- CFLAGS += -DLIBDM_API_FLUSH -D_GNU_SOURCE 38-endif 39- 40-ifneq ($(call check_func,dm_task_set_cookie,/usr/include/libdevmapper.h),0) 41- CFLAGS += -DLIBDM_API_COOKIE 42-endif 43- 44-ifneq ($(call check_func,udev_monitor_set_receive_buffer_size,/usr/include/libudev.h),0) 45- CFLAGS += -DLIBUDEV_API_RECVBUF 46-endif 47- 48-ifneq ($(call check_func,dm_task_deferred_remove,/usr/include/libdevmapper.h),0) 49- CFLAGS += -DLIBDM_API_DEFERRED 50-endif 51+CFLAGS += -DLIBDM_API_FLUSH -D_GNU_SOURCE 52+CFLAGS += -DLIBDM_API_COOKIE 53+CFLAGS += -DLIBUDEV_API_RECVBUF 54+CFLAGS += -DLIBDM_API_DEFERRED 55 56 OBJS = memory.o parser.o vector.o devmapper.o callout.o \ 57 hwtable.o blacklist.o util.o dmparser.o config.o \ 58-- 592.7.4 60 61