| Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 1 | From 1498338970a093fccbda3e33f5588a289ef2c66a Mon Sep 17 00:00:00 2001 |
| 2 | From: Hongxu Jia <hongxu.jia@windriver.com> |
| 3 | Date: Wed, 5 Jul 2017 02:59:46 -0400 |
| 4 | Subject: [PATCH 13/14] 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 | libmultipath/Makefile | 19 ++++--------------- |
| 19 | 1 file changed, 4 insertions(+), 15 deletions(-) |
| 20 | |
| 21 | diff --git a/libmultipath/Makefile b/libmultipath/Makefile |
| 22 | index b3244fc..9006b3f 100644 |
| 23 | --- a/libmultipath/Makefile |
| 24 | +++ b/libmultipath/Makefile |
| 25 | @@ -20,21 +20,10 @@ ifdef SYSTEMD |
| 26 | endif |
| 27 | endif |
| 28 | |
| 29 | -ifneq ($(call check_func,dm_task_no_flush,/usr/include/libdevmapper.h),0) |
| 30 | - CFLAGS += -DLIBDM_API_FLUSH -D_GNU_SOURCE |
| 31 | -endif |
| 32 | - |
| 33 | -ifneq ($(call check_func,dm_task_set_cookie,/usr/include/libdevmapper.h),0) |
| 34 | - CFLAGS += -DLIBDM_API_COOKIE |
| 35 | -endif |
| 36 | - |
| 37 | -ifneq ($(call check_func,udev_monitor_set_receive_buffer_size,/usr/include/libudev.h),0) |
| 38 | - CFLAGS += -DLIBUDEV_API_RECVBUF |
| 39 | -endif |
| 40 | - |
| 41 | -ifneq ($(call check_func,dm_task_deferred_remove,/usr/include/libdevmapper.h),0) |
| 42 | - CFLAGS += -DLIBDM_API_DEFERRED |
| 43 | -endif |
| 44 | +CFLAGS += -DLIBDM_API_FLUSH -D_GNU_SOURCE |
| 45 | +CFLAGS += -DLIBDM_API_COOKIE |
| 46 | +CFLAGS += -DLIBUDEV_API_RECVBUF |
| 47 | +CFLAGS += -DLIBDM_API_DEFERRED |
| 48 | |
| 49 | OBJS = memory.o parser.o vector.o devmapper.o callout.o \ |
| 50 | hwtable.o blacklist.o util.o dmparser.o config.o \ |
| 51 | -- |
| 52 | 2.8.1 |
| 53 | |