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