File 0001-Introduce-new-build-dependency-on-libblkid... of Package udisks2

Overview Repositories Revisions Requests Users Attributes Meta

File 0001-Introduce-new-build-dependency-on-libblkid.patch of Package udisks2

From d9c72aa59130c6691304b0b81cf0837a0ecc932b Mon Sep 17 00:00:00 2001
From: David Riebenbauer <davrieb@liegesta.at>
Date: Mon, 26 May 2014 09:49:43 +0200
Subject: [PATCH 1/2] Introduce new build dependency on libblkid

Link against libblkid to get a way to probe media of legacy devices,
like floppy drives, for the media's filesystem prior to mounting.

Note that on the majority of systems, libblkid will already be present
and be used by both mount(8) and udevd(8). So, it won't introduce a
new runtime dependency, on these systems.

<https://bugs.freedesktop.org/show_bug.cgi?id=63849>
---
 configure.ac    | 4 ++++
 src/Makefile.am | 3 +++
 2 files changed, 7 insertions(+)

diff --git a/configure.ac b/configure.ac
index 3a39b5a..2e1c012 100644
--- a/configure.ac
+++ b/configure.ac
@@ -182,6 +182,10 @@ AC_SUBST(HAVE_LIBELOGIND)
 AC_SUBST(LIBELOGIND_CFLAGS)
 AC_SUBST(LIBELOGIND_LIBS)
 
+PKG_CHECK_MODULES(BLKID, [blkid >= 2.17.0])
+AC_SUBST(BLKID_CFLAGS)
+AC_SUBST(BLKID_LIBS)
+
 # udevdir
 AC_ARG_WITH([udevdir],
             AS_HELP_STRING([--with-udevdir=DIR], [Directory for udev]),
diff --git a/src/Makefile.am b/src/Makefile.am
index fc44c75..b505bd3 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -25,6 +25,7 @@ CPPFLAGS = \
 	$(GIO_CFLAGS)                                                          \
 	$(GMODULE_CFLAGS)                                                      \
 	$(WARN_CFLAGS)                                                         \
+	$(BLKID_CFLAGS)                                                        \
 	$(NULL)
 
 # ------------------------------------------------------------------------------
@@ -102,6 +103,7 @@ libudisks_daemon_la_CFLAGS = \
 	$(LIBSYSTEMD_LOGIN_CFLAGS)                                             \
 	$(LIBELOGIND_CFLAGS)                                                   \
 	$(PART_CFLAGS)                                                         \
+	$(BLKID_CFLAGS)                                                        \
 	$(NULL)
 
 libudisks_daemon_la_LIBADD =                                                   \
@@ -115,6 +117,7 @@ libudisks_daemon_la_LIBADD = \
 	$(LIBSYSTEMD_LOGIN_LIBS)                                               \
	$(LIBELOGIND_LIBS)                                                     \
	$(PART_LDFLAGS)                                                        \
+	$(BLKID_LIBS)                                                          \
 	$(top_builddir)/udisks/libudisks2.la                                   \
 	$(NULL)
 
-- 
2.0.0.rc4

Places

File 0001-Introduce-new-build-dependency-on-libblkid.patch of Package udisks2

Places