Browse code

add buildtag pkcs11 to experimental

Signed-off-by: Jessica Frazelle <acidburn@docker.com>

Jessica Frazelle authored on 2015/10/31 10:14:10
Showing 3 changed files
... ...
@@ -45,6 +45,7 @@ RUN apt-get update && apt-get install -y \
45 45
 	iptables \
46 46
 	libapparmor-dev \
47 47
 	libcap-dev \
48
+	libltdl-dev \
48 49
 	libsqlite3-dev \
49 50
 	libsystemd-journal-dev \
50 51
 	mercurial \
... ...
@@ -98,7 +98,7 @@ fi
98 98
 if [ "$DOCKER_EXPERIMENTAL" ] || [ "$DOCKER_REMAP_ROOT" ]; then
99 99
 	echo >&2 '# WARNING! DOCKER_EXPERIMENTAL is set: building experimental features'
100 100
 	echo >&2
101
-	DOCKER_BUILDTAGS+=" experimental"
101
+	DOCKER_BUILDTAGS+=" experimental pkcs11"
102 102
 fi
103 103
 
104 104
 if [ -z "$DOCKER_CLIENTONLY" ]; then
... ...
@@ -25,6 +25,10 @@ if [ "$(go env GOHOSTOS)/$(go env GOHOSTARCH)" == "windows/amd64" ] && [ "$(go e
25 25
 	export LDFLAGS_STATIC_DOCKER="$LDFLAGS_STATIC_DOCKER -linkmode=internal"
26 26
 fi
27 27
 
28
+if [ "$IAMSTATIC" == "true" ]; then
29
+	export BUILDFLAGS=( "${BUILDFLAGS[@]/pkcs11 /}" ) # we cannot dlopen in pkcs11 in a static binary
30
+fi
31
+
28 32
 echo "Building: $DEST/$BINARY_FULLNAME"
29 33
 go build \
30 34
 	-o "$DEST/$BINARY_FULLNAME" \