kotovalexarian-likes-github/moby--moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Code Releases Activity

Merge pull request #23215 from BlackYoup/pkg-config

Browse source 
make.sh: use PKG_CONFIG environment variable if it exists
This commit is contained in:
Sebastiaan van Stijn 2016-06-03 15:04:37 +02:00
commit 726ef47d5c
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
hack/make.sh
View file

@ -26,6 +26,7 @@ set -o pipefail
export DOCKER_PKG='github.com/docker/docker' export DOCKER_PKG='github.com/docker/docker'
export SCRIPTDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" export SCRIPTDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
export MAKEDIR="$SCRIPTDIR/make" export MAKEDIR="$SCRIPTDIR/make"
export PKG_CONFIG=${PKG_CONFIG:-pkg-config}
: ${TEST_REPEAT:=0} : ${TEST_REPEAT:=0}
@ -134,9 +135,9 @@ if [ "$DOCKER_EXPERIMENTAL" ]; then
fi fi
DOCKER_BUILDTAGS+=" daemon" DOCKER_BUILDTAGS+=" daemon"
if pkg-config 'libsystemd >= 209' 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 elif ${PKG_CONFIG} 'libsystemd-journal' 2> /dev/null ; then
DOCKER_BUILDTAGS+=" journald journald_compat" DOCKER_BUILDTAGS+=" journald journald_compat"
fi fi