Util-Linux Archive on lore.kernel.org
 help / color / Atom feed
* [BUGFIX PATCH] libmount: Add libselinux dependency to pkgconfig file
@ 2019-10-11  7:15 Masami Hiramatsu
  2019-10-11  8:31 ` Karel Zak
  0 siblings, 1 reply; 2+ messages in thread
From: Masami Hiramatsu @ 2019-10-11  7:15 UTC (permalink / raw)
  To: util-linux; +Cc: mhiramat, Karel Zak

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


^ permalink raw reply	[flat|nested] 2+ messages in thread

* Re: [BUGFIX PATCH] libmount: Add libselinux dependency to pkgconfig file
  2019-10-11  7:15 [BUGFIX PATCH] libmount: Add libselinux dependency to pkgconfig file Masami Hiramatsu
@ 2019-10-11  8:31 ` Karel Zak
  0 siblings, 0 replies; 2+ messages in thread
From: Karel Zak @ 2019-10-11  8:31 UTC (permalink / raw)
  To: Masami Hiramatsu; +Cc: util-linux

On Fri, Oct 11, 2019 at 04:15:35PM +0900, Masami Hiramatsu wrote:
>  Makefile.am          |    6 ++++++
>  libmount/mount.pc.in |    2 +-
>  2 files changed, 7 insertions(+), 1 deletion(-)

Oh, really good catch. It seems libselinux is missing there for years.

Applied, thanks.

    Karel

-- 
 Karel Zak  <kzak@redhat.com>
 http://karelzak.blogspot.com

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, back to index

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-10-11  7:15 [BUGFIX PATCH] libmount: Add libselinux dependency to pkgconfig file Masami Hiramatsu
2019-10-11  8:31 ` Karel Zak

Util-Linux Archive on lore.kernel.org

Archives are clonable:
	git clone --mirror https://lore.kernel.org/util-linux/0 util-linux/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 util-linux util-linux/ https://lore.kernel.org/util-linux \
		util-linux@vger.kernel.org
	public-inbox-index util-linux

Example config snippet for mirrors

Newsgroup available over NNTP:
	nntp://nntp.lore.kernel.org/org.kernel.vger.util-linux


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git