From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 59FB31382C5 for ; Thu, 10 Jun 2021 23:27:16 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A89CAE0809; Thu, 10 Jun 2021 23:27:15 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 8B004E0809 for ; Thu, 10 Jun 2021 23:27:15 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 75240335D2F for ; Thu, 10 Jun 2021 23:27:14 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 26D8C78E for ; Thu, 10 Jun 2021 23:27:13 +0000 (UTC) From: "Georgy Yakovlev" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Georgy Yakovlev" Message-ID: <1623367615.cec1c0dc8c45379e67a50019333fe65743f60c7b.gyakovlev@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-emulation/docker/, app-emulation/docker/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-emulation/docker/docker-20.10.7.ebuild app-emulation/docker/files/ppc64-buildmode.patch X-VCS-Directories: app-emulation/docker/ app-emulation/docker/files/ X-VCS-Committer: gyakovlev X-VCS-Committer-Name: Georgy Yakovlev X-VCS-Revision: cec1c0dc8c45379e67a50019333fe65743f60c7b X-VCS-Branch: master Date: Thu, 10 Jun 2021 23:27:13 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 2cb5ad26-73d3-4285-bfa6-c1407b7d26c8 X-Archives-Hash: 2afa09b5098a35e89eb60f0619b637a0 commit: cec1c0dc8c45379e67a50019333fe65743f60c7b Author: Georgy Yakovlev gentoo org> AuthorDate: Thu Jun 10 23:26:17 2021 +0000 Commit: Georgy Yakovlev gentoo org> CommitDate: Thu Jun 10 23:26:55 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cec1c0dc app-emulation/docker: add ppc64 buildmode patch Signed-off-by: Georgy Yakovlev gentoo.org> app-emulation/docker/docker-20.10.7.ebuild | 5 +++- app-emulation/docker/files/ppc64-buildmode.patch | 30 ++++++++++++++++++++++++ 2 files changed, 34 insertions(+), 1 deletion(-) diff --git a/app-emulation/docker/docker-20.10.7.ebuild b/app-emulation/docker/docker-20.10.7.ebuild index 6636481017d..611164ae3ab 100644 --- a/app-emulation/docker/docker-20.10.7.ebuild +++ b/app-emulation/docker/docker-20.10.7.ebuild @@ -55,7 +55,10 @@ RESTRICT="installsources strip test" S="${WORKDIR}/${P}/src/${EGO_PN}" # https://bugs.gentoo.org/748984 https://github.com/etcd-io/etcd/pull/12552 -PATCHES=( "${FILESDIR}/etcd-F_OFD_GETLK-fix.patch" ) +PATCHES=( + "${FILESDIR}/etcd-F_OFD_GETLK-fix.patch" + "${FILESDIR}/ppc64-buildmode.patch" +) # see "contrib/check-config.sh" from upstream's sources CONFIG_CHECK=" diff --git a/app-emulation/docker/files/ppc64-buildmode.patch b/app-emulation/docker/files/ppc64-buildmode.patch new file mode 100644 index 00000000000..f16756e8504 --- /dev/null +++ b/app-emulation/docker/files/ppc64-buildmode.patch @@ -0,0 +1,30 @@ +From c4135e37e54a6480abfe18746f227f05cb9269ab Mon Sep 17 00:00:00 2001 +From: Georgy Yakovlev +Date: Thu, 10 Jun 2021 16:19:22 -0700 +Subject: [PATCH] don't use buildmode=pie on ppc64 + +It's already omitted for ppc64 in +hack/dockerfile/install/install.sh +not using wildcard, because GOARCH=ppc64le supports pie + +Signed-off-by: Georgy Yakovlev +--- + hack/make/.binary | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/hack/make/.binary b/hack/make/.binary +index 5ea3e373f2..7a911de15a 100644 +--- a/hack/make/.binary ++++ b/hack/make/.binary +@@ -70,7 +70,7 @@ hash_files() { + + # -buildmode=pie is not supported on Windows and Linux on mips and riscv64. + case "$(go env GOOS)/$(go env GOARCH)" in +- windows/* | linux/mips* | linux/riscv*) ;; ++ windows/* | linux/mips* | linux/riscv* | linux/ppc64) ;; + + *) + BUILDFLAGS+=("-buildmode=pie") +-- +2.32.0 +