commit: e2be84caf596edfce747ca9919b52fbb563198c7 Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> AuthorDate: Wed Apr 14 19:37:31 2021 +0000 Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> CommitDate: Wed Apr 14 19:37:31 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e2be84ca
dev-libs/sord: fixed gcc optimization issue Closes: https://bugs.gentoo.org/782886 Package-Manager: Portage-3.0.18, Repoman-3.0.3 Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org> ...ash-with-optimized-builds-with-gcc-10.1.0.patch | 25 ++++++++++++++++++++++ .../{sord-0.16.8.ebuild => sord-0.16.8-r1.ebuild} | 4 ++++ 2 files changed, 29 insertions(+) diff --git a/dev-libs/sord/files/sord-0.16.8-fix-crash-with-optimized-builds-with-gcc-10.1.0.patch b/dev-libs/sord/files/sord-0.16.8-fix-crash-with-optimized-builds-with-gcc-10.1.0.patch new file mode 100644 index 00000000000..c7f3e66c79f --- /dev/null +++ b/dev-libs/sord/files/sord-0.16.8-fix-crash-with-optimized-builds-with-gcc-10.1.0.patch @@ -0,0 +1,25 @@ +From 616517f44ceeacb26592e50e2bf914aad2d93b90 Mon Sep 17 00:00:00 2001 +From: David Robillard <[email protected]> +Date: Fri, 17 Jul 2020 15:38:38 +0200 +Subject: [PATCH] Fix crash with optimized builds with GCC 10.1.0 + +--- + src/zix/btree.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/zix/btree.c b/src/zix/btree.c +index 78a5a0d..d830008 100644 +--- a/src/zix/btree.c ++++ b/src/zix/btree.c +@@ -689,7 +689,7 @@ zix_btree_begin(const ZixBTree* const t) + ZIX_API bool + zix_btree_iter_is_end(const ZixBTreeIter* const i) + { +- return !i || i->stack[0].node == NULL; ++ return !i || (i->level == 0 && i->stack[0].node == NULL); + } + + ZIX_API void +-- +GitLab + diff --git a/dev-libs/sord/sord-0.16.8.ebuild b/dev-libs/sord/sord-0.16.8-r1.ebuild similarity index 93% rename from dev-libs/sord/sord-0.16.8.ebuild rename to dev-libs/sord/sord-0.16.8-r1.ebuild index 26bfc0bacf6..1b9950ec3e5 100644 --- a/dev-libs/sord/sord-0.16.8.ebuild +++ b/dev-libs/sord/sord-0.16.8-r1.ebuild @@ -30,6 +30,10 @@ DEPEND="${RDEPEND} " DOCS=( "AUTHORS" "NEWS" "README.md" ) +PATCHES=( + "${FILESDIR}/${P}-fix-crash-with-optimized-builds-with-gcc-10.1.0.patch" +) + src_prepare() { sed -i -e 's/^.*run_ldconfig/#\0/' wscript || die default
