diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-12-16 17:55:58 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-12-16 17:55:58 +0100 |
| commit | b2f05e0e84411f985fea66e9edff1fec8f26d28d (patch) | |
| tree | 1cf4b9efbb72b8ecc5a02a77fc3060634f896868 | |
| parent | 19064e51175e7832ba6180173be1a3841ab3f23d (diff) | |
| parent | b54c350a0771579444bccbc0dc7795d0bd176413 (diff) | |
| download | podman-b2f05e0e84411f985fea66e9edff1fec8f26d28d.tar.gz podman-b2f05e0e84411f985fea66e9edff1fec8f26d28d.tar.bz2 podman-b2f05e0e84411f985fea66e9edff1fec8f26d28d.zip | |
Merge pull request #4710 from raukadah/systemdfix
Use systemd/sd-daemon.h headers for systemd presence
| -rw-r--r-- | Makefile | 2 | ||||
| -rwxr-xr-x | contrib/build_rpm.sh | 1 | ||||
| -rwxr-xr-x | hack/systemd_tag.sh | 7 |
3 files changed, 7 insertions, 3 deletions
@@ -45,7 +45,7 @@ endif ifeq (,$(findstring systemd,$(BUILDTAGS))) $(warning \ Podman is being compiled without the systemd build tag.\ - Install libsystemd for journald support) + Install libsystemd on Ubuntu or systemd-devel on rpm based distro for journald support) endif BUILDTAGS_CROSS ?= containers_image_openpgp exclude_graphdriver_btrfs exclude_graphdriver_devicemapper exclude_graphdriver_overlay diff --git a/contrib/build_rpm.sh b/contrib/build_rpm.sh index e41763fa7..088d8b7a5 100755 --- a/contrib/build_rpm.sh +++ b/contrib/build_rpm.sh @@ -26,6 +26,7 @@ declare -a PKGS=(device-mapper-devel \ make \ rpm-build \ go-compilers-golang-compiler \ + systemd-devel \ ) if [[ $pkg_manager == *dnf ]]; then diff --git a/hack/systemd_tag.sh b/hack/systemd_tag.sh index c59cad559..19a7bf6a6 100755 --- a/hack/systemd_tag.sh +++ b/hack/systemd_tag.sh @@ -1,4 +1,7 @@ #!/usr/bin/env bash -if pkg-config --exists libsystemd; then - echo systemd +cc -E - > /dev/null 2> /dev/null << EOF +#include <systemd/sd-daemon.h> +EOF +if test $? -eq 0 ; then + echo systemd fi |