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 83699158091 for ; Sat, 18 Jun 2022 13:05:06 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 84DA8E08BD; Sat, 18 Jun 2022 13:05:05 +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)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 62F46E08BD for ; Sat, 18 Jun 2022 13:05:05 +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)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 6113D335D7F for ; Sat, 18 Jun 2022 13:05:04 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id E325F475 for ; Sat, 18 Jun 2022 13:05:02 +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: <1655557492.d3d6f195b3c875ddef2d642bd2d9c0ff27ffbf83.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-r3.ebuild app-arch/zstd/zstd-1.5.2-r1.ebuild X-VCS-Directories: app-arch/zstd/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: d3d6f195b3c875ddef2d642bd2d9c0ff27ffbf83 X-VCS-Branch: master Date: Sat, 18 Jun 2022 13:05:02 +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: a5f7b0d1-a741-4b36-966f-3b50bec9fad3 X-Archives-Hash: 1bb273f3d4f7210ec471e865a96043ee commit: d3d6f195b3c875ddef2d642bd2d9c0ff27ffbf83 Author: Sam James gentoo org> AuthorDate: Sat Jun 18 13:03:47 2022 +0000 Commit: Sam James gentoo org> CommitDate: Sat Jun 18 13:04:52 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d3d6f195 app-arch/zstd: add 1.5.2-r1 for split-usr too Apparently I only did 1.5.1? Bug: https://bugs.gentoo.org/852860 Signed-off-by: Sam James gentoo.org> app-arch/zstd/zstd-1.5.1-r3.ebuild | 2 +- .../{zstd-1.5.1-r3.ebuild => zstd-1.5.2-r1.ebuild} | 19 ++----------------- 2 files changed, 3 insertions(+), 18 deletions(-) diff --git a/app-arch/zstd/zstd-1.5.1-r3.ebuild b/app-arch/zstd/zstd-1.5.1-r3.ebuild index 83b2103a30b0..99a923c9e721 100644 --- a/app-arch/zstd/zstd-1.5.1-r3.ebuild +++ b/app-arch/zstd/zstd-1.5.1-r3.ebuild @@ -12,7 +12,7 @@ SRC_URI="https://github.com/facebook/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" LICENSE="|| ( BSD GPL-2 )" SLOT="0/1" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="lz4 static-libs split-usr +threads" +IUSE="lz4 static-libs +threads" RDEPEND="app-arch/xz-utils lz4? ( app-arch/lz4 )" diff --git a/app-arch/zstd/zstd-1.5.1-r3.ebuild b/app-arch/zstd/zstd-1.5.2-r1.ebuild similarity index 68% copy from app-arch/zstd/zstd-1.5.1-r3.ebuild copy to app-arch/zstd/zstd-1.5.2-r1.ebuild index 83b2103a30b0..a55e96f74c14 100644 --- a/app-arch/zstd/zstd-1.5.1-r3.ebuild +++ b/app-arch/zstd/zstd-1.5.2-r1.ebuild @@ -11,33 +11,19 @@ SRC_URI="https://github.com/facebook/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" LICENSE="|| ( BSD GPL-2 )" SLOT="0/1" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="lz4 static-libs split-usr +threads" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +IUSE="lz4 static-libs +threads" RDEPEND="app-arch/xz-utils lz4? ( app-arch/lz4 )" DEPEND="${RDEPEND}" -PATCHES=( - "${FILESDIR}"/${PN}-1.5.1-respect-CFLAGS.patch -) - src_prepare() { default multilib_copy_sources } 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 && [[ ${ABI} == amd64 ]] ; then - asm= - fi - emake \ CC="$(tc-getCC)" \ CXX="$(tc-getCXX)" \ @@ -45,7 +31,6 @@ mymake() { PREFIX="${EPREFIX}/usr" \ LIBDIR="${EPREFIX}/usr/$(get_libdir)" \ V=1 \ - ${asm} \ "${@}" }