diff options
| author | Maxim Cournoyer <maxim@guixotic.coop> | 2026-01-31 00:35:17 +0900 |
|---|---|---|
| committer | Maxim Cournoyer <maxim@guixotic.coop> | 2026-01-31 00:51:05 +0900 |
| commit | a6dddbb062ebc9ed20a51dbec0f1f2e9b6dba77c (patch) | |
| tree | eb406daa7360113ad0bd1aea64de58dc8eb4a03f | |
| parent | 7e91d0bf2077646cf61f85a25910a7ec4c8132a1 (diff) | |
gnu: opendht: Disable liburing support.
It caused a regression in Jami (could no longer register Jami account names).
* gnu/packages/networking.scm (opendht) [source]: Delete
opendht-meson-liburing.patch patch.
[#:phases] {disable-problematic-tests}: Reinstate a few tests.
[propagated-inputs]: Remove liburing, leaving a comment.
* gnu/packages/patches/opendht-meson-liburing.patch: Delete file.
* gnu/local.mk (dist_patch_DATA): De-register it.
Change-Id: I6dde661e6f7e5bc71fc6f6efe38e6f10b41a31ed
| -rw-r--r-- | gnu/local.mk | 1 | ||||
| -rw-r--r-- | gnu/packages/networking.scm | 22 | ||||
| -rw-r--r-- | gnu/packages/patches/opendht-meson-liburing.patch | 26 |
3 files changed, 4 insertions, 45 deletions
diff --git a/gnu/local.mk b/gnu/local.mk index 88ded5bfa54..ac1e309126f 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1992,7 +1992,6 @@ dist_patch_DATA = \ %D%/packages/patches/openbox-add-fix-for-glib2-exposed-segfault.patch \ %D%/packages/patches/openbox-python3.patch \ %D%/packages/patches/opendht-meson-install-headers.patch \ - %D%/packages/patches/opendht-meson-liburing.patch \ %D%/packages/patches/openexr-2-gcc-14.patch \ %D%/packages/patches/openfst-for-vosk-fix-unique-ptr.patch \ %D%/packages/patches/openjdk-currency-time-bomb.patch \ diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index 16023fcfcbc..bde0b021572 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -4205,8 +4205,8 @@ and targeted primarily for asynchronous processing of HTTP-requests.") (sha256 (base32 "1v8miwsslqlqlpp7p210jhxwkblqyc69cgxaq680qhg7h1sf3y2i")) - (patches (search-patches "opendht-meson-install-headers.patch" - "opendht-meson-liburing.patch")))) + (patches + (search-patches "opendht-meson-install-headers.patch")))) (outputs '("out" "python" "tools" "debug")) (build-system meson-build-system) (arguments @@ -4224,25 +4224,10 @@ and targeted primarily for asynchronous processing of HTTP-requests.") (add-after 'unpack 'disable-problematic-tests (lambda _ (substitute* "meson.build" - ;; The 'proxy' test fails with "killed by signal 6 SIGABRT" - ;; inside the build environment (see: - ;; <https://github.com/savoirfairelinux/opendht/issues/819#issuecomment-3701318124>) - (("test\\('(DhtProxy)', test_proxy)") - "") - ;; The 'http' test fails due to liburing not being - ;; functional inside build environment, causing - ;; "io_uring_queue_init: Cannot allocate memory" errors - ;; (see: - ;; <https://github.com/savoirfairelinux/opendht/issues/819#issuecomment-3701318124>). - (("test\\('Http', test_http)") - "") ;; The 'peerdiscovery' test fails even outside of the build ;; environment (see: ;; <https://github.com/savoirfairelinux/opendht/issues/819#issuecomment-3701328516>). (("test\\('PeerDiscovery', test_peerdiscovery)") - "")) - (substitute* "tests/Makefile.am" - (("\\bdhtrunnertester\\.(h|cpp)\\b") "")))) (add-after 'unpack 'relax-test-timeouts (lambda _ @@ -4281,7 +4266,8 @@ and targeted primarily for asynchronous processing of HTTP-requests.") argon2 gnutls jsoncpp - liburing + ;; liburing causes issues (see + ;; <https://git.jami.net/savoirfairelinux/jami-client-qt/-/issues/2179>). nettle openssl ;required for the DHT proxy simdutf)) diff --git a/gnu/packages/patches/opendht-meson-liburing.patch b/gnu/packages/patches/opendht-meson-liburing.patch deleted file mode 100644 index ef57639ca72..00000000000 --- a/gnu/packages/patches/opendht-meson-liburing.patch +++ /dev/null @@ -1,26 +0,0 @@ -Upstream-status: <https://github.com/savoirfairelinux/opendht/pull/821> - -diff --git a/meson.build b/meson.build -index 7d7c5e0a..d3c4a500 100644 ---- a/meson.build -+++ b/meson.build -@@ -208,12 +208,18 @@ if get_option('tools').enabled() - install: true, - ) - if llhttp.found() -+ durl_deps = [msgpack, openssl] -+ -+ if io_uring.found() -+ durl_deps += io_uring -+ endif -+ - durl = executable( - 'durl', - 'tools/durl.cpp', - include_directories: opendht_interface_inc, - link_with: opendht, -- dependencies: [msgpack, openssl], -+ dependencies: durl_deps, - ) - endif - endif |