1From 922855e245c8bdadc0d24b5b706549b18fb5f079 Mon Sep 17 00:00:00 2001
2From: Alexander Egorenkov <egorenar-dev@posteo.net>
3Date: Sat, 21 Nov 2020 11:08:56 +0100
4Subject: [PATCH] kpartx, libmultipath: use pkg-config to get path to
5 headers
6
7Use pkg-config in Makefile to find path to devmapper and udev headers
8to enable cross-compilation.
9
10Signed-off-by: Alexander Egorenkov <egorenar-dev@posteo.net>
11---
12 kpartx/Makefile       |  2 +-
13 libmultipath/Makefile | 12 ++++++------
14 2 files changed, 7 insertions(+), 7 deletions(-)
15
16diff --git a/kpartx/Makefile b/kpartx/Makefile
17index 2906a984..29573890 100644
18--- a/kpartx/Makefile
19+++ b/kpartx/Makefile
20@@ -8,7 +8,7 @@ LDFLAGS += $(BIN_LDFLAGS)
21
22 LIBDEPS += -ldevmapper
23
24-ifneq ($(call check_func,dm_task_set_cookie,/usr/include/libdevmapper.h),0)
25+ifneq ($(call check_func,dm_task_set_cookie,$(shell $(PKG_CONFIG) --variable=includedir devmapper)/libdevmapper.h),0)
26 	CFLAGS += -DLIBDM_API_COOKIE
27 endif
28
29diff --git a/libmultipath/Makefile b/libmultipath/Makefile
30index 62ba16e8..3ad9130c 100644
31--- a/libmultipath/Makefile
32+++ b/libmultipath/Makefile
33@@ -20,27 +20,27 @@ ifdef SYSTEMD
34 	endif
35 endif
36
37-ifneq ($(call check_func,dm_task_no_flush,/usr/include/libdevmapper.h),0)
38+ifneq ($(call check_func,dm_task_no_flush,$(shell $(PKG_CONFIG) --variable=includedir devmapper)/libdevmapper.h),0)
39 	CFLAGS += -DLIBDM_API_FLUSH -D_GNU_SOURCE
40 endif
41
42-ifneq ($(call check_func,dm_task_get_errno,/usr/include/libdevmapper.h),0)
43+ifneq ($(call check_func,dm_task_get_errno,$(shell $(PKG_CONFIG) --variable=includedir devmapper)/libdevmapper.h),0)
44 	CFLAGS += -DLIBDM_API_GET_ERRNO
45 endif
46
47-ifneq ($(call check_func,dm_task_set_cookie,/usr/include/libdevmapper.h),0)
48+ifneq ($(call check_func,dm_task_set_cookie,$(shell $(PKG_CONFIG) --variable=includedir devmapper)/libdevmapper.h),0)
49 	CFLAGS += -DLIBDM_API_COOKIE
50 endif
51
52-ifneq ($(call check_func,udev_monitor_set_receive_buffer_size,/usr/include/libudev.h),0)
53+ifneq ($(call check_func,udev_monitor_set_receive_buffer_size,$(shell $(PKG_CONFIG) --variable=includedir libudev)/libudev.h),0)
54 	CFLAGS += -DLIBUDEV_API_RECVBUF
55 endif
56
57-ifneq ($(call check_func,dm_task_deferred_remove,/usr/include/libdevmapper.h),0)
58+ifneq ($(call check_func,dm_task_deferred_remove,$(shell $(PKG_CONFIG) --variable=includedir devmapper)/libdevmapper.h),0)
59 	CFLAGS += -DLIBDM_API_DEFERRED
60 endif
61
62-ifneq ($(call check_func,dm_hold_control_dev,/usr/include/libdevmapper.h),0)
63+ifneq ($(call check_func,dm_hold_control_dev,$(shell $(PKG_CONFIG) --variable=includedir devmapper)/libdevmapper.h),0)
64 	CFLAGS += -DLIBDM_API_HOLD_CONTROL
65 endif
66
67--
682.29.2
69
70