Merge pull request #349 from tomponline/latest-edge

Revert "Revert "snapcraft: have dqlite build raft""
canonical · Feb 28, 2024 · 468ec9c · 468ec9c
2 parents b1fcdf7 + 72dab8c
commit 468ec9c
Showing 1 changed file with 4 additions and 22 deletions.
diff --git a/snapcraft.yaml b/snapcraft.yaml
@@ -283,23 +283,26 @@ parts:
 
   dqlite:
     after:
-      - raft
       - sqlite
     source: https://github.com/canonical/dqlite
     source-depth: 1
     source-type: git
     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