From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Thu, 27 Apr 2017 17:39:54 +0000 (-0400)
Subject: Merge branch 'master' into meson-no-libudev
X-Git-Tag: v234~275^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=0bc9115251f1bf12a9b15cc7f0bf59cf450ab9c0;p=thirdparty%2Fsystemd.git

Merge branch 'master' into meson-no-libudev
---

0bc9115251f1bf12a9b15cc7f0bf59cf450ab9c0
diff --cc meson.build
index a7a316a74f6,0d61ce19ab5..5a77785b8cf
--- a/meson.build
+++ b/meson.build
@@@ -2134,8 -2146,8 +2134,7 @@@ exe = executable('systemd-nspawn'
                   'src/core/loopback-setup.c',
                   'src/core/loopback-setup.h',
                   include_directories : [includes, include_directories('src/nspawn')],
-                  link_with : [libfirewall,
-                               libshared],
 -                 link_with : [libshared,
 -                              libudev],
++                 link_with : [libshared],
                   dependencies : [libacl,
                                   libblkid,
                                   libseccomp,