commit:     b0655eb884a394fdd8048617b8888b8be74adc5e
Author:     Eli Schwartz <eschwartz93 <AT> gmail <DOT> com>
AuthorDate: Tue Feb  6 05:13:57 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Feb  6 22:49:28 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b0655eb8

app-arch/zstd: remove usr-ldscript support

Per news item 2024-01-05-usr-initramfs, we no longer support this use
case. It is fragile and hacky and leads to bizarre forms of load errors.

The functionality is, despite being called "split-usr", not really about
split-usr at all.

[sam: Added bug #771078 ref.]
[sam: See also 
https://github.com/trofi/nix-guix-gentoo/commit/8f194519982fbfabb6b3ca84c0806b1a379b5d06
 and
https://github.com/trofi/nix-guix-gentoo/commit/43d84cc00af530ef912d9c98448b64d6b5282907].

Bug: https://bugs.gentoo.org/771078
Signed-off-by: Eli Schwartz <eschwartz93 <AT> gmail.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 app-arch/zstd/zstd-1.5.5-r1.ebuild | 67 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 67 insertions(+)

diff --git a/app-arch/zstd/zstd-1.5.5-r1.ebuild 
b/app-arch/zstd/zstd-1.5.5-r1.ebuild
new file mode 100644
index 000000000000..0b0fac3c180d
--- /dev/null
+++ b/app-arch/zstd/zstd-1.5.5-r1.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit meson-multilib
+
+DESCRIPTION="zstd fast compression library"
+HOMEPAGE="https://facebook.github.io/zstd/";
+SRC_URI="https://github.com/facebook/zstd/releases/download/v${PV}/${P}.tar.gz";
+S="${WORKDIR}"/${P}/build/meson
+
+LICENSE="|| ( BSD GPL-2 )"
+SLOT="0/1"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos 
~x64-macos ~x64-solaris"
+IUSE="+lzma lz4 static-libs test zlib"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+       lzma? ( app-arch/xz-utils )
+       lz4? ( app-arch/lz4:= )
+       zlib? ( sys-libs/zlib )
+"
+DEPEND="${RDEPEND}"
+
+MESON_PATCHES=(
+       # Workaround until Valgrind bugfix lands
+       "${FILESDIR}"/${PN}-1.5.4-no-find-valgrind.patch
+)
+
+PATCHES=(
+)
+
+src_prepare() {
+       cd "${WORKDIR}"/${P} || die
+       default
+
+       cd "${S}" || die
+       eapply "${MESON_PATCHES[@]}"
+}
+
+multilib_src_configure() {
+       local native_file="${T}"/meson.${CHOST}.${ABI}.ini.local
+
+       # This replaces the no-find-valgrind patch once bugfix lands in a meson
+       # release + we can BDEPEND on it 
(https://github.com/mesonbuild/meson/pull/11372)
+       cat >> ${native_file} <<-EOF || die
+       [binaries]
+       valgrind='valgrind-falseified'
+       EOF
+
+       local emesonargs=(
+               -Ddefault_library=$(multilib_native_usex static-libs both 
shared)
+
+               $(meson_native_true bin_programs)
+               $(meson_native_true bin_contrib)
+               $(meson_use test bin_tests)
+
+               $(meson_native_use_feature zlib)
+               $(meson_native_use_feature lzma)
+               $(meson_native_use_feature lz4)
+
+               --native-file "${native_file}"
+       )
+
+       meson_src_configure
+}

Reply via email to