* [gentoo-commits] repo/gentoo:master commit in: dev-libs/sord/files/, dev-libs/sord/
@ 2020-09-05 17:16 Miroslav Šulc
0 siblings, 0 replies; 2+ messages in thread
From: Miroslav Šulc @ 2020-09-05 17:16 UTC (permalink / raw
To: gentoo-commits
commit: c47e948b711401b0d2dcab6e21f3a9874302e255
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 5 17:16:28 2020 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Sat Sep 5 17:16:43 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c47e948b
dev-libs/sord: fixed compilation with gcc10 + added live
Closes: https://bugs.gentoo.org/726312
Package-Manager: Portage-3.0.5, Repoman-3.0.1
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>
dev-libs/sord/files/sord-0.16.4-gcc10.patch | 25 ++++++++++++++++++++++
.../{sord-0.16.4.ebuild => sord-0.16.4-r1.ebuild} | 4 ++++
.../sord/{sord-0.16.4.ebuild => sord-9999.ebuild} | 6 +++---
3 files changed, 32 insertions(+), 3 deletions(-)
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 00000000000..a793b335a0a
--- /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 <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
+--
+2.28.0
+
diff --git a/dev-libs/sord/sord-0.16.4.ebuild b/dev-libs/sord/sord-0.16.4-r1.ebuild
similarity index 96%
copy from dev-libs/sord/sord-0.16.4.ebuild
copy to dev-libs/sord/sord-0.16.4-r1.ebuild
index 39cd7d0b3fd..2c0d0b7cfc2 100644
--- a/dev-libs/sord/sord-0.16.4.ebuild
+++ b/dev-libs/sord/sord-0.16.4-r1.ebuild
@@ -28,6 +28,10 @@ DEPEND="${RDEPEND}
DOCS=( "AUTHORS" "NEWS" "README.md" )
+PATCHES=(
+ "${FILESDIR}/${P}-gcc10.patch"
+)
+
src_prepare() {
sed -i -e 's/^.*run_ldconfig/#\0/' wscript || die
default
diff --git a/dev-libs/sord/sord-0.16.4.ebuild b/dev-libs/sord/sord-9999.ebuild
similarity index 84%
rename from dev-libs/sord/sord-0.16.4.ebuild
rename to dev-libs/sord/sord-9999.ebuild
index 39cd7d0b3fd..e1388ab2877 100644
--- a/dev-libs/sord/sord-0.16.4.ebuild
+++ b/dev-libs/sord/sord-9999.ebuild
@@ -5,15 +5,15 @@ EAPI=6
PYTHON_COMPAT=( python3_{6,7,8} )
PYTHON_REQ_USE='threads(+)'
-inherit python-any-r1 waf-utils multilib-build multilib-minimal
+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/"
-SRC_URI="http://download.drobilla.net/${P}.tar.bz2"
+EGIT_REPO_URI="https://github.com/drobilla/sord.git"
LICENSE="ISC"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~sparc x86"
+KEYWORDS=""
IUSE="doc static-libs test"
RESTRICT="!test? ( test )"
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/sord/files/, dev-libs/sord/
@ 2021-02-18 8:42 Miroslav Šulc
0 siblings, 0 replies; 2+ messages in thread
From: Miroslav Šulc @ 2021-02-18 8:42 UTC (permalink / raw
To: gentoo-commits
commit: eacf4771e061ece31e1b9acb666e8e2077a5cbf1
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 18 08:42:14 2021 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Thu Feb 18 08:42:30 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eacf4771
dev-libs/sord: removed obsolete 0.16.6
Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>
dev-libs/sord/Manifest | 1 -
dev-libs/sord/files/sord-0.16.6-x86_32.patch | 44 --------------------
dev-libs/sord/sord-0.16.6.ebuild | 61 ----------------------------
3 files changed, 106 deletions(-)
diff --git a/dev-libs/sord/Manifest b/dev-libs/sord/Manifest
index 5c28a5f44b2..3a242429149 100644
--- a/dev-libs/sord/Manifest
+++ b/dev-libs/sord/Manifest
@@ -1,2 +1 @@
-DIST sord-0.16.6.tar.bz2 520690 BLAKE2B 7ec248a78e0d9e525d640363414ddd32acc3e32817e2ab86e791fd9232a46658538c9a4db936a5daa7eeb5ef9f7bf13e1aa1429ab6d9fc769e1391a014da919f SHA512 1d3c2bf47ff7e4b533e4e737e2ece8e29bace78bb00c41a252ad5c583abdcba3baa05b189cb8651c212861a2eea3c690354c99d684fd0f343b40e74c94572f98
DIST sord-0.16.8.tar.bz2 525038 BLAKE2B 3ba43b2edb69efec64ac68f139a18f23dc1b92290b054f420c400d2907af74fa550b042596374136c53b7cf0db1b775cfc7edd24c771bbf26d25928845787c7b SHA512 24ed50de8e5bb321e557bac6d3e441b2ed49adabf828bf0e1b33a080c89306dde80443dc8b563098fcc184c4d6e53b7e716b523ddccdf56d08301d1b0120f2b2
diff --git a/dev-libs/sord/files/sord-0.16.6-x86_32.patch b/dev-libs/sord/files/sord-0.16.6-x86_32.patch
deleted file mode 100644
index 3effc4d44dc..00000000000
--- a/dev-libs/sord/files/sord-0.16.6-x86_32.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-diff --git a/src/zix/digest.c b/src/zix/digest.c
-index 889cfde..00b9fcf 100644
---- a/src/zix/digest.c
-+++ b/src/zix/digest.c
-@@ -38,10 +38,12 @@ zix_digest_add(uint32_t hash, const void* const buf, const size_t len)
- {
- const uint8_t* str = (const uint8_t*)buf;
-
-+#ifdef __x86_64__
- for (size_t i = 0; i < (len / sizeof(uint64_t)); ++i) {
- hash = (uint32_t)_mm_crc32_u64(hash, *(const uint64_t*)str);
- str += sizeof(uint64_t);
- }
-+#endif
- if (len & sizeof(uint32_t)) {
- hash = _mm_crc32_u32(hash, *(const uint32_t*)str);
- str += sizeof(uint32_t);
-@@ -57,6 +59,7 @@ zix_digest_add(uint32_t hash, const void* const buf, const size_t len)
- return hash;
- }
-
-+#ifdef __x86_64__
- ZIX_API uint32_t
- zix_digest_add_64(uint32_t hash, const void* const buf, const size_t len)
- {
-@@ -72,12 +75,17 @@ zix_digest_add_64(uint32_t hash, const void* const buf, const size_t len)
-
- return hash;
- }
-+#endif
-
- ZIX_API uint32_t
- zix_digest_add_ptr(const uint32_t hash, const void* const ptr)
- {
- #if UINTPTR_MAX == UINT64_MAX
-- return (uint32_t)_mm_crc32_u64(hash, (uintptr_t)ptr);
-+ #ifdef __x86_64__
-+ return (uint32_t)_mm_crc32_u64(hash, (uintptr_t)ptr);
-+ #else
-+ return (uint32_t)_mm_crc32_u32(hash, (uintptr_t)ptr);
-+ #endif
- #else
- return _mm_crc32_u32(hash, (uintptr_t)ptr);
- #endif
diff --git a/dev-libs/sord/sord-0.16.6.ebuild b/dev-libs/sord/sord-0.16.6.ebuild
deleted file mode 100644
index f15be86b7b6..00000000000
--- a/dev-libs/sord/sord-0.16.6.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{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
-"
-DEPEND="${RDEPEND}
- ${PYTHON_DEPS}
- doc? ( app-doc/doxygen )
- virtual/pkgconfig"
-
-DOCS=( "AUTHORS" "NEWS" "README.md" )
-
-PATCHES=(
- "${FILESDIR}/${P}-x86_32.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
-}
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2021-02-18 8:42 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-09-05 17:16 [gentoo-commits] repo/gentoo:master commit in: dev-libs/sord/files/, dev-libs/sord/ Miroslav Šulc
-- strict thread matches above, loose matches on Subject: below --
2021-02-18 8:42 Miroslav Šulc
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox