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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 24198158041 for ; Tue, 20 Feb 2024 01:57:10 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 39C72E2A7B; Tue, 20 Feb 2024 01:57:09 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 1D35EE2A7B for ; Tue, 20 Feb 2024 01:57:09 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 3C71C3430AB for ; Tue, 20 Feb 2024 01:57:08 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 6E926118C for ; Tue, 20 Feb 2024 01:57:06 +0000 (UTC) From: "Zac Medico" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Zac Medico" Message-ID: <1708394135.022f1f9c9a89df4d3d3f8cd895c07cdc8fdb59c6.zmedico@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-admin/consul/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-admin/consul/consul-1.15.3.ebuild app-admin/consul/consul-1.15.7.ebuild X-VCS-Directories: app-admin/consul/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: 022f1f9c9a89df4d3d3f8cd895c07cdc8fdb59c6 X-VCS-Branch: master Date: Tue, 20 Feb 2024 01:57:06 +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: be6d43f8-5eae-46b5-a52f-1fa48ae1d8b0 X-Archives-Hash: d93702d9697e938ec43e8021fd23d06e commit: 022f1f9c9a89df4d3d3f8cd895c07cdc8fdb59c6 Author: Zac Medico gentoo org> AuthorDate: Tue Feb 20 01:54:57 2024 +0000 Commit: Zac Medico gentoo org> CommitDate: Tue Feb 20 01:55:35 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=022f1f9c app-admin/consul: Disable pie for x86 Bug: https://bugs.gentoo.org/924629 Signed-off-by: Zac Medico gentoo.org> app-admin/consul/consul-1.15.3.ebuild | 6 +++++- app-admin/consul/consul-1.15.7.ebuild | 6 +++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/app-admin/consul/consul-1.15.3.ebuild b/app-admin/consul/consul-1.15.3.ebuild index 0e9d8834d60a..b3e17cbf517a 100644 --- a/app-admin/consul/consul-1.15.3.ebuild +++ b/app-admin/consul/consul-1.15.3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -30,6 +30,10 @@ src_prepare() { } src_compile() { + if use x86; then + #924629 pie breaks build on x86 + GOFLAGS=${GOFLAGS//-buildmode=pie} + fi # The dev target sets causes build.sh to set appropriate XC_OS # and XC_ARCH, and skips generation of an unused zip file, # avoiding a dependency on app-arch/zip. diff --git a/app-admin/consul/consul-1.15.7.ebuild b/app-admin/consul/consul-1.15.7.ebuild index 61b9d17d1af3..2b693c361655 100644 --- a/app-admin/consul/consul-1.15.7.ebuild +++ b/app-admin/consul/consul-1.15.7.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -30,6 +30,10 @@ src_prepare() { } src_compile() { + if use x86; then + #924629 pie breaks build on x86 + GOFLAGS=${GOFLAGS//-buildmode=pie} + fi # The dev target sets causes build.sh to set appropriate XC_OS # and XC_ARCH, and skips generation of an unused zip file, # avoiding a dependency on app-arch/zip.