summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMiroslav Šulc <fordfrog@gentoo.org>2021-04-14 21:37:31 +0200
committerMiroslav Šulc <fordfrog@gentoo.org>2021-04-14 21:37:31 +0200
commite2be84caf596edfce747ca9919b52fbb563198c7 (patch)
treee0e7f6d5dae66161012dfefb98f4ac60631c90b9 /dev-libs/sord
parentdev-java/xom: resolved remaining issues in 1.3.7 (diff)
downloadgentoo-e2be84caf596edfce747ca9919b52fbb563198c7.tar.gz
gentoo-e2be84caf596edfce747ca9919b52fbb563198c7.tar.bz2
gentoo-e2be84caf596edfce747ca9919b52fbb563198c7.zip
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@gentoo.org>
Diffstat (limited to 'dev-libs/sord')
-rw-r--r--dev-libs/sord/files/sord-0.16.8-fix-crash-with-optimized-builds-with-gcc-10.1.0.patch25
-rw-r--r--dev-libs/sord/sord-0.16.8-r1.ebuild (renamed from dev-libs/sord/sord-0.16.8.ebuild)4
2 files changed, 29 insertions, 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
new file mode 100644
index 000000000000..c7f3e66c79f9
--- /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 <d@drobilla.net>
+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
index 26bfc0bacf6b..1b9950ec3e5e 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