diff --git a/daemon/logger/journald/read.go b/daemon/logger/journald/read.go index 80c1fbda7a..8d94c302fb 100644 --- a/daemon/logger/journald/read.go +++ b/daemon/logger/journald/read.go @@ -2,7 +2,6 @@ package journald -// #cgo pkg-config: libsystemd-journal // #include // #include // #include diff --git a/daemon/logger/journald/read_native.go b/daemon/logger/journald/read_native.go new file mode 100644 index 0000000000..bba6de55be --- /dev/null +++ b/daemon/logger/journald/read_native.go @@ -0,0 +1,6 @@ +// +build linux,cgo,!static_build,journald,!journald_compat + +package journald + +// #cgo pkg-config: libsystemd +import "C" diff --git a/daemon/logger/journald/read_native_compat.go b/daemon/logger/journald/read_native_compat.go new file mode 100644 index 0000000000..3f7a43c59e --- /dev/null +++ b/daemon/logger/journald/read_native_compat.go @@ -0,0 +1,6 @@ +// +build linux,cgo,!static_build,journald,journald_compat + +package journald + +// #cgo pkg-config: libsystemd-journal +import "C" diff --git a/hack/make.sh b/hack/make.sh index 7d7cb0d7a7..acee4a9744 100755 --- a/hack/make.sh +++ b/hack/make.sh @@ -118,8 +118,10 @@ fi if [ -z "$DOCKER_CLIENTONLY" ]; then DOCKER_BUILDTAGS+=" daemon" - if pkg-config libsystemd-journal 2> /dev/null ; then + if pkg-config 'libsystemd >= 209' 2> /dev/null ; then DOCKER_BUILDTAGS+=" journald" + elif pkg-config 'libsystemd-journal' 2> /dev/null ; then + DOCKER_BUILDTAGS+=" journald journald_compat" fi fi