| Patrick Williams | b48b7b4 | 2016-08-17 15:04:38 -0500 | [diff] [blame^] | 1 | Always use devmapper |
| 2 | |
| 3 | Do not try to compute several _API_ make variables |
| 4 | from host information when cross-compiling. |
| 5 | |
| 6 | Upstream-Status: Inappropriate [embedded specific] |
| 7 | |
| 8 | Signed-off-by: Aws Ismail <aws.ismail@windriver.com> |
| 9 | Signed-off-by: Joe Slater <joe.slater@windriver.com> |
| 10 | |
| 11 | diff --git a/libmultipath/Makefile b/libmultipath/Makefile |
| 12 | index e5b06b3..efd6cf6 100644 |
| 13 | --- a/libmultipath/Makefile |
| 14 | +++ b/libmultipath/Makefile |
| 15 | @@ -17,23 +17,18 @@ OBJS = memory.o parser.o vector.o devmapper.o \ |
| 16 | log.o configure.o structs_vec.o sysfs.o prio.o checkers.o \ |
| 17 | lock.o waiter.o file.o wwids.o |
| 18 | |
| 19 | -LIBDM_API_FLUSH = $(shell grep -Ecs '^[a-z]*[[:space:]]+dm_task_no_flush' /usr/include/libdevmapper.h) |
| 20 | |
| 21 | -ifneq ($(strip $(LIBDM_API_FLUSH)),0) |
| 22 | +#ifneq ($(strip $(LIBDM_API_FLUSH)),0) |
| 23 | CFLAGS += -DLIBDM_API_FLUSH -D_GNU_SOURCE |
| 24 | -endif |
| 25 | +#endif |
| 26 | |
| 27 | -LIBDM_API_COOKIE = $(shell grep -Ecs '^[a-z]*[[:space:]]+dm_task_set_cookie' /usr/include/libdevmapper.h) |
| 28 | - |
| 29 | -ifneq ($(strip $(LIBDM_API_COOKIE)),0) |
| 30 | +#ifneq ($(strip $(LIBDM_API_COOKIE)),0) |
| 31 | CFLAGS += -DLIBDM_API_COOKIE |
| 32 | -endif |
| 33 | - |
| 34 | -LIBUDEV_API_RECVBUF = $(shell grep -Ecs '^[a-z]*[[:space:]]+udev_monitor_set_resolve_buffer_size' /usr/include/libudev.h) |
| 35 | +#endif |
| 36 | |
| 37 | -ifneq ($(strip $(LIBUDEV_API_RECVBUF)),0) |
| 38 | +#ifneq ($(strip $(LIBUDEV_API_RECVBUF)),0) |
| 39 | CFLAGS += -DLIBUDEV_API_RECVBUF |
| 40 | -endif |
| 41 | +#endif |
| 42 | |
| 43 | |
| 44 | all: $(LIBS) |