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