mirror of
https://github.com/flatcar/scripts.git
synced 2025-09-25 23:51:07 +02:00
app-arch/zstd: Sync with Gentoo
It's from Gentoo commit f2db2b0099c4f3db0383138d793c76d21a16200b.
This commit is contained in:
parent
bc306ce0b2
commit
f33c887b63
@ -0,0 +1,45 @@
|
|||||||
|
https://github.com/facebook/zstd/pull/4341
|
||||||
|
|
||||||
|
From cd8ca9d92e6fb3a4c962f8f6f50c3ee467177e06 Mon Sep 17 00:00:00 2001
|
||||||
|
From: "Z. Liu" <zhixu.liu@gmail.com>
|
||||||
|
Date: Thu, 20 Mar 2025 03:28:37 +0000
|
||||||
|
Subject: [PATCH] lib/zstd.h: move pragma before static
|
||||||
|
|
||||||
|
otherwise will cause dev-python/zstandard build failed when compiling with
|
||||||
|
clang as reported at https://bugs.gentoo.org/950259
|
||||||
|
|
||||||
|
the root cause is pycparser, which is unfixed since reported 2.5 years
|
||||||
|
ago, :(
|
||||||
|
|
||||||
|
Signed-off-by: Z. Liu <zhixu.liu@gmail.com>
|
||||||
|
---
|
||||||
|
lib/zstd.h | 9 ++++-----
|
||||||
|
1 file changed, 4 insertions(+), 5 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/lib/zstd.h b/lib/zstd.h
|
||||||
|
index 9fe542ed..85046949 100644
|
||||||
|
--- a/lib/zstd.h
|
||||||
|
+++ b/lib/zstd.h
|
||||||
|
@@ -1868,15 +1868,14 @@ ZSTDLIB_STATIC_API const ZSTD_DDict* ZSTD_initStaticDDict(
|
||||||
|
typedef void* (*ZSTD_allocFunction) (void* opaque, size_t size);
|
||||||
|
typedef void (*ZSTD_freeFunction) (void* opaque, void* address);
|
||||||
|
typedef struct { ZSTD_allocFunction customAlloc; ZSTD_freeFunction customFree; void* opaque; } ZSTD_customMem;
|
||||||
|
-static
|
||||||
|
-#ifdef __GNUC__
|
||||||
|
-__attribute__((__unused__))
|
||||||
|
-#endif
|
||||||
|
-
|
||||||
|
#if defined(__clang__) && __clang_major__ >= 5
|
||||||
|
#pragma clang diagnostic push
|
||||||
|
#pragma clang diagnostic ignored "-Wzero-as-null-pointer-constant"
|
||||||
|
#endif
|
||||||
|
+static
|
||||||
|
+#ifdef __GNUC__
|
||||||
|
+__attribute__((__unused__))
|
||||||
|
+#endif
|
||||||
|
ZSTD_customMem const ZSTD_defaultCMem = { NULL, NULL, NULL }; /**< this constant defers to stdlib's functions */
|
||||||
|
#if defined(__clang__) && __clang_major__ >= 5
|
||||||
|
#pragma clang diagnostic pop
|
||||||
|
--
|
||||||
|
2.45.2
|
||||||
|
|
72
sdk_container/src/third_party/portage-stable/app-arch/zstd/zstd-1.5.7-r1.ebuild
vendored
Normal file
72
sdk_container/src/third_party/portage-stable/app-arch/zstd/zstd-1.5.7-r1.ebuild
vendored
Normal file
@ -0,0 +1,72 @@
|
|||||||
|
# Copyright 1999-2025 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 ~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=(
|
||||||
|
"${FILESDIR}"/${PN}-1.5.7-move-pragma-before-static.patch
|
||||||
|
)
|
||||||
|
|
||||||
|
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
|
||||||
|
}
|
||||||
|
|
||||||
|
multilib_src_test() {
|
||||||
|
meson_src_test --timeout-multiplier=2
|
||||||
|
}
|
@ -12,7 +12,7 @@ S="${WORKDIR}"/${P}/build/meson
|
|||||||
|
|
||||||
LICENSE="|| ( BSD GPL-2 )"
|
LICENSE="|| ( BSD GPL-2 )"
|
||||||
SLOT="0/1"
|
SLOT="0/1"
|
||||||
KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
|
KEYWORDS="~alpha amd64 arm arm64 hppa ~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"
|
IUSE="+lzma lz4 static-libs test zlib"
|
||||||
RESTRICT="!test? ( test )"
|
RESTRICT="!test? ( test )"
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user