commit: d3d6f195b3c875ddef2d642bd2d9c0ff27ffbf83 Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Sat Jun 18 13:03:47 2022 +0000 Commit: Sam James <sam <AT> gentoo <DOT> 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 <sam <AT> 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} \ "${@}" }
