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 4/4] multipath-tools: allow passing non-standard linux-headers location
Date: Sun, 9 Jan 2022 10:29:08 +0000 [thread overview]
Message-ID: <20220109102908.4102332-4-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.
The change switches linux/nvme_ioctl.h discovery to user provided path.
CC: Martin Wilck <mwilck@suse.com>
CC: Benjamin Marzinski <bmarzins@redhat.com>
Signed-off-by: Sergei Trofimovich <slyich@gmail.com>
---
Makefile.inc | 5 +++++
libmultipath/prioritizers/Makefile | 2 +-
2 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/Makefile.inc b/Makefile.inc
index f5509db4..a7d16dfd 100644
--- a/Makefile.inc
+++ b/Makefile.inc
@@ -68,6 +68,11 @@ ifndef LIBUDEV_INCDIR
endif
endif
+# Allow user to override default location.
+ifndef LINUX_HEADERS_INCDIR
+ LINUX_HEADERS_INCDIR = /usr/include
+endif
+
prefix =
exec_prefix = $(prefix)
usr_prefix = $(prefix)
diff --git a/libmultipath/prioritizers/Makefile b/libmultipath/prioritizers/Makefile
index 8d34ae32..16c63977 100644
--- a/libmultipath/prioritizers/Makefile
+++ b/libmultipath/prioritizers/Makefile
@@ -23,7 +23,7 @@ LIBS = \
libpriopath_latency.so \
libpriosysfs.so
-ifneq ($(call check_file,/usr/include/linux/nvme_ioctl.h),0)
+ifneq ($(call check_file,$(LINUX_HEADERS_INCDIR)/linux/nvme_ioctl.h),0)
LIBS += libprioana.so
CFLAGS += -I../nvme
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 ` [dm-devel] [PATCH 3/4] multipath-tools: autodiscover libudev.h headers Sergei Trofimovich
2022-01-09 10:29 ` Sergei Trofimovich [this message]
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-4-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.