From c47e948b711401b0d2dcab6e21f3a9874302e255 Mon Sep 17 00:00:00 2001 From: Miroslav Šulc Date: Sat, 5 Sep 2020 19:16:28 +0200 Subject: dev-libs/sord: fixed compilation with gcc10 + added live MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Closes: https://bugs.gentoo.org/726312 Package-Manager: Portage-3.0.5, Repoman-3.0.1 Signed-off-by: Miroslav Šulc --- dev-libs/sord/files/sord-0.16.4-gcc10.patch | 25 ++++++++++++ dev-libs/sord/sord-0.16.4-r1.ebuild | 61 +++++++++++++++++++++++++++++ dev-libs/sord/sord-0.16.4.ebuild | 57 --------------------------- dev-libs/sord/sord-9999.ebuild | 57 +++++++++++++++++++++++++++ 4 files changed, 143 insertions(+), 57 deletions(-) create mode 100644 dev-libs/sord/files/sord-0.16.4-gcc10.patch create mode 100644 dev-libs/sord/sord-0.16.4-r1.ebuild delete mode 100644 dev-libs/sord/sord-0.16.4.ebuild create mode 100644 dev-libs/sord/sord-9999.ebuild (limited to 'dev-libs/sord') diff --git a/dev-libs/sord/files/sord-0.16.4-gcc10.patch b/dev-libs/sord/files/sord-0.16.4-gcc10.patch new file mode 100644 index 000000000000..a793b335a0a6 --- /dev/null +++ b/dev-libs/sord/files/sord-0.16.4-gcc10.patch @@ -0,0 +1,25 @@ +From 616517f44ceeacb26592e50e2bf914aad2d93b90 Mon Sep 17 00:00:00 2001 +From: David Robillard +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 +-- +2.28.0 + diff --git a/dev-libs/sord/sord-0.16.4-r1.ebuild b/dev-libs/sord/sord-0.16.4-r1.ebuild new file mode 100644 index 000000000000..2c0d0b7cfc2e --- /dev/null +++ b/dev-libs/sord/sord-0.16.4-r1.ebuild @@ -0,0 +1,61 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +PYTHON_COMPAT=( python3_{6,7,8} ) +PYTHON_REQ_USE='threads(+)' +inherit python-any-r1 waf-utils multilib-build multilib-minimal + +DESCRIPTION="Library for storing RDF data in memory" +HOMEPAGE="http://drobilla.net/software/sord/" +SRC_URI="http://download.drobilla.net/${P}.tar.bz2" + +LICENSE="ISC" +SLOT="0" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~sparc x86" +IUSE="doc static-libs test" +RESTRICT="!test? ( test )" + +RDEPEND=" + dev-libs/libpcre + >=dev-libs/serd-0.30.0 +" +DEPEND="${RDEPEND} + ${PYTHON_DEPS} + doc? ( app-doc/doxygen ) + virtual/pkgconfig" + +DOCS=( "AUTHORS" "NEWS" "README.md" ) + +PATCHES=( + "${FILESDIR}/${P}-gcc10.patch" +) + +src_prepare() { + sed -i -e 's/^.*run_ldconfig/#\0/' wscript || die + default + multilib_copy_sources +} + +multilib_src_configure() { + waf-utils_src_configure \ + --docdir=/usr/share/doc/${PF} \ + $(multilib_native_usex doc --docs "") \ + $(usex test --test "") \ + $(usex static-libs --static "") +} + +multilib_src_test() { + ./waf test || die +} + +multilib_src_compile() { + waf-utils_src_compile + default +} + +multilib_src_install() { + waf-utils_src_install + default +} diff --git a/dev-libs/sord/sord-0.16.4.ebuild b/dev-libs/sord/sord-0.16.4.ebuild deleted file mode 100644 index 39cd7d0b3fdb..000000000000 --- a/dev-libs/sord/sord-0.16.4.ebuild +++ /dev/null @@ -1,57 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python3_{6,7,8} ) -PYTHON_REQ_USE='threads(+)' -inherit python-any-r1 waf-utils multilib-build multilib-minimal - -DESCRIPTION="Library for storing RDF data in memory" -HOMEPAGE="http://drobilla.net/software/sord/" -SRC_URI="http://download.drobilla.net/${P}.tar.bz2" - -LICENSE="ISC" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~sparc x86" -IUSE="doc static-libs test" -RESTRICT="!test? ( test )" - -RDEPEND=" - dev-libs/libpcre - >=dev-libs/serd-0.30.0 -" -DEPEND="${RDEPEND} - ${PYTHON_DEPS} - doc? ( app-doc/doxygen ) - virtual/pkgconfig" - -DOCS=( "AUTHORS" "NEWS" "README.md" ) - -src_prepare() { - sed -i -e 's/^.*run_ldconfig/#\0/' wscript || die - default - multilib_copy_sources -} - -multilib_src_configure() { - waf-utils_src_configure \ - --docdir=/usr/share/doc/${PF} \ - $(multilib_native_usex doc --docs "") \ - $(usex test --test "") \ - $(usex static-libs --static "") -} - -multilib_src_test() { - ./waf test || die -} - -multilib_src_compile() { - waf-utils_src_compile - default -} - -multilib_src_install() { - waf-utils_src_install - default -} diff --git a/dev-libs/sord/sord-9999.ebuild b/dev-libs/sord/sord-9999.ebuild new file mode 100644 index 000000000000..e1388ab2877c --- /dev/null +++ b/dev-libs/sord/sord-9999.ebuild @@ -0,0 +1,57 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +PYTHON_COMPAT=( python3_{6,7,8} ) +PYTHON_REQ_USE='threads(+)' +inherit python-any-r1 waf-utils multilib-build multilib-minimal git-r3 + +DESCRIPTION="Library for storing RDF data in memory" +HOMEPAGE="http://drobilla.net/software/sord/" +EGIT_REPO_URI="https://github.com/drobilla/sord.git" + +LICENSE="ISC" +SLOT="0" +KEYWORDS="" +IUSE="doc static-libs test" +RESTRICT="!test? ( test )" + +RDEPEND=" + dev-libs/libpcre + >=dev-libs/serd-0.30.0 +" +DEPEND="${RDEPEND} + ${PYTHON_DEPS} + doc? ( app-doc/doxygen ) + virtual/pkgconfig" + +DOCS=( "AUTHORS" "NEWS" "README.md" ) + +src_prepare() { + sed -i -e 's/^.*run_ldconfig/#\0/' wscript || die + default + multilib_copy_sources +} + +multilib_src_configure() { + waf-utils_src_configure \ + --docdir=/usr/share/doc/${PF} \ + $(multilib_native_usex doc --docs "") \ + $(usex test --test "") \ + $(usex static-libs --static "") +} + +multilib_src_test() { + ./waf test || die +} + +multilib_src_compile() { + waf-utils_src_compile + default +} + +multilib_src_install() { + waf-utils_src_install + default +} -- cgit v1.2.3-65-gdbad