* [gentoo-commits] repo/gentoo:master commit in: dev-libs/raft/, dev-libs/raft/files/
@ 2022-02-16 6:59 Joonas Niilola
0 siblings, 0 replies; 2+ messages in thread
From: Joonas Niilola @ 2022-02-16 6:59 UTC (permalink / raw
To: gentoo-commits
commit: 42d1b44210b5bde39972d304360546af3f307ff3
Author: James Beddek <telans <AT> posteo <DOT> de>
AuthorDate: Wed Feb 16 01:44:40 2022 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Wed Feb 16 06:59:27 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=42d1b442
dev-libs/raft: update lz4 patch to define LZ4_AVAILABLE
fixes LZ4 usage
fixes test failure
Closes: https://bugs.gentoo.org/833445
Signed-off-by: James Beddek <telans <AT> posteo.de>
Closes: https://github.com/gentoo/gentoo/pull/24206
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
...ft-0.11.3-disable-automagic-check-for-lz4.patch | 67 +++++++++-------------
dev-libs/raft/raft-0.11.3-r1.ebuild | 56 ++++++++++++++++++
2 files changed, 84 insertions(+), 39 deletions(-)
diff --git a/dev-libs/raft/files/raft-0.11.3-disable-automagic-check-for-lz4.patch b/dev-libs/raft/files/raft-0.11.3-disable-automagic-check-for-lz4.patch
index f16936448091..7cd81e53cea9 100644
--- a/dev-libs/raft/files/raft-0.11.3-disable-automagic-check-for-lz4.patch
+++ b/dev-libs/raft/files/raft-0.11.3-disable-automagic-check-for-lz4.patch
@@ -1,7 +1,30 @@
-diff -Naur a/configure.ac b/configure.ac
---- a/configure.ac 2021-12-14 18:47:55.000000000 +0200
-+++ b/configure.ac 2022-02-14 10:51:19.908763437 +0200
-@@ -23,47 +23,12 @@
+diff --git a/Makefile.am b/Makefile.am
+index e0dbfc8..e595cb7 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -80,7 +80,9 @@ libraft_la_LDFLAGS += $(LZ4_LIBS)
+ endif # LZ4_AVAILABLE
+ if LZ4_ENABLED
+ test_unit_core_CFLAGS += -DLZ4_ENABLED
++test_unit_core_LDFLAGS = $(LZ4_LIBS)
+ libraft_la_CFLAGS += -DLZ4_ENABLED
++libraft_la_LDFLAGS += $(LZ4_LIBS)
+ endif # LZ4_ENABLED
+
+ if FIXTURE_ENABLED
+@@ -210,6 +212,7 @@ test_integration_uv_LDFLAGS += $(LZ4_LIBS)
+ endif # LZ4_AVAILABLE
+ if LZ4_ENABLED
+ test_integration_uv_CFLAGS += -DLZ4_ENABLED
++test_integration_uv_LDFLAGS += $(LZ4_LIBS)
+ endif # LZ4_ENABLED
+
+ endif # UV_ENABLED
+diff --git a/configure.ac b/configure.ac
+index df7bea9..0e2949f 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -23,47 +23,13 @@ AM_CONDITIONAL(UV_ENABLED, test "x$have_uv" = "xyes")
# explicitly disabled.
AC_ARG_ENABLE(lz4, AS_HELP_STRING([--disable-lz4], [do not use lz4 compression]))
@@ -50,41 +73,7 @@ diff -Naur a/configure.ac b/configure.ac
# compression by default.
-AM_CONDITIONAL(LZ4_ENABLED, test "x$enable_lz4" != "xno" -a "x$have_lz4" = "xyes")
+AM_CONDITIONAL(LZ4_ENABLED, test "x$enable_lz4" != "xno")
++AM_CONDITIONAL(LZ4_AVAILABLE, test "x$enable_lz4" != "xno")
# The fake I/O implementation and associated fixture is built by default, unless
# explicitly disabled.
-diff -Naur a/Makefile.am b/Makefile.am
---- a/Makefile.am 2021-12-14 18:47:55.000000000 +0200
-+++ b/Makefile.am 2022-02-14 10:55:37.467978443 +0200
-@@ -72,15 +72,11 @@
- test_unit_core_CFLAGS = $(AM_CFLAGS) -Wno-conversion
- test_unit_core_LDADD = libtest.la
-
--if LZ4_AVAILABLE
--test_unit_core_CFLAGS += -DLZ4_AVAILABLE
--test_unit_core_LDFLAGS = $(LZ4_LIBS)
--libraft_la_CFLAGS += -DLZ4_AVAILABLE
--libraft_la_LDFLAGS += $(LZ4_LIBS)
--endif # LZ4_AVAILABLE
- if LZ4_ENABLED
- test_unit_core_CFLAGS += -DLZ4_ENABLED
-+test_unit_core_LDFLAGS = $(LZ4_LIBS)
- libraft_la_CFLAGS += -DLZ4_ENABLED
-+libraft_la_LDFLAGS += $(LZ4_LIBS)
- endif # LZ4_ENABLED
-
- if FIXTURE_ENABLED
-@@ -204,12 +200,9 @@
-
- AM_CFLAGS += $(UV_CFLAGS)
-
--if LZ4_AVAILABLE
--test_integration_uv_CFLAGS += -DLZ4_AVAILABLE
--test_integration_uv_LDFLAGS += $(LZ4_LIBS)
--endif # LZ4_AVAILABLE
- if LZ4_ENABLED
- test_integration_uv_CFLAGS += -DLZ4_ENABLED
-+test_integration_uv_LDFLAGS += $(LZ4_LIBS)
- endif # LZ4_ENABLED
-
- endif # UV_ENABLED
diff --git a/dev-libs/raft/raft-0.11.3-r1.ebuild b/dev-libs/raft/raft-0.11.3-r1.ebuild
new file mode 100644
index 000000000000..bd9c3e128919
--- /dev/null
+++ b/dev-libs/raft/raft-0.11.3-r1.ebuild
@@ -0,0 +1,56 @@
+# Copyright 2020-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+DESCRIPTION="C implementation of the Raft consensus protocol"
+HOMEPAGE="https://github.com/canonical/raft"
+SRC_URI="https://github.com/canonical/raft/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-3-with-linking-exception"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="lz4 test zfs"
+RESTRICT="!test? ( test )"
+
+DEPEND="dev-libs/libuv:=
+ lz4? ( app-arch/lz4:= )"
+RDEPEND="${DEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+ "${FILESDIR}"/raft-0.9.25-Always-skip-init-oom-test.patch
+ "${FILESDIR}"/raft-0.10.0-toggle-zfs.patch
+ "${FILESDIR}"/raft-0.11.3-disable-automagic-check-for-lz4.patch
+)
+
+src_prepare() {
+ default
+ eautoreconf
+}
+
+src_configure() {
+ local myeconfargs=(
+ --enable-uv
+
+ --disable-benchmark
+ --disable-debug
+ --disable-example
+ --disable-sanitize
+ --disable-static
+
+ $(use_enable lz4)
+ $(use_enable test fixture)
+
+ $(use_with zfs)
+ )
+
+ econf "${myeconfargs[@]}"
+}
+
+src_install() {
+ default
+ find "${ED}" -name '*.la' -delete || die
+}
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/raft/, dev-libs/raft/files/
@ 2022-06-04 7:07 Joonas Niilola
0 siblings, 0 replies; 2+ messages in thread
From: Joonas Niilola @ 2022-06-04 7:07 UTC (permalink / raw
To: gentoo-commits
commit: db774dfc6aac428f51c145fa775593f7dd7b134f
Author: Joonas Niilola <juippis <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 4 06:04:22 2022 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Sat Jun 4 07:07:50 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=db774dfc
dev-libs/raft: drop 0.11.3-r1
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
dev-libs/raft/Manifest | 1 -
.../raft-0.9.25-Always-skip-init-oom-test.patch | 31 ------------
dev-libs/raft/raft-0.11.3-r1.ebuild | 56 ----------------------
3 files changed, 88 deletions(-)
diff --git a/dev-libs/raft/Manifest b/dev-libs/raft/Manifest
index 51e7083a198c..f767de429eed 100644
--- a/dev-libs/raft/Manifest
+++ b/dev-libs/raft/Manifest
@@ -1,2 +1 @@
-DIST raft-0.11.3.tar.gz 329571 BLAKE2B 08b145bfbcc26b50f69c550599978ed365ccbbd021b9c4699784c08bd7e0f17f366b1709c22df1a467fbdb524668a753f431744419da8f18d57ea52c5b33de38 SHA512 7d1a7455ff8d58ed1f3d259cade1c74fcb22732a55242dcf761cc6554739c0ea1c462aa02591d28d8fa2b343b23e6261a5e15d02e2a31467969b7d9f9f3b5e92
DIST raft-0.13.0.tar.gz 332490 BLAKE2B 8d14e07b12d4f5a7eadb626b72a90b4defffaee26804a982f257ef80f75ff47ccf434a7dc6b62f36177120cd12ce8c772a6f293e9ad48c61df277b10c0df1854 SHA512 1d65f21ac85deb36a6f8681bd506656a34994164ba51f7c23aa523673024dacf5616bbb3f706c0da4df38c0cc1a00b330459209c80d404545686525da2916afa
diff --git a/dev-libs/raft/files/raft-0.9.25-Always-skip-init-oom-test.patch b/dev-libs/raft/files/raft-0.9.25-Always-skip-init-oom-test.patch
deleted file mode 100644
index 7a22682c2e03..000000000000
--- a/dev-libs/raft/files/raft-0.9.25-Always-skip-init-oom-test.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-commit e0948518f6eedad85c7705fb3963cfdda3627d8f
-Author: Reto Gantenbein <reto.gantenbein@linuxmonk.ch>
-Date: Thu Oct 22 00:19:31 2020 +0200
-
- Always skip init/oom test
-
- The RPM package build in COPR is being executed on a tmpfs which
- always results in a failure of this test:
-
- init/oom
- heap-fault-delay=1, heap-fault-repeat=1 [ ERROR ]
- Error: test/integration/test_uv_init.c:156: assertion failed: _rv == 1 (0 == 1)
-
- Instead only for certain architectures we always skip this test.
- For more informations see https://github.com/ganto/copr-lxc4/issues/8
-
-diff --git a/test/integration/test_uv_init.c b/test/integration/test_uv_init.c
-index 8c9b5f7..57db7f3 100644
---- a/test/integration/test_uv_init.c
-+++ b/test/integration/test_uv_init.c
-@@ -144,10 +144,8 @@ static MunitParameterEnum oomParams[] = {
- TEST(init, oom, setUp, tearDown, 0, oomParams)
- {
- struct fixture *f = data;
--#if defined(__i686__)
- /* XXX: tmpfs seems to not support O_DIRECT */
- return MUNIT_SKIP;
--#endif
- #if defined(__powerpc64__)
- /* XXX: fails on ppc64el */
- return MUNIT_SKIP;
diff --git a/dev-libs/raft/raft-0.11.3-r1.ebuild b/dev-libs/raft/raft-0.11.3-r1.ebuild
deleted file mode 100644
index e0fa1e7d55b7..000000000000
--- a/dev-libs/raft/raft-0.11.3-r1.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 2020-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools
-
-DESCRIPTION="C implementation of the Raft consensus protocol"
-HOMEPAGE="https://github.com/canonical/raft"
-SRC_URI="https://github.com/canonical/raft/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-3-with-linking-exception"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~x86"
-IUSE="lz4 test zfs"
-RESTRICT="!test? ( test )"
-
-DEPEND="dev-libs/libuv:=
- lz4? ( app-arch/lz4:= )"
-RDEPEND="${DEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=(
- "${FILESDIR}"/raft-0.9.25-Always-skip-init-oom-test.patch
- "${FILESDIR}"/raft-0.10.0-toggle-zfs.patch
- "${FILESDIR}"/raft-0.11.3-disable-automagic-check-for-lz4.patch
-)
-
-src_prepare() {
- default
- eautoreconf
-}
-
-src_configure() {
- local myeconfargs=(
- --enable-uv
-
- --disable-benchmark
- --disable-debug
- --disable-example
- --disable-sanitize
- --disable-static
-
- $(use_enable lz4)
- $(use_enable test fixture)
-
- $(use_with zfs)
- )
-
- econf "${myeconfargs[@]}"
-}
-
-src_install() {
- default
- find "${ED}" -name '*.la' -delete || die
-}
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2022-06-04 7:07 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-02-16 6:59 [gentoo-commits] repo/gentoo:master commit in: dev-libs/raft/, dev-libs/raft/files/ Joonas Niilola
-- strict thread matches above, loose matches on Subject: below --
2022-06-04 7:07 Joonas Niilola
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox