From aeedf36a587f6109c0a78f0f81e133bd22d5d0f6bc4bb06ab3283c6fb1ad0b3e Mon Sep 17 00:00:00 2001 From: Christian Brauner Date: Tue, 30 Aug 2016 13:36:05 +0000 Subject: [PATCH] Accepting request 423771 from home:jordimassaguerpla:branch:fix_static_build_ppc64le:docker - Fix build for ppc64le: use static libgo for dockerd and docker-proxy as in docker build. OBS-URL: https://build.opensuse.org/request/show/423771 OBS-URL: https://build.opensuse.org/package/show/Virtualization:containers/docker?expand=0&rev=137 --- docker.changes | 6 ++++++ gcc-go-patches.patch | 22 ++++++++++++++++++---- 2 files changed, 24 insertions(+), 4 deletions(-) diff --git a/docker.changes b/docker.changes index f422bef..88ab58b 100644 --- a/docker.changes +++ b/docker.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Aug 30 09:07:19 UTC 2016 - jmassaguerpla@suse.com + +- Fix build for ppc64le: use static libgo for dockerd and docker-proxy + as in docker build. + ------------------------------------------------------------------- Mon Aug 29 12:11:21 UTC 2016 - jmassaguerpla@suse.com diff --git a/gcc-go-patches.patch b/gcc-go-patches.patch index 94f8069..b911aaf 100644 --- a/gcc-go-patches.patch +++ b/gcc-go-patches.patch @@ -1,5 +1,5 @@ diff --git a/hack/make/gccgo b/hack/make/gccgo -index 93e064a..20eb8dc 100644 +index 54c983e..1c11bbf 100644 --- a/hack/make/gccgo +++ b/hack/make/gccgo @@ -1,5 +1,5 @@ @@ -9,16 +9,30 @@ index 93e064a..20eb8dc 100644 BINARY_NAME="dockerd-$VERSION" BINARY_EXTENSION="$(binary_extension)" -@@ -21,7 +21,7 @@ go build -compiler=gccgo \ +@@ -22,9 +22,11 @@ go build -compiler=gccgo \ + "${BUILDFLAGS[@]}" \ + -gccgoflags " -g ++ -Wl,--add-needed -Wl,--no-as-needed $EXTLDFLAGS_STATIC ++ -static-libgo -Wl,--no-export-dynamic - -ldl -+ -ldl -lsystemd ++ -ldl -lselinux -lsystemd -pthread " \ ./cmd/dockerd -@@ -37,9 +37,11 @@ go build -compiler=gccgo \ +@@ -37,7 +39,9 @@ go build -compiler=gccgo \ + "${BUILDFLAGS[@]}" \ + -gccgoflags " + -g ++ -Wl,--add-needed -Wl,--no-as-needed + $EXTLDFLAGS_STATIC ++ -static-libgo + -Wl,--no-export-dynamic + -ldl + -pthread +@@ -55,9 +59,11 @@ go build -compiler=gccgo \ "${BUILDFLAGS[@]}" \ -gccgoflags " -g