From: Masami Hiramatsu <mhiramat@kernel.org>
To: util-linux@vger.kernel.org
Cc: mhiramat@kernel.org, Karel Zak <kzak@redhat.com>
Subject: [BUGFIX PATCH] libmount: Add libselinux dependency to pkgconfig file
Date: Fri, 11 Oct 2019 16:15:35 +0900 [thread overview]
Message-ID: <157077813529.32660.383807974560795120.stgit@devnote2> (raw)
Add libselinux dependency to libmount if it is compiled
with selinux support.
Without this fix, 'pkg-config --libs --static mount' doesn't
show libselinux related options.
Signed-off-by: Masami Hiramatsu <mhiramat@kernel.org>
---
Makefile.am | 6 ++++++
libmount/mount.pc.in | 2 +-
2 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/Makefile.am b/Makefile.am
index 51c649909..9ef752f3c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -136,6 +136,12 @@ edit_cmd = sed \
-e 's|@LIBFDISK_PATCH_VERSION[@]|$(LIBFDISK_PATCH_VERSION)|g' \
-e 's|@LIBBLKID_VERSION[@]|$(LIBBLKID_VERSION)|g'
+if HAVE_SELINUX
+edit_cmd += -e 's|@LIBSELINUX[@]|libselinux|g'
+else
+edit_cmd += -e 's|@LIBSELINUX[@]||g'
+endif
+
CLEANFILES += $(PATHFILES)
EXTRA_DIST += $(PATHFILES:=.in)
diff --git a/libmount/mount.pc.in b/libmount/mount.pc.in
index 7371b23c1..d5f0d4b55 100644
--- a/libmount/mount.pc.in
+++ b/libmount/mount.pc.in
@@ -17,6 +17,6 @@ includedir=@includedir@
Name: mount
Description: mount library
Version: @LIBMOUNT_VERSION@
-Requires.private: blkid
+Requires.private: blkid @LIBSELINUX@
Cflags: -I${includedir}/libmount
Libs: -L${libdir} -lmount
next reply other threads:[~2019-10-11 7:15 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-10-11 7:15 Masami Hiramatsu [this message]
2019-10-11 8:31 ` [BUGFIX PATCH] libmount: Add libselinux dependency to pkgconfig file Karel Zak
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=157077813529.32660.383807974560795120.stgit@devnote2 \
--to=mhiramat@kernel.org \
--cc=kzak@redhat.com \
--cc=util-linux@vger.kernel.org \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox