rpm/docker
SHA256
1
0
Fork 0
forked from pool/docker
Code Pull Requests Activity

Accepting request 423771 from home:jordimassaguerpla:branch:fix_static_build_ppc64le:docker

Browse Source 
- 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
This commit is contained in:
Christian Brauner 2016-08-30 13:36:05 +00:00 committed by Git OBS Bridge
parent 3f61d42910
commit aeedf36a58
2 changed files with 24 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
docker.changes
View File

@ -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 Mon Aug 29 12:11:21 UTC 2016 - jmassaguerpla@suse.com

22
gcc-go-patches.patch
View File

@ -1,5 +1,5 @@
diff --git a/hack/make/gccgo b/hack/make/gccgo diff --git a/hack/make/gccgo b/hack/make/gccgo
index 93e064a..20eb8dc 100644 index 54c983e..1c11bbf 100644
--- a/hack/make/gccgo --- a/hack/make/gccgo
+++ b/hack/make/gccgo +++ b/hack/make/gccgo
@@ -1,5 +1,5 @@ @@ -1,5 +1,5 @@
@ -9,16 +9,30 @@ index 93e064a..20eb8dc 100644
BINARY_NAME="dockerd-$VERSION" BINARY_NAME="dockerd-$VERSION"
BINARY_EXTENSION="$(binary_extension)" BINARY_EXTENSION="$(binary_extension)"
@@ -21,7 +21,7 @@ go build -compiler=gccgo \ @@ -22,9 +22,11 @@ go build -compiler=gccgo \
"${BUILDFLAGS[@]}" \
-gccgoflags "
-g -g
+ -Wl,--add-needed -Wl,--no-as-needed
$EXTLDFLAGS_STATIC $EXTLDFLAGS_STATIC
+ -static-libgo
-Wl,--no-export-dynamic -Wl,--no-export-dynamic
- -ldl - -ldl
+ -ldl -lsystemd + -ldl -lselinux -lsystemd
-pthread -pthread
" \ " \
./cmd/dockerd ./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[@]}" \ "${BUILDFLAGS[@]}" \
-gccgoflags " -gccgoflags "
-g -g