From: Sergei Trofimovich <slyich@gmail.com>
To: dm-devel@redhat.com
Cc: Sergei Trofimovich <slyich@gmail.com>, Martin Wilck <mwilck@suse.com>
Subject: [dm-devel] [PATCH 3/4] multipath-tools: autodiscover libudev.h headers
Date: Sun, 9 Jan 2022 10:29:07 +0000 [thread overview]
Message-ID: <20220109102908.4102332-3-slyich@gmail.com> (raw)
In-Reply-To: <20220109102908.4102332-1-slyich@gmail.com>
On NixOS nothing is installed in /usr/include and instead lives
in it's own prefix. pkg-config variables are expected to be used
for installation discovery:
$ pkg-config --variable=includedir libudev
/nix/store/27mwkz5zhzw0gip8y7pvjyma5r0hzzaw-systemd-249.7-dev/include
The change switches libudev.h discovery to pkg-config provided path.
CC: Martin Wilck <mwilck@suse.com>
CC: Benjamin Marzinski <bmarzins@redhat.com>
Signed-off-by: Sergei Trofimovich <slyich@gmail.com>
---
Makefile.inc | 8 ++++++++
libmultipath/Makefile | 2 +-
2 files changed, 9 insertions(+), 1 deletion(-)
diff --git a/Makefile.inc b/Makefile.inc
index 3b50395f..f5509db4 100644
--- a/Makefile.inc
+++ b/Makefile.inc
@@ -60,6 +60,14 @@ ifndef DEVMAPPER_INCDIR
endif
endif
+ifndef LIBUDEV_INCDIR
+ ifeq ($(shell $(PKGCONFIG) --modversion libudev >/dev/null 2>&1 && echo 1), 1)
+ LIBUDEV_INCDIR = $(shell $(PKGCONFIG) --variable=includedir libudev)
+ else
+ LIBUDEV_INCDIR = /usr/include
+ endif
+endif
+
prefix =
exec_prefix = $(prefix)
usr_prefix = $(prefix)
diff --git a/libmultipath/Makefile b/libmultipath/Makefile
index be48775d..46972faf 100644
--- a/libmultipath/Makefile
+++ b/libmultipath/Makefile
@@ -33,7 +33,7 @@ ifneq ($(call check_func,dm_task_set_cookie,$(DEVMAPPER_INCDIR)/libdevmapper.h),
CFLAGS += -DLIBDM_API_COOKIE
endif
-ifneq ($(call check_func,udev_monitor_set_receive_buffer_size,/usr/include/libudev.h),0)
+ifneq ($(call check_func,udev_monitor_set_receive_buffer_size,$(LIBUDEV_INCDIR)/libudev.h),0)
CFLAGS += -DLIBUDEV_API_RECVBUF
endif
--
2.34.1
--
dm-devel mailing list
dm-devel@redhat.com
https://listman.redhat.com/mailman/listinfo/dm-devel
next prev parent reply other threads:[~2022-01-09 10:29 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-01-09 10:29 [dm-devel] [PATCH 1/4] multipath-tools: avoid using GZIP Makefile variable Sergei Trofimovich
2022-01-09 10:29 ` [dm-devel] [PATCH 2/4] multipath-tools: autodiscover libdevmapper.h headers Sergei Trofimovich
2022-01-09 10:29 ` Sergei Trofimovich [this message]
2022-01-09 10:29 ` [dm-devel] [PATCH 4/4] multipath-tools: allow passing non-standard linux-headers location Sergei Trofimovich
2022-01-10 18:29 ` [dm-devel] [PATCH 1/4] multipath-tools: avoid using GZIP Makefile variable Martin Wilck
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220109102908.4102332-3-slyich@gmail.com \
--to=slyich@gmail.com \
--cc=dm-devel@redhat.com \
--cc=mwilck@suse.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.