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 7666F158086 for ; Fri, 31 Dec 2021 22:49:34 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 29BE62BC05A; Fri, 31 Dec 2021 22:49:30 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (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 C4EF22BC05A for ; Fri, 31 Dec 2021 22:49:27 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 3EDEB342DC9 for ; Fri, 31 Dec 2021 22:49:25 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 983A11C6 for ; Fri, 31 Dec 2021 22:49:23 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1640990896.eea3dcd064899b8250f90972208a5a7b623829e9.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-arch/zstd/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-arch/zstd/zstd-1.5.1-r1.ebuild app-arch/zstd/zstd-1.5.1.ebuild X-VCS-Directories: app-arch/zstd/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: eea3dcd064899b8250f90972208a5a7b623829e9 X-VCS-Branch: master Date: Fri, 31 Dec 2021 22:49:23 +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: bebf04d5-66a5-426f-85e5-6f1415bffe05 X-Archives-Hash: b0d3e0fa3f0f9baafaca013f490c456d commit: eea3dcd064899b8250f90972208a5a7b623829e9 Author: Sam James gentoo org> AuthorDate: Fri Dec 31 22:37:23 2021 +0000 Commit: Sam James gentoo org> CommitDate: Fri Dec 31 22:48:16 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eea3dcd0 app-arch/zstd: disable asm (exec'able stack) on !amd64 See upstream bug / RH bug for details but the property is silently lost and it's an error in the annotation upstream. Bug: https://bugs.gentoo.org/829849 Signed-off-by: Sam James gentoo.org> app-arch/zstd/{zstd-1.5.1.ebuild => zstd-1.5.1-r1.ebuild} | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/app-arch/zstd/zstd-1.5.1.ebuild b/app-arch/zstd/zstd-1.5.1-r1.ebuild similarity index 85% rename from app-arch/zstd/zstd-1.5.1.ebuild rename to app-arch/zstd/zstd-1.5.1-r1.ebuild index ee5d6e6b7871..4e3f4fdad650 100644 --- a/app-arch/zstd/zstd-1.5.1.ebuild +++ b/app-arch/zstd/zstd-1.5.1-r1.ebuild @@ -28,6 +28,16 @@ src_prepare() { } mymake() { + # We need to turn off asm for certain arches (!amd64) for now. + # - bug #829849 + # - https://bugzilla.redhat.com/show_bug.cgi?id=2035802 + # - https://github.com/facebook/zstd/issues/2963 + local asm="ZSTD_NO_ASM=1" + + if use amd64 ; then + asm= + fi + emake \ CC="$(tc-getCC)" \ CXX="$(tc-getCXX)" \ @@ -35,6 +45,7 @@ mymake() { PREFIX="${EPREFIX}/usr" \ LIBDIR="${EPREFIX}/usr/$(get_libdir)" \ V=1 \ + ${asm} \ "${@}" }