Commit 37e36c58 authored by gregor herrmann's avatar gregor herrmann

Preliminary systemd support:

- build-depend on libsystemd-dev package on linux-any
- add patch 0001-osflags-use-pkg-config-for-systemd-support.patch from
  upstream git to use pkg-config for finding the systemd libs; change
  libsystemd-daemon to libsystemd
parent 8573fc48
......@@ -7,6 +7,7 @@ Build-Depends: check (>= 0.9.10-3),
debhelper (>= 9),
dpkg-dev (>= 1.16.1),
help2man,
libsystemd-dev [linux-any],
pkg-config,
po-debconf,
zlib1g-dev
......
From cc4bc22447d15deacf44bc1d369621a63c934427 Mon Sep 17 00:00:00 2001
From: "Jason A. Donenfeld" <Jason@zx2c4.com>
Date: Fri, 25 Jul 2014 02:02:48 +0200
Subject: [PATCH] osflags: use pkg-config for systemd support
Recent versions of systemd don't ship with libsystemd-daemon.so anymore,
but instead use libsystemd.so for everything. This is obviously
problematic for using the same LDFLAGS on old systemd and new systemd.
So, they also ship compatability pkgconfig files, which use the old
names but return the new library. So, the most portable way to support
both old and new systemd is to use pkgconfig. It's not a problem either,
since systems that use systemd are bound to also have pkgconfig
installed.
---
Change libsystemd-daemon to libsystemd.
diff --git a/src/osflags b/src/osflags
index 9eda8f0..0f8a26c 100755
--- a/src/osflags
+++ b/src/osflags
@@ -19,7 +19,7 @@ link)
Linux)
FLAGS="";
[ -e /usr/include/selinux/selinux.h ] && FLAGS="$FLAGS -lselinux";
- [ -e /usr/include/systemd/sd-daemon.h ] && FLAGS="$FLAGS -lsystemd-daemon";
+ [ -e /usr/include/systemd/sd-daemon.h ] && FLAGS="$FLAGS $(pkg-config --libs libsystemd)";
echo $FLAGS;
;;
esac
--
2.1.1
cflags.patch
verbose-build.patch
0001-osflags-use-pkg-config-for-systemd-support.patch
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment