diff options
| author | Julian Andres Klode <julian.klode@canonical.com> | 2019-04-15 11:32:50 +0200 |
|---|---|---|
| committer | Julian Andres Klode <julian.klode@canonical.com> | 2019-05-07 12:55:38 +0200 |
| commit | 0de84364e374591b71826e56302e5228bc0d2dab (patch) | |
| tree | dc3ae051d9fdd11896c6829b985f086dfd77de3c /apt-pkg/makefile | |
| parent | ab67c39b9cdd28d11dd43fe48bd1fdeab60d4c2f (diff) | |
Prevent shutdown while running dpkg
As long as we are running dpkg, keep an inhibitor that
blocks us from shutting down.
LP: #1820886
(cherry picked from commit 96aef11a5cf400377a52f7e93e70944b17e249d1)
(cherry picked from commit 8ea79afcadead5a5b7d94bf8623cb833859f6d80)
(cherry picked from commit c5b8a857f2535fe284426cefda2fbd1bbb3d5808)
Also fixup prepare-release for CI to handle [linux-any] build-dep,
and do the whole autoconf / makefile stuff.
Diffstat (limited to 'apt-pkg/makefile')
| -rw-r--r-- | apt-pkg/makefile | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/apt-pkg/makefile b/apt-pkg/makefile index 789d3f2fd..b66e9b272 100644 --- a/apt-pkg/makefile +++ b/apt-pkg/makefile @@ -12,7 +12,7 @@ include ../buildlib/defaults.mak # The library name and version (indirectly used from init.h) include ../buildlib/libversion.mak -CPPFLAGS+=-DAPT_PKG_EXPOSE_STRING_VIEW +CPPFLAGS+=-DAPT_PKG_EXPOSE_STRING_VIEW $(SYSTEMD_CFLAGS) LIBRARY=apt-pkg MAJOR=$(LIBAPTPKG_MAJOR) MINOR=$(LIBAPTPKG_RELEASE) @@ -29,6 +29,9 @@ endif ifeq ($(HAVE_LZ4),yes) SLIBS+= -llz4 endif +ifeq ($(HAVE_SYSTEMD),yes) +SLIBS+= $(SYSTEMD_LIBS) +endif APT_DOMAIN:=libapt-pkg$(LIBAPTPKG_MAJOR) SOURCE = $(sort $(wildcard *.cc */*.cc)) |