Make fixed versions less strict

NilFoundation · Jan 9, 2024 · 3d50b54 · 3d50b54
1 parent 0622c17
commit 3d50b54
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 16 deletions.
diff --git a/.github/workflows/release_linux.yml b/.github/workflows/release_linux.yml
@@ -38,7 +38,7 @@ jobs:
 
     steps:
       - name: Install dependencies
-        # Versions of libraries used here must match the ones fixed in CPACK_DEBIAN_PACKAGE_DEPENDENCIES_MULTITHREADED_VERSION of CMakeLists.txt.
+        # Versions of runtime libraries are set in CPACK_DEBIAN_PACKAGE_DEPENDENCIES_MULTITHREADED_VERSION of CMakeLists.txt.
         run: |
           env && \
           apt update && \
@@ -57,7 +57,7 @@ jobs:
             liblz4-dev=1.9.3-2build2 \
             libgnutls28-dev=3.7.3-4ubuntu1.3 \
             libprotobuf-dev=3.12.4-1ubuntu7.22.04.1 \
-            libyaml-cpp-dev=0.7.0+dfsg-8build \
+            libyaml-cpp-dev=0.7.0+dfsg-8build1 \
             libsctp-dev \
             ragel \
             xfslibs-dev \
@@ -66,10 +66,8 @@ jobs:
             libhwloc-dev=2.7.0-2ubuntu1 \
             libc-dev \
             lksctp-tools \
-            libatomic1 && \
-          wget http://archive.ubuntu.com/ubuntu/pool/universe/f/fmtlib/libfmt-dev_6.1.2+ds-2_amd64.deb && \
-          apt install -y ./libfmt-dev_6.1.2+ds-2_amd64.deb
-            
+            libatomic1
+
 
       - name: Print toolchain information
         run: |

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -100,9 +100,13 @@ set(CPACK_GENERATOR DEB)
 set(CPACK_DEBIAN_FILE_NAME DEB-DEFAULT)
 set(CPACK_DEBIAN_PACKAGE_MAINTAINER "=nil; Foundation")
 
-set(CPACK_DEBIAN_PACKAGE_DEPENDENCIES_MULTITHREADED_VERSION "libhwloc-dev (=2.7.0-2ubuntu1), libyaml-cpp-dev (=0.7.0+dfsg-8build1), libfmt-dev(=6.1.2+ds-2), libc-dev, lksctp-tools, libatomic1, libprotobuf-dev (=3.12.4-1ubuntu7.22.04.1), liblz4-dev (=1.9.3-2build2), libgnutls28-dev (=3.7.3-4ubuntu1.3), libc-ares-dev (=1.18.1-1ubuntu0.22.04.2)")
-
-set(CPACK_DEBIAN_PACKAGE_DEPENDS ${CPACK_DEBIAN_PACKAGE_DEPENDENCIES_MULTITHREADED_VERSION})
+set(CPACK_DEBIAN_PACKAGE_DEPENDENCIES_MULTITHREADED_VERSION
+    "libhwloc-dev (>=2.7.0)"
+    "libyaml-cpp-dev (>=0.7.0)"
+    "libfmt-dev (>=8.0.0)"
+    "libnuma-dev (>=2.0.0)"
+)
+string(REPLACE ";" ", " CPACK_DEBIAN_PACKAGE_DEPENDS "${CPACK_DEBIAN_PACKAGE_DEPENDENCIES_MULTITHREADED_VERSION}")
 
 set(CPACK_PACKAGE_VERSION "${PROOF_PRODUCER_VERSION_MAJOR}.${PROOF_PRODUCER_VERSION_MINOR}.${PROOF_PRODUCER_VERSION_PATCH}")
 if(PROOF_PRODUCER_VERSION_INCREMENT)

diff --git a/README.md b/README.md
@@ -62,13 +62,6 @@ proof-generator --circuit <circuit-file> --assignment <assignment-file> --proof
         numactl
     ```
 
-    Install fmt-6
-    ```
-    wget http://archive.ubuntu.com/ubuntu/pool/universe/f/fmtlib/libfmt-dev_6.1.2
-    sudo apt remove libfmt-dev
-    sudo apt install ./libfmt-dev_6.1.2+ds-2_amd64.deb
-    ```
-
 2. Build with CMake:
     ```mkdir build
     cd build