opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-06-29 15:08:09 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4710 from raukadah/systemdfix

Browse Source 
Use systemd/sd-daemon.h headers for systemd presence
This commit is contained in:
OpenShift Merge Robot
2019-12-16 17:55:58 +01:00
committed by GitHub
parent 19064e5117 b54c350a07
commit b2f05e0e84
3 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -45,7 +45,7 @@ endif
ifeq (,$(findstring systemd,$(BUILDTAGS))) ifeq (,$(findstring systemd,$(BUILDTAGS)))
$(warning \ $(warning \
Podman is being compiled without the systemd build tag.\ 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 endif
BUILDTAGS_CROSS ?= containers_image_openpgp exclude_graphdriver_btrfs exclude_graphdriver_devicemapper exclude_graphdriver_overlay BUILDTAGS_CROSS ?= containers_image_openpgp exclude_graphdriver_btrfs exclude_graphdriver_devicemapper exclude_graphdriver_overlay

1
contrib/build_rpm.sh
View File

@ -26,6 +26,7 @@ declare -a PKGS=(device-mapper-devel \
make \ make \
rpm-build \ rpm-build \
go-compilers-golang-compiler \ go-compilers-golang-compiler \
systemd-devel \
) )
if [[ $pkg_manager == *dnf ]]; then if [[ $pkg_manager == *dnf ]]; then

7
hack/systemd_tag.sh
View File

@ -1,4 +1,7 @@
#!/usr/bin/env bash #!/usr/bin/env bash
if pkg-config --exists libsystemd; then cc -E - > /dev/null 2> /dev/null << EOF
echo systemd #include <systemd/sd-daemon.h>
EOF
if test $? -eq 0 ; then
echo systemd
fi fi