From 6bec75545f3020b7f0771cd6b7814443eee9a810 Mon Sep 17 00:00:00 2001 From: Sinny Kumari Date: Jun 09 2016 14:22:11 +0000 Subject: BZ#1326896 - Fix build issue on s390x architecture Signed-off-by: Sinny Kumari Signed-off-by: Antonio Murdaca --- diff --git a/docker.spec b/docker.spec index 9236ddc..f8edab9 100644 --- a/docker.spec +++ b/docker.spec @@ -85,7 +85,7 @@ Name: %{repo} %endif Epoch: 2 Version: 1.10.3 -Release: 16.git%{shortcommit0}%{?dist} +Release: 18.git%{shortcommit0}%{?dist} Summary: Automates deployment of containerized applications License: ASL 2.0 URL: https://%{provider}.%{provider_tld}/projectatomic/%{repo} @@ -111,6 +111,8 @@ Source12: v1.10-migrator-helper #Patch0: build-with-debug-info.patch %endif +Patch0: s390x-pthread.patch + BuildRequires: git BuildRequires: glibc-static BuildRequires: go-md2man @@ -483,6 +485,10 @@ tar zxf %{SOURCE4} # untar v1.10-migrator tar zxf %{SOURCE11} +%ifarch s390x +%patch0 -p1 -b .ln +%endif + %build # set up temporary build gopath, and put our directory there mkdir _build @@ -803,6 +809,12 @@ exit 0 %{_datadir}/rhel/secrets/rhsm %changelog +* Thu Jun 09 2016 Antonio Murdaca - 2:1.10.3-18.gitf476348 +- rebuilt + +* Thu Jun 09 2016 Sinny Kumari - 2:1.10.3-17.gitf476348 +- BZ#1326896 - Fix build issue on s390x architecture + * Mon Jun 06 2016 Antonio Murdaca - 2:1.10.3-16.gitf476348 - Resolves: #1327809 - Resolves: #1330442 diff --git a/s390x-pthread.patch b/s390x-pthread.patch new file mode 100644 index 0000000..3c55981 --- /dev/null +++ b/s390x-pthread.patch @@ -0,0 +1,11 @@ +diff -upr docker-f47634855e8b366fcb1739588ac24ffd8488582f/hack/make/binary docker-f47634855e8b366fcb1739588ac24ffd8488582f.p/hack/make/binary +--- docker-f47634855e8b366fcb1739588ac24ffd8488582f/hack/make/binary 2016-05-31 15:00:46.000000000 -0400 ++++ docker-f47634855e8b366fcb1739588ac24ffd8488582f.p/hack/make/binary 2016-06-09 05:33:50.974067838 -0400 +@@ -56,6 +56,7 @@ echo "Building: $DEST/$BINARY_FULLNAME" + go build \ + -o "$DEST/$BINARY_FULLNAME" \ + "${BUILDFLAGS[@]}" \ ++ -gccgoflags="-lpthread"\ + -ldflags " + $LDFLAGS + $LDFLAGS_STATIC_DOCKER