docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #20617 from nalind/journald-pkgconfig 

Try to handle changing names for journal packages
This commit is contained in:
Tibor Vass 2016-03-01 15:38:03 -05:00
parent 1b6956cbc3 6cdc4ba6cd
commit 36401f20ce
4 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
daemon/logger/journald/read.go
View File

@ -2,7 +2,6 @@
package journald package journald
// #cgo pkg-config: libsystemd-journal
// #include <sys/types.h> // #include <sys/types.h>
// #include <sys/poll.h> // #include <sys/poll.h>
// #include <systemd/sd-journal.h> // #include <systemd/sd-journal.h>

6
daemon/logger/journald/read_native.go Normal file
View File

@ -0,0 +1,6 @@
// +build linux,cgo,!static_build,journald,!journald_compat
package journald
// #cgo pkg-config: libsystemd
import "C"

6
daemon/logger/journald/read_native_compat.go Normal file
View File

@ -0,0 +1,6 @@
// +build linux,cgo,!static_build,journald,journald_compat
package journald
// #cgo pkg-config: libsystemd-journal
import "C"

4
hack/make.sh
View File

@ -118,8 +118,10 @@ fi
if [ -z "$DOCKER_CLIENTONLY" ]; then if [ -z "$DOCKER_CLIENTONLY" ]; then
DOCKER_BUILDTAGS+=" daemon" DOCKER_BUILDTAGS+=" daemon"
if pkg-config libsystemd-journal 2> /dev/null ; then if pkg-config 'libsystemd >= 209' 2> /dev/null ; then
DOCKER_BUILDTAGS+=" journald" DOCKER_BUILDTAGS+=" journald"
elif pkg-config 'libsystemd-journal' 2> /dev/null ; then
DOCKER_BUILDTAGS+=" journald journald_compat"
fi fi
fi fi