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 <[email protected]>
johu · Apr 14, 2021 · e2be84c · e2be84c
1 parent 742698f
commit e2be84c
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 0 deletions.
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
@@ -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 → dev-libs/sord/sord-0.16.8-r1.ebuild b/dev-libs/sord/sord-0.16.8.ebuild → 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