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