commit: c6341de67069356366d36fb5963235c572f1e15a Author: Matt Jolly <kangie <AT> gentoo <DOT> org> AuthorDate: Sat Aug 30 07:50:25 2025 +0000 Commit: Matt Jolly <kangie <AT> gentoo <DOT> org> CommitDate: Sat Aug 30 08:09:39 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c6341de6
dev-vcs/fossil: fix LTO failure on arm64 Closes: https://bugs.gentoo.org/960622 Signed-off-by: Matt Jolly <kangie <AT> gentoo.org> .../files/fossil-2.26-arm64-fossil_sntrdup.patch | 28 ++++++++++++++++++++++ dev-vcs/fossil/fossil-2.26.ebuild | 10 +------- 2 files changed, 29 insertions(+), 9 deletions(-) diff --git a/dev-vcs/fossil/files/fossil-2.26-arm64-fossil_sntrdup.patch b/dev-vcs/fossil/files/fossil-2.26-arm64-fossil_sntrdup.patch new file mode 100644 index 000000000000..a51af9ec5040 --- /dev/null +++ b/dev-vcs/fossil/files/fossil-2.26-arm64-fossil_sntrdup.patch @@ -0,0 +1,28 @@ +From 5ebe56fa1d35739e208dccd7926ea1fc6d4acf5e Mon Sep 17 00:00:00 2001 +From: Matt Jolly <[email protected]> +Date: Sat, 30 Aug 2025 17:39:46 +1000 +Subject: [PATCH] Correct the signature of an extern decl of fossil_strndup() + +https://fossil-scm.org/home/info/d546932976888ae8 + +Bug: https://bugs.gentoo.org/960622 +--- + src/th_lang.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/th_lang.c b/src/th_lang.c +index 713e528..a72a219 100644 +--- a/src/th_lang.c ++++ b/src/th_lang.c +@@ -958,7 +958,7 @@ static int string_length_command( + static int string_match_command( + Th_Interp *interp, void *ctx, int argc, const char **argv, int *argl + ){ +- extern char *fossil_strndup(const char*,int); ++ extern char *fossil_strndup(const char*,ssize_t); + extern void fossil_free(void*); + char *zPat, *zStr; + int rc; +-- +2.49.1 + diff --git a/dev-vcs/fossil/fossil-2.26.ebuild b/dev-vcs/fossil/fossil-2.26.ebuild index 23fd88451c9c..dc1f3f4f589d 100644 --- a/dev-vcs/fossil/fossil-2.26.ebuild +++ b/dev-vcs/fossil/fossil-2.26.ebuild @@ -55,17 +55,9 @@ BDEPEND=" PATCHES=( # fossil-2.10-check-lib64-for-tcl.patch: Bug 690828 "${FILESDIR}"/fossil-2.10-check-lib64-for-tcl.patch + "${FILESDIR}"/${P}-arm64-fossil_sntrdup.patch ) -# src_prepare() { -# eapply -p0 -- \ -# "${FILESDIR}"/fossil-2.24-test-fixes.patch \ -# "${FILESDIR}"/fossil-2.24-disable-utf8-tests-1179-1586-1587.patch \ -# "${FILESDIR}"/fossil-2.24-fix-json-test-content-length.patch - -# default -# } - src_configure() { # this is not an autotools situation so don't make it seem like one # --with-tcl: works
