From 0a34e712da9c781391d73dc674602c7e5258e66b Mon Sep 17 00:00:00 2001
From: Lokesh Mandvekar <lsm5@fedoraproject.org>
Date: Nov 20 2015 21:21:59 +0000
Subject: patch to pass linker flags during rpmbuild


From: Nalin Dahyabhai <nalin@redhat.com>
Signed-off-by: Lokesh Mandvekar <lsm5@fedoraproject.org>

---

diff --git a/docker.spec b/docker.spec
index 7724adb..f74d4c7 100644
--- a/docker.spec
+++ b/docker.spec
@@ -72,6 +72,7 @@ Source3: %{repo}-storage.sysconfig
 Source4: %{repo}-logrotate.sh
 Source5: README.%{repo}-logrotate
 Source6: %{repo}-network.sysconfig
+Patch0: muldefs.patch
 
 %if 0%{?with_selinux}
 Source7: https://github.com/fedora-cloud/%{repo}-selinux/archive/%{ds_commit}/%{repo}-selinux-%{ds_shortcommit}.tar.gz
@@ -347,10 +348,10 @@ ln -s $(dirs +1 -l)/%{repo}-utils-%{utils_commit} src/%{provider}.%{provider_tld
 popd
 
 export DOCKER_GITCOMMIT="%{d_shortcommit}/%{version}"
-export DOCKER_BUILDTAGS="selinux"
+export DOCKER_BUILDTAGS="selinux journald"
 export GOPATH=$(pwd)/_build:$(pwd)/vendor:%{gopath}
 
-DEBUG=1 hack/make.sh dynbinary
+DEBUG=1 bash -x hack/make.sh dynbinary
 man/md2man-all.sh
 cp contrib/syntax/vim/LICENSE LICENSE-vim-syntax
 cp contrib/syntax/vim/README.md README-vim-syntax.md
diff --git a/muldefs.patch b/muldefs.patch
new file mode 100644
index 0000000..5790a41
--- /dev/null
+++ b/muldefs.patch
@@ -0,0 +1,13 @@
+diff --git a/hack/make/dynbinary b/hack/make/dynbinary
+index e5fc0be..a8ec909 100644
+--- a/hack/make/dynbinary
++++ b/hack/make/dynbinary
+@@ -13,7 +13,7 @@ fi
+ 
+ (
+ 	export IAMSTATIC="false"
+-	export LDFLAGS_STATIC_DOCKER=''
++	export LDFLAGS_STATIC_DOCKER='-linkmode external -extldflags -zmuldefs'
+ 	export BUILDFLAGS=( "${BUILDFLAGS[@]/netgo /}" ) # disable netgo, since we don't need it for a dynamic binary
+ 	export BUILDFLAGS=( "${BUILDFLAGS[@]/static_build /}" ) # we're not building a "static" binary here
+ 	source "${MAKEDIR}/binary"