From 7b906d2d4f20ad9b961885524643bb286681f859 Mon Sep 17 00:00:00 2001 From: Michael Kuhn Date: Fri, 1 Mar 2024 11:53:11 +0100 Subject: [PATCH] julea: use upstream JULEA --- .github/workflows/ci.yml | 3 +-- julea-betree/src/lib.rs | 5 ++--- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e6a4dbec..882d846d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -144,8 +144,7 @@ jobs: run: | sudo apt update || true sudo apt --yes --no-install-recommends install pkgconf libglib2.0-dev libbson-dev - # FIXME use forked version - git clone --depth 1 --branch modules-conditional-unload https://github.com/tilpner/julea.git "${HOME}/julea" + git clone --depth 1 https://github.com/parcio/julea.git "${HOME}/julea" - name: Install MSRV run: | cargo install cargo-msrv diff --git a/julea-betree/src/lib.rs b/julea-betree/src/lib.rs index b8e57f37..f0dd4232 100644 --- a/julea-betree/src/lib.rs +++ b/julea-betree/src/lib.rs @@ -381,9 +381,8 @@ unsafe extern "C" fn backend_iterate( static mut BETREE_BACKEND: JBackend = JBackend { type_: JBackendType::J_BACKEND_TYPE_OBJECT, - component: JBackendComponent::J_BACKEND_COMPONENT_SERVER - | JBackendComponent::J_BACKEND_COMPONENT_CLIENT - | JBackendComponent::J_BACKEND_COMPONENT_NOT_UNLOADABLE, + component: JBackendComponent::J_BACKEND_COMPONENT_SERVER, + flags: JBackendFlags::J_BACKEND_FLAGS_DO_NOT_UNLOAD, data: ptr::null_mut(), anon1: JBackend__bindgen_ty_1 { object: JBackend__bindgen_ty_1__bindgen_ty_1 {