From 72dab8c3e1471d360c9cace0d35f309c30eaa9c5 Mon Sep 17 00:00:00 2001
From: Thomas Parrott <thomas.parrott@canonical.com>
Date: Wed, 28 Feb 2024 14:52:12 +0000
Subject: [PATCH] Revert "Revert "snapcraft: have dqlite build raft""

This reverts commit 0a34f3c0af7f1aa311bf492400c05f1522dc7f36.

The original revert is believed to be a false alarm.

Signed-off-by: Thomas Parrott <thomas.parrott@canonical.com>
---
 snapcraft.yaml | 26 ++++----------------------
 1 file changed, 4 insertions(+), 22 deletions(-)

diff --git a/snapcraft.yaml b/snapcraft.yaml
index 1e8cd4c53..0b9d509cf 100644
--- a/snapcraft.yaml
+++ b/snapcraft.yaml
@@ -283,7 +283,6 @@ parts:
 
   dqlite:
     after:
-      - raft
       - sqlite
     source: https://github.com/canonical/dqlite
     source-depth: 1
@@ -291,15 +290,19 @@ parts:
     plugin: autotools
     autotools-configure-parameters:
       - --prefix=
+      - --enable-build-raft
     stage-packages:
+      - liblz4-1
       - libuv1
     build-packages:
+      - liblz4-dev
       - libuv1-dev
     organize:
       usr/lib/: lib/
     prime:
       - lib/libdqlite*so*
       - lib/*/libuv*
+      #- lib/*/liblz4.so*  # use liblz4.so from the base snap
 
   edk2:
     after:
@@ -993,26 +996,6 @@ parts:
     prime:
       - share/qemu/*
 
-  raft:
-    source: https://github.com/canonical/raft
-    source-depth: 1
-    source-type: git
-    plugin: autotools
-    autotools-configure-parameters:
-      - --prefix=
-    stage-packages:
-      - libuv1
-      - liblz4-1
-    build-packages:
-      - libuv1-dev
-      - liblz4-dev
-    organize:
-      usr/lib/: lib/
-    prime:
-      - lib/libraft*so*
-      - lib/*/libuv.so*
-      #- lib/*/liblz4.so*  # use liblz4.so from the base snap
-
   sqlite:
     source: https://github.com/sqlite/sqlite
     source-depth: 1
@@ -1501,7 +1484,6 @@ parts:
       - openvswitch
       - ovn
       - qemu-ovmf-secureboot
-      - raft
       - spice-server
       - sqlite
       - squashfs-tools-ng