From: Bryan Kadzban <bryan@kadzban.is-a-geek.net>
To: linux-hotplug@vger.kernel.org
Subject: [PATCH] Don't require dbus for libudev-core.la
Date: Thu, 31 May 2012 05:32:48 +0000 [thread overview]
Message-ID: <4FC70280.1090200@kadzban.is-a-geek.net> (raw)
[-- Attachment #1: Type: text/plain, Size: 621 bytes --]
Split libsystemd-label.la into libsystemd-label-no-dbus.la and
libsystemd-label.la (which depends on the first). Link the first into
libudev-core, and keep linking the second in everywhere else.
Fixes compilation of standalone udevd on systems that don't have dbus
installed.
Signed-Off-By: Bryan Kadzban <bryan@kadzban.is-a-geek.net>
----
(Attached since my mailer is trying to split lines if I dump the git
diff directly into the message. Patch is against current git.)
Compile-tested only, by rerunning autogen.sh, then configuring (faking
out the dbus pkg-config dependencies), then running make systemd-udevd.
[-- Attachment #2: systemd-split-label.patch --]
[-- Type: text/plain, Size: 1673 bytes --]
diff --git a/Makefile.am b/Makefile.am
index b62b9be..91dd363 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -606,6 +606,25 @@ libsystemd_dbus_la_LIBADD = \
# ------------------------------------------------------------------------------
noinst_LTLIBRARIES += \
+ libsystemd-label-no-dbus.la
+
+libsystemd_label_no_dbus_la_SOURCES = \
+ src/shared/label.c \
+ src/shared/label.h \
+ src/shared/mkdir.c \
+ src/shared/mkdir.h \
+ src/shared/dev-setup.c \
+ src/shared/dev-setup.h
+
+libsystemd_label_no_dbus_la_CFLAGS = \
+ $(AM_CFLAGS) \
+ $(SELINUX_CFLAGS)
+
+libsystemd_label_no_dbus_la_LIBADD = \
+ $(SELINUX_LIBS)
+
+# ------------------------------------------------------------------------------
+noinst_LTLIBRARIES += \
libsystemd-label.la
libsystemd_label_la_SOURCES = \
@@ -615,14 +634,8 @@ libsystemd_label_la_SOURCES = \
src/shared/path-lookup.h \
src/shared/cgroup-label.c \
src/shared/socket-label.c \
- src/shared/label.c \
- src/shared/label.h \
- src/shared/mkdir.c \
- src/shared/mkdir.h \
src/shared/ask-password-api.c \
- src/shared/ask-password-api.h \
- src/shared/dev-setup.c \
- src/shared/dev-setup.h
+ src/shared/ask-password-api.h
libsystemd_label_la_CFLAGS = \
$(AM_CFLAGS) \
@@ -630,6 +643,7 @@ libsystemd_label_la_CFLAGS = \
$(SELINUX_CFLAGS)
libsystemd_label_la_LIBADD = \
+ libsystemd-no-dbus.la \
$(SELINUX_LIBS)
# ------------------------------------------------------------------------------
@@ -1505,7 +1519,7 @@ libudev_core_la_CFLAGS = \
libudev_core_la_LIBADD = \
libudev-private.la \
- libsystemd-label.la \
+ libsystemd-label-no-dbus.la \
libsystemd-shared.la \
$(BLKID_LIBS) \
$(KMOD_LIBS)
next reply other threads:[~2012-05-31 5:32 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-05-31 5:32 Bryan Kadzban [this message]
2012-05-31 20:22 ` [PATCH] Don't require dbus for libudev-core.la Kay Sievers
2012-06-01 3:43 ` Bryan Kadzban
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=4FC70280.1090200@kadzban.is-a-geek.net \
--to=bryan@kadzban.is-a-geek.net \
--cc=linux-hotplug@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;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).